Compare commits
No commits in common. "8b0848ffba2c29b478869613f36f296c44b55244" and "b71e61a411355c1dfc1fd84c92826eaf64c3b557" have entirely different histories.
8b0848ffba
...
b71e61a411
17 changed files with 61 additions and 1749 deletions
|
|
@ -1,37 +0,0 @@
|
||||||
diff --git a/debian/copyright b/debian/copyright
|
|
||||||
index 3c8824f..c6ec81a 100644
|
|
||||||
--- a/debian/copyright
|
|
||||||
+++ b/debian/copyright
|
|
||||||
@@ -38,7 +38,7 @@ License: GPL-2+
|
|
||||||
|
|
||||||
Files: debian/examples/crontab2english.pl
|
|
||||||
Copyright: 2001, Sean M. Burke
|
|
||||||
-License: Artistic
|
|
||||||
+License: GPL-1+ or Artistic
|
|
||||||
|
|
||||||
License: Paul-Vixie's-license
|
|
||||||
Distribute freely, except: don't remove my name from the source or
|
|
||||||
@@ -67,6 +67,23 @@ License: GPL-2+
|
|
||||||
On Debian systems, the complete text of the GNU General
|
|
||||||
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
|
|
||||||
|
|
||||||
+License: GPL-1+
|
|
||||||
+ This package is free software; you can redistribute it and/or modify
|
|
||||||
+ it under the terms of the GNU General Public License as published by
|
|
||||||
+ the Free Software Foundation; either version 1 of the License, or
|
|
||||||
+ (at your option) any later version.
|
|
||||||
+ .
|
|
||||||
+ This package is distributed in the hope that it will be useful,
|
|
||||||
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
+ GNU General Public License for more details.
|
|
||||||
+ .
|
|
||||||
+ You should have received a copy of the GNU General Public License
|
|
||||||
+ along with this program. If not, see <http://www.gnu.org/licenses/>
|
|
||||||
+ .
|
|
||||||
+ On Debian systems, the complete text of the GNU General
|
|
||||||
+ Public License version 1 can be found in "/usr/share/common-licenses/GPL-1".
|
|
||||||
+
|
|
||||||
License: Artistic
|
|
||||||
This program is free software; you can redistribute it and/or modify it
|
|
||||||
under the terms of the "Artistic License" which comes with Debian.
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,14 +1,12 @@
|
||||||
diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
|
diff --git a/debian/config/mozconfig.in b/debian/config/mozconfig.in
|
||||||
index 9c94cb88..0c19fad9 100644
|
index aee1b988..291b4683 100644
|
||||||
--- a/toolkit/xre/nsXREDirProvider.cpp
|
--- a/debian/config/mozconfig.in
|
||||||
+++ b/toolkit/xre/nsXREDirProvider.cpp
|
+++ b/debian/config/mozconfig.in
|
||||||
@@ -1232,7 +1232,8 @@ nsresult nsXREDirProvider::AppendProfilePath(nsIFile* aFile, bool aLocal) {
|
@@ -71,6 +71,7 @@ ac_add_options --disable-av1
|
||||||
if (gAppData->profile) {
|
%%endif
|
||||||
profile = gAppData->profile;
|
%%if MOZ_APP_NAME != MOZ_DEFAULT_APP_NAME
|
||||||
} else {
|
ac_add_options --with-app-name=@MOZ_APP_NAME@
|
||||||
- appName = gAppData->name;
|
+ac_add_options --with-app-basename=@MOZ_APP_NAME@
|
||||||
+ // For Abrowser compatibility: force use of ~/.mozilla/abrowser
|
%%endif
|
||||||
+ appName.AssignLiteral("abrowser");
|
%%if DISTRIB == Ubuntu
|
||||||
vendor = gAppData->vendor;
|
#ac_add_options --with-ua-vendor=Ubuntu
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/debian/control b/debian/control
|
|
||||||
index 43e3abe5..1677a89d 100644
|
|
||||||
--- a/debian/control
|
|
||||||
+++ b/debian/control
|
|
||||||
@@ -32,6 +32,7 @@ Package: kolourpaint
|
|
||||||
Section: graphics
|
|
||||||
Architecture: any
|
|
||||||
Depends: ${misc:Depends}, ${shlibs:Depends}
|
|
||||||
+Recommends: breeze-icon-theme
|
|
||||||
Breaks: kolourpaint4 (<< 4:17.04)
|
|
||||||
Replaces: kolourpaint4 (<< 4:17.04)
|
|
||||||
Description: simple image editor and drawing application
|
|
||||||
|
|
@ -68,8 +68,8 @@ BackupExt=distUpgrade
|
||||||
LogDir=/var/log/dist-upgrade/
|
LogDir=/var/log/dist-upgrade/
|
||||||
|
|
||||||
[Sources]
|
[Sources]
|
||||||
From=aramo
|
From=nabia
|
||||||
To=ecne
|
To=aramo
|
||||||
ValidOrigin=Trisquel
|
ValidOrigin=Trisquel
|
||||||
ValidMirrors = mirrors.cfg
|
ValidMirrors = mirrors.cfg
|
||||||
Components=main
|
Components=main
|
||||||
|
|
|
||||||
|
|
@ -1,93 +0,0 @@
|
||||||
[View]
|
|
||||||
# the views will be tried in this order, if one fails to import, the next
|
|
||||||
# is tried
|
|
||||||
View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
|
|
||||||
#View=DistUpgradeViewNonInteractive
|
|
||||||
#Depends= apt (>= 1.0.10.2ubuntu2)
|
|
||||||
# the views below support upgrades over ssh connection
|
|
||||||
SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
|
|
||||||
|
|
||||||
# Distro contains global information about the upgrade
|
|
||||||
[Distro]
|
|
||||||
# the meta-pkgs we support
|
|
||||||
MetaPkgs=trisquel, trisquel-mini, triskel, trisquel-sugar, trisquel-gnome
|
|
||||||
BaseMetaPkgs=trisquel-minimal, trisquel-base
|
|
||||||
IgnoredTasks=minimal, standard
|
|
||||||
Demotions=demoted.cfg
|
|
||||||
RemovalDenylistFile=removal_denylist.cfg
|
|
||||||
# if those packages were installed, make sure to keep them installed
|
|
||||||
KeepInstalledPkgs=xserver-xorg-video-all
|
|
||||||
KeepInstalledSection=translations
|
|
||||||
RemoveObsoletes=yes
|
|
||||||
PurgeObsoletes=yes
|
|
||||||
#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
|
|
||||||
# hints for for stuff that should be done right after the cache calculated
|
|
||||||
# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
|
|
||||||
# quirks handling)
|
|
||||||
#PostUpgradePurge=linux-restricted-modules-common
|
|
||||||
#PostUpgradeRemove=xsettings-kde
|
|
||||||
PostUpgradeRemove=resolvconf,notification-daemon
|
|
||||||
#PostUpgradeUpgrade=brasero,edubuntu-desktop
|
|
||||||
#PostUpgradeInstall=apt
|
|
||||||
#PostInstallScripts=./trisquel-postinstall.sh
|
|
||||||
EnableApport=no
|
|
||||||
# this supported deny listing certain versions to ensure we do not upgrade
|
|
||||||
# - blcr-dkms fails to build on kernel 2.6.35
|
|
||||||
#BadVersions=blcr-dkms_0.8.2-13
|
|
||||||
# ubiquity slideshow
|
|
||||||
#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
|
|
||||||
|
|
||||||
[trisquel]
|
|
||||||
KeyDependencies=lightdm, mate-desktop-environment, marco, ubuntu-mate-default-settings, lightdm-gtk-greeter
|
|
||||||
# those pkgs will be marked remove right after the distUpgrade in the cache
|
|
||||||
PostUpgradeRemove=casper, xscreensaver, powermanagement-interface, compiz-core, gdm, gnome-ppp, resolvconf
|
|
||||||
ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
|
|
||||||
|
|
||||||
[trisquel-mini]
|
|
||||||
KeyDependencies=lxde
|
|
||||||
#Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
|
|
||||||
PostUpgradeRemove=casper, gnome-bluetooth, resolvconf
|
|
||||||
ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
|
|
||||||
|
|
||||||
[triskel]
|
|
||||||
KeyDependencies=triskel-settings-desktop, plasma-desktop, sddm
|
|
||||||
PostUpgradeRemove=powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix
|
|
||||||
# those packages are marked as obsolete right after the upgrade
|
|
||||||
ForcedObsoletes=ivman, gtk-qt-engine
|
|
||||||
# help the resolver a bit: LP: #1426132
|
|
||||||
PostUpgradeInstall=baloo-kf5
|
|
||||||
|
|
||||||
[trisquel-sugar]
|
|
||||||
KeyDependencies=sugar, lightdm-gtk-greeter
|
|
||||||
|
|
||||||
[trisquel-gnome]
|
|
||||||
KeyDependencies=gnome-core, gdm3
|
|
||||||
|
|
||||||
[Files]
|
|
||||||
BackupExt=distUpgrade
|
|
||||||
LogDir=/var/log/dist-upgrade/
|
|
||||||
|
|
||||||
[Sources]
|
|
||||||
From=aramo
|
|
||||||
To=ecne
|
|
||||||
ValidOrigin=Trisquel
|
|
||||||
ValidMirrors = mirrors.cfg
|
|
||||||
Components=main
|
|
||||||
Pockets=security,updates,backports
|
|
||||||
;AllowThirdParty=False
|
|
||||||
|
|
||||||
;[PreRequists]
|
|
||||||
;Packages=release-upgrader-apt,release-upgrader-dpkg
|
|
||||||
;SourcesList=prerequists-sources.list
|
|
||||||
;SourcesList-ia64=prerequists-sources.ports.list
|
|
||||||
;SourcesList-hppa=prerequists-sources.ports.list
|
|
||||||
|
|
||||||
[Network]
|
|
||||||
MaxRetries=3
|
|
||||||
|
|
||||||
[NonInteractive]
|
|
||||||
ForceOverwrite=yes
|
|
||||||
RealReboot=no
|
|
||||||
DebugBrokenScripts=no
|
|
||||||
DpkgProgressLog=no
|
|
||||||
;TerminalTimeout=2400
|
|
||||||
|
|
@ -1,42 +0,0 @@
|
||||||
diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
|
|
||||||
index 9423f091..00d9b84c 100644
|
|
||||||
--- a/DistUpgrade/DistUpgradeQuirks.py
|
|
||||||
+++ b/DistUpgrade/DistUpgradeQuirks.py
|
|
||||||
@@ -2000,17 +2000,27 @@ class DistUpgradeQuirks(object):
|
|
||||||
break
|
|
||||||
|
|
||||||
if fail:
|
|
||||||
- logging.debug('System is not /usr-merged!')
|
|
||||||
- self._view.error(
|
|
||||||
- _(
|
|
||||||
- f'Cannot upgrade system with unmerged /usr'
|
|
||||||
- ),
|
|
||||||
- _(
|
|
||||||
- 'Please install the usrmerge package to fix this, '
|
|
||||||
- 'and then try the upgrade again.'
|
|
||||||
- ),
|
|
||||||
+ logging.warning(
|
|
||||||
+ "System is not /usr-merged. Installing usrmerge before continuing..."
|
|
||||||
+ )
|
|
||||||
+ res = subprocess.run(["apt-get", "update"])
|
|
||||||
+ res2 = subprocess.run(["apt-get", "-y", "install", "usrmerge"])
|
|
||||||
+
|
|
||||||
+ if res2.returncode != 0:
|
|
||||||
+ # Installation failed, abort the upgrade with a clear message
|
|
||||||
+ self.controller.error(_(
|
|
||||||
+ "The system is not /usr-merged and 'usrmerge' could not be "
|
|
||||||
+ "installed automatically. Please install it manually and "
|
|
||||||
+ "try again."
|
|
||||||
+ ))
|
|
||||||
+ return
|
|
||||||
+
|
|
||||||
+ # Re-check that /usr merge is now in place
|
|
||||||
+ # (ensure /bin -> /usr/bin, /lib -> /usr/lib, etc.)
|
|
||||||
+ logging.info(
|
|
||||||
+ "usrmerge installed successfully; system is now /usr-merged. "
|
|
||||||
+ "Proceeding with the upgrade."
|
|
||||||
)
|
|
||||||
- self.controller.abort()
|
|
||||||
|
|
||||||
def _disable_cloud_init(self):
|
|
||||||
"""
|
|
||||||
|
|
@ -1,102 +0,0 @@
|
||||||
Enables Firefox based browser 'Abrowser' with custom folder (.mozilla/abrowser)
|
|
||||||
to use the --cookies-from-browser feature, might also work for other customized
|
|
||||||
browser in similar cases.
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/yt_dlp/cookies.py b/yt_dlp/cookies.py
|
|
||||||
index 5675445a..7afd324b 100644
|
|
||||||
--- a/yt_dlp/cookies.py
|
|
||||||
+++ b/yt_dlp/cookies.py
|
|
||||||
@@ -47,7 +47,7 @@
|
|
||||||
from .utils.networking import normalize_url
|
|
||||||
|
|
||||||
CHROMIUM_BASED_BROWSERS = {'brave', 'chrome', 'chromium', 'edge', 'opera', 'vivaldi', 'whale'}
|
|
||||||
-SUPPORTED_BROWSERS = CHROMIUM_BASED_BROWSERS | {'firefox', 'safari'}
|
|
||||||
+SUPPORTED_BROWSERS = CHROMIUM_BASED_BROWSERS | {'abrowser', 'firefox', 'safari'}
|
|
||||||
|
|
||||||
|
|
||||||
class YDLLogger(_YDLLogger):
|
|
||||||
@@ -114,8 +114,8 @@ def load_cookies(cookie_file, browser_specification, ydl):
|
|
||||||
|
|
||||||
|
|
||||||
def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(), *, keyring=None, container=None):
|
|
||||||
- if browser_name == 'firefox':
|
|
||||||
- return _extract_firefox_cookies(profile, container, logger)
|
|
||||||
+ if browser_name in ('firefox', 'abrowser'):
|
|
||||||
+ return _extract_firefox_cookies(profile, container, logger, browser_name)
|
|
||||||
elif browser_name == 'safari':
|
|
||||||
return _extract_safari_cookies(profile, logger)
|
|
||||||
elif browser_name in CHROMIUM_BASED_BROWSERS:
|
|
||||||
@@ -124,15 +124,15 @@ def extract_cookies_from_browser(browser_name, profile=None, logger=YDLLogger(),
|
|
||||||
raise ValueError(f'unknown browser: {browser_name}')
|
|
||||||
|
|
||||||
|
|
||||||
-def _extract_firefox_cookies(profile, container, logger):
|
|
||||||
- logger.info('Extracting cookies from firefox')
|
|
||||||
+def _extract_firefox_cookies(profile, container, logger, browser_name):
|
|
||||||
+ logger.info(f'Extracting cookies from {browser_name}')
|
|
||||||
if not sqlite3:
|
|
||||||
- logger.warning('Cannot extract cookies from firefox without sqlite3 support. '
|
|
||||||
+ logger.warning(f'Cannot extract cookies from {browser_name} without sqlite3 support. '
|
|
||||||
'Please use a Python interpreter compiled with sqlite3 support')
|
|
||||||
return YoutubeDLCookieJar()
|
|
||||||
|
|
||||||
if profile is None:
|
|
||||||
- search_roots = list(_firefox_browser_dirs())
|
|
||||||
+ search_roots = list(_firefox_browser_dirs(browser_name))
|
|
||||||
elif _is_path(profile):
|
|
||||||
search_roots = [profile]
|
|
||||||
else:
|
|
||||||
@@ -141,7 +141,7 @@ def _extract_firefox_cookies(profile, container, logger, browser_name):
|
|
||||||
|
|
||||||
cookie_database_path = _newest(_firefox_cookie_dbs(search_roots))
|
|
||||||
if cookie_database_path is None:
|
|
||||||
- raise FileNotFoundError(f'could not find firefox cookies database in {search_root}')
|
|
||||||
+ raise FileNotFoundError(f'could not find {browser_name} cookies database in {search_root}')
|
|
||||||
logger.debug(f'Extracting cookies from: "{cookie_database_path}"')
|
|
||||||
|
|
||||||
container_id = None
|
|
||||||
@@ -156,7 +156,7 @@ def _extract_firefox_cookies(profile, container, logger, browser_name):
|
|
||||||
try_call(lambda: re.fullmatch(r'userContext([^\.]+)\.label', context['l10nID']).group()),
|
|
||||||
)), None)
|
|
||||||
if not isinstance(container_id, int):
|
|
||||||
- raise ValueError(f'could not find firefox container "{container}" in containers.json')
|
|
||||||
+ raise ValueError(f'could not find {browser_name} container "{container}" in containers.json')
|
|
||||||
|
|
||||||
with tempfile.TemporaryDirectory(prefix='yt_dlp') as tmpdir:
|
|
||||||
cursor = None
|
|
||||||
@@ -164,7 +164,7 @@ def _extract_firefox_cookies(profile, container, logger, browser_name):
|
|
||||||
cursor = _open_database_copy(cookie_database_path, tmpdir)
|
|
||||||
if isinstance(container_id, int):
|
|
||||||
logger.debug(
|
|
||||||
- f'Only loading cookies from firefox container "{container}", ID {container_id}')
|
|
||||||
+ f'Only loading cookies from {browser_name} container "{container}", ID {container_id}')
|
|
||||||
cursor.execute(
|
|
||||||
'SELECT host, name, value, path, expiry, isSecure FROM moz_cookies WHERE originAttributes LIKE ? OR originAttributes LIKE ?',
|
|
||||||
(f'%userContextId={container_id}', f'%userContextId={container_id}&%'))
|
|
||||||
@@ -186,14 +186,14 @@ def _extract_firefox_cookies(profile, container, logger):
|
|
||||||
path=path, path_specified=bool(path), secure=is_secure, expires=expiry, discard=False,
|
|
||||||
comment=None, comment_url=None, rest={})
|
|
||||||
jar.set_cookie(cookie)
|
|
||||||
- logger.info(f'Extracted {len(jar)} cookies from firefox')
|
|
||||||
+ logger.info(f'Extracted {len(jar)} cookies from {browser_name}')
|
|
||||||
return jar
|
|
||||||
finally:
|
|
||||||
if cursor is not None:
|
|
||||||
cursor.connection.close()
|
|
||||||
|
|
||||||
|
|
||||||
-def _firefox_browser_dirs():
|
|
||||||
+def _firefox_browser_dirs(browser_name='firefox'):
|
|
||||||
if sys.platform in ('cygwin', 'win32'):
|
|
||||||
yield from map(os.path.expandvars, (
|
|
||||||
R'%APPDATA%\Mozilla\Firefox\Profiles',
|
|
||||||
@@ -205,7 +205,7 @@ def _firefox_browser_dirs():
|
|
||||||
|
|
||||||
else:
|
|
||||||
yield from map(os.path.expanduser, (
|
|
||||||
- '~/.mozilla/firefox',
|
|
||||||
+ f'~/.mozilla/{browser_name}',
|
|
||||||
'~/snap/firefox/common/.mozilla/firefox',
|
|
||||||
'~/.var/app/org.mozilla.firefox/.mozilla/firefox',
|
|
||||||
))
|
|
||||||
|
|
@ -38,17 +38,17 @@ fi
|
||||||
[ -d PACKAGES ] || mkdir PACKAGES
|
[ -d PACKAGES ] || mkdir PACKAGES
|
||||||
|
|
||||||
export DEBIAN_FRONTEND=noninteractive
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
export DEBEMAIL=devel@cmxsl.org
|
export DEBEMAIL=trisquel-devel@listas.trisquel.info
|
||||||
export DEBFULLNAME="Desarrollo CMXSL"
|
export DEBFULLNAME="Trisquel GNU/Linux developers"
|
||||||
export CODENAME=ecne
|
export CODENAME=ecne
|
||||||
export REVISION=12.0
|
export REVISION=12.0
|
||||||
export RELEASE=cmxsl
|
export RELEASE=trisquel
|
||||||
export DOMAIN=cmxsl.org
|
export DOMAIN=trisquel.info
|
||||||
export UPSTREAM=noble
|
export UPSTREAM=noble
|
||||||
export UPSTREAMRELEASE=24.04
|
export UPSTREAMRELEASE=24.04
|
||||||
MIRROR=http://archive.ubuntu.com/ubuntu/
|
MIRROR=http://mirrors.ocf.berkeley.edu/ubuntu/
|
||||||
LOCALMIRROR=http://archive.trisquel.org/trisquel
|
LOCALMIRROR=http://archive.trisquel.org/trisquel
|
||||||
GIT_TPH_REPO=https://git.cmxsl.org/CMXSL.org/package-helpers-cmxsl
|
GIT_TPH_REPO=https://gitlab.trisquel.org/trisquel/package-helpers
|
||||||
LOCAL_APT=`mktemp -d`
|
LOCAL_APT=`mktemp -d`
|
||||||
if [[ "$PACKAGE" =~ ^linux(-hwe-[0-9]+\.[0-9]+)?$ && -n "$LP_VERSION" ]]; then
|
if [[ "$PACKAGE" =~ ^linux(-hwe-[0-9]+\.[0-9]+)?$ && -n "$LP_VERSION" ]]; then
|
||||||
# Function to truncate the version string to the major version (e.g., 6.5.0)
|
# Function to truncate the version string to the major version (e.g., 6.5.0)
|
||||||
|
|
@ -64,7 +64,6 @@ LP_DIFF_FILE="${PACKAGE}_${LP_VERSION}.diff.gz"
|
||||||
LP_DSC_FILE="${PACKAGE}_${LP_VERSION}.dsc"
|
LP_DSC_FILE="${PACKAGE}_${LP_VERSION}.dsc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -e "> $PACKAGE helper build started - $(date -R)\n"
|
|
||||||
if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then
|
if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then
|
||||||
echo "Skipping build of helper with BUILD_UNTIL=$BUILD_UNTIL > REVISION=$REVISION"
|
echo "Skipping build of helper with BUILD_UNTIL=$BUILD_UNTIL > REVISION=$REVISION"
|
||||||
exit 0
|
exit 0
|
||||||
|
|
@ -89,7 +88,7 @@ head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-securi
|
||||||
echo | dch -D $REPO -v $FULLVERSION "$1"
|
echo | dch -D $REPO -v $FULLVERSION "$1"
|
||||||
|
|
||||||
# Make sure the changelog file is identical between archs
|
# Make sure the changelog file is identical between archs
|
||||||
/bin/sed "/-- Desarrollo/s/.*/ -- Desarrollo CMXSL <devel@cmxsl.org> $DATE/" -i debian/changelog
|
/bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info> $DATE/" -i debian/changelog
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -196,7 +195,7 @@ cd source
|
||||||
|
|
||||||
UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version)
|
UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version)
|
||||||
|
|
||||||
export FULLVERSION=$(dpkg-parsechangelog --show-field Version)cmxsl${VERSION}
|
export FULLVERSION=$(dpkg-parsechangelog --show-field Version)trisquel${VERSION}
|
||||||
|
|
||||||
# Use 3.0 (native) deb source format
|
# Use 3.0 (native) deb source format
|
||||||
[ -f debian/source/format ] && echo "3 (native)" > debian/source/format
|
[ -f debian/source/format ] && echo "3 (native)" > debian/source/format
|
||||||
|
|
@ -221,7 +220,7 @@ cd ..
|
||||||
mv source $PACKAGE-$FULLVERSION
|
mv source $PACKAGE-$FULLVERSION
|
||||||
dpkg-source -b -I.falsefileextension99 $PACKAGE-$FULLVERSION
|
dpkg-source -b -I.falsefileextension99 $PACKAGE-$FULLVERSION
|
||||||
rm -rf ${LOCAL_APT}
|
rm -rf ${LOCAL_APT}
|
||||||
echo -e "> CMXSL source package built! - $(date -R)\n"
|
echo -e "Trisquel source package built! - $(date -R)\n"
|
||||||
|
|
||||||
notify_found_distro_match_on_debian_rules
|
notify_found_distro_match_on_debian_rules
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,14 +17,15 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=2
|
VERSION=1
|
||||||
BUILD_UNTIL=12
|
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
||||||
patch_p1 $DATA/license-info-fix.patch
|
rm debian/examples/crontab2english.pl
|
||||||
|
|
||||||
changelog "Corrected license info (package-helpers issue #199)"
|
sed '/crontab2english.pl/,/License: Artistic/d;/License: Artistic/,/common-licenses/d' -i debian/copyright
|
||||||
|
|
||||||
|
changelog "Removed non-free example #10868"
|
||||||
|
|
||||||
package
|
package
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Copyright (C) 2025 Luis Guznán <ark@switnet.org>
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
#
|
|
||||||
|
|
||||||
VERSION=1
|
|
||||||
|
|
||||||
. ./config
|
|
||||||
|
|
||||||
apply_patch_changes
|
|
||||||
# See more at: https://gitlab.gnome.org/GNOME/dia/-/merge_requests/114
|
|
||||||
|
|
||||||
changelog "Apply MR 114 on GNOME to fix delay to open text properties"
|
|
||||||
|
|
||||||
package
|
|
||||||
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=123
|
VERSION=122
|
||||||
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
|
EXTERNAL='deb-src http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu $UPSTREAM main'
|
||||||
REPOKEY=9BDB3D89CE49EC21
|
REPOKEY=9BDB3D89CE49EC21
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# Copyright (C) 2025 Luis Guzmán <ark@switnet.org>
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
#
|
|
||||||
|
|
||||||
VERSION=1
|
|
||||||
. ./config
|
|
||||||
|
|
||||||
apply_patch_changes
|
|
||||||
|
|
||||||
changelog "Set icon theme recommendation for non-KDE environments"
|
|
||||||
|
|
||||||
package
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=1
|
VERSION=1
|
||||||
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM universe'
|
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM main universe'
|
||||||
BACKPORTS=true
|
BACKPORTS=true
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# Copyright (C) 2025 Luis Guzmán <ark@switnet.org>
|
|
||||||
# Copyright (C) 2008-2024 Ruben Rodriguez <ruben@trisquel.info>
|
# Copyright (C) 2008-2024 Ruben Rodriguez <ruben@trisquel.info>
|
||||||
# Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info>
|
# Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info>
|
||||||
# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
|
# Copyright (C) 2019 Mason Hock <mason@masonhock.com>
|
||||||
|
|
@ -25,20 +24,13 @@
|
||||||
# Also, don't forget to update the meta-release files at archive and packages.t.i
|
# Also, don't forget to update the meta-release files at archive and packages.t.i
|
||||||
# The "obsoletes" list from ubuntu has been removed
|
# The "obsoletes" list from ubuntu has been removed
|
||||||
|
|
||||||
VERSION=16.1
|
VERSION=16
|
||||||
|
|
||||||
. ./config
|
. ./config
|
||||||
# Previous upstream release name, update for each release.
|
|
||||||
PREV_UPS_REL=jammy
|
|
||||||
PREV_TRIS_REL=aramo
|
|
||||||
# Use git Mirrors.masterlist as source.
|
|
||||||
Mirrors_masterlist=$(mktemp)
|
|
||||||
Mirrors_masterlist_git="trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist"
|
|
||||||
TPH_GIT_URL="https://gitlab.trisquel.org/trisquel/package-helpers/"
|
|
||||||
|
|
||||||
# Fix PEP440 version compatibility
|
# Fix PEP440 version compatibility
|
||||||
# https://salsa.debian.org/debian/distro-info/-/commit/e2877dc44659d034155495e91976874c209a3c02
|
# https://salsa.debian.org/debian/distro-info/-/commit/e2877dc44659d034155495e91976874c209a3c02
|
||||||
patch_p1 $DATA/pep440.patch
|
patch --no-backup-if-mismatch -Np1 < $DATA/pep440.patch
|
||||||
|
|
||||||
#%FSDG: Remove functions to deal with proprietary drivers
|
#%FSDG: Remove functions to deal with proprietary drivers
|
||||||
rm ./DistUpgrade/xorg_fix_proprietary.py
|
rm ./DistUpgrade/xorg_fix_proprietary.py
|
||||||
|
|
@ -234,11 +226,25 @@ trisquel-release-upgrader-core
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
rm data/mirrors.cfg
|
rm data/mirrors.cfg
|
||||||
# https://gitlab.trisquel.org/trisquel/trisquel-packages/-/tree/master/extra/mirrors
|
#https://mirmon.trisquel.org/conf.txt
|
||||||
# FIXME: Propose a way to integrate from git and avoid fetching via wget/curl.
|
cat << EOF > data/mirrors.cfg
|
||||||
wget https://gitlab.trisquel.org/trisquel/$Mirrors_masterlist_git -o /dev/null -O $Mirrors_masterlist
|
https://archive.trisquel.info/trisquel/
|
||||||
python3 $DATA/../python-apt/parse-mirror-masterlist.py $Mirrors_masterlist|grep https|sort > data/mirrors.cfg
|
https://archive.trisquel.org/trisquel/
|
||||||
rm $Mirrors_masterlist
|
https://mirror.fsf.org/trisquel/
|
||||||
|
https://mirror.cedia.org.ec/trisquel.packages/
|
||||||
|
https://mirrors.ustc.edu.cn/trisquel/
|
||||||
|
https://ftp.caliu.cat/pub/distribucions/trisquel/packages/
|
||||||
|
https://ftp.acc.umu.se/mirror/trisquel/packages/
|
||||||
|
https://mirrors.ocf.berkeley.edu/trisquel/
|
||||||
|
https://mirror.librelabucm.org/trisquel/
|
||||||
|
https://mirror.linux.pizza/trisquel/packages/
|
||||||
|
https://quantum-mirror.hu/mirrors/pub/trisquel/packages/
|
||||||
|
https://mirror.csclub.uwaterloo.ca/trisquel/packages/
|
||||||
|
https://ftpmirror1.infania.net/mirror/trisquel/packages/
|
||||||
|
https://mirrors.nju.edu.cn/trisquel/
|
||||||
|
https://mirror.math.princeton.edu/pub/trisquel-packages/
|
||||||
|
https://mirrors.dotsrc.org/trisquel/
|
||||||
|
EOF
|
||||||
|
|
||||||
replace changelogs.ubuntu.com packages.trisquel.org .
|
replace changelogs.ubuntu.com packages.trisquel.org .
|
||||||
|
|
||||||
|
|
@ -282,23 +288,16 @@ rpl noble ecne . -R
|
||||||
rm data/DistUpgrade.cfg*
|
rm data/DistUpgrade.cfg*
|
||||||
cp $DATA/DistUpgrade.cfg* data/
|
cp $DATA/DistUpgrade.cfg* data/
|
||||||
|
|
||||||
cat << EOF | tee -a utils/demoted.cfg utils/demoted.cfg.$PREV_UPS_REL
|
cat << EOF >> data/demoted.cfg
|
||||||
notification-daemon
|
notification-daemon
|
||||||
resolvconf
|
resolvconf
|
||||||
eom
|
eom
|
||||||
desktop-common
|
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
for i in utils/demoted.cfg utils/demoted.cfg.$PREV_UPS_REL
|
sed 's|.ubuntu-bug ubuntu-release-upgrader-core. in a terminal|https://gitlab.trisquel.org/trisquel/package-helpers in a browser.|' DistUpgrade/DistUpgradeCache.py -i
|
||||||
do
|
replace "https*://launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug" "https://gitlab.trisquel.org/trisquel/package-helpers/-/issues" .
|
||||||
sort -o $i $i
|
replace "https*://launchpad.net/ubuntu/+source/ubuntu-release-upgrader" "https://gitlab.trisquel.org/trisquel/package-helpers/" .
|
||||||
done
|
replace "https*://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug" "https://gitlab.trisquel.org/trisquel/package-helpers/-/issues" .
|
||||||
mv data/demoted.cfg.$PREV_UPS_REL data/demoted.cfg.$PREV_TRIS_REL
|
|
||||||
|
|
||||||
sed -i "s|the command .ubuntu-bug ubuntu-release-upgrader-core. in a terminal|$TPH_GIT_URL|" DistUpgrade/DistUpgradeCache.py
|
|
||||||
replace "https*://launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug" "${TPH_GIT_URL}-/issues" .
|
|
||||||
replace "https*://launchpad.net/ubuntu/+source/ubuntu-release-upgrader" "$TPH_GIT_URL" .
|
|
||||||
replace "https*://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+filebug" "${TPH_GIT_URL}-/issues" .
|
|
||||||
find -type f |xargs rename 's/ubuntu-release-upgrader/trisquel-release-upgrader/g'
|
find -type f |xargs rename 's/ubuntu-release-upgrader/trisquel-release-upgrader/g'
|
||||||
replace "ubuntu-release-upgrader" "trisquel-release-upgrader" .
|
replace "ubuntu-release-upgrader" "trisquel-release-upgrader" .
|
||||||
mv kubuntu-devel-release-upgrade triskel-devel-release-upgrade
|
mv kubuntu-devel-release-upgrade triskel-devel-release-upgrade
|
||||||
|
|
@ -326,28 +325,12 @@ rpl "main restricted" "main" DistUpgrade -R
|
||||||
replace Ubuntu Trisquel
|
replace Ubuntu Trisquel
|
||||||
replace Canonical Trisquel
|
replace Canonical Trisquel
|
||||||
replace "https*://www.ubuntu.com/" "https://trisquel.info" .
|
replace "https*://www.ubuntu.com/" "https://trisquel.info" .
|
||||||
replace "https*://wiki.ubuntu.com/X/Bugs/" "${TPH_GIT_URL}-/issues" .
|
replace "https*://wiki.ubuntu.com/X/Bugs/" "https://gitlab.trisquel.org/trisquel/package-helpers/-/issues" .
|
||||||
replace "https*://wiki.ubuntu.com/" "https://trisquel.info/wiki" .
|
replace "https*://wiki.ubuntu.com/" "https://trisquel.info/wiki" .
|
||||||
replace "https*://help.ubuntu.com/community" "https://trisquel.info/wiki" .
|
replace "https*://help.ubuntu.com/community" "https://trisquel.info/wiki" .
|
||||||
|
|
||||||
/bin/sed -i \
|
|
||||||
-e 's/kubuntu/triskel/g' \
|
|
||||||
-e 's/xubuntu/trisquel-mini/g' \
|
|
||||||
-e 's/<2F>~Lubuntu/<2F>~Ltrisquel/g' \
|
|
||||||
-e 's/被ubuntu/被trisquel/g' \
|
|
||||||
-e "s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#$TPH_GIT_URL#g" \
|
|
||||||
-e 's/<.*@ubuntu.com/<info@trisquel.info/g' \
|
|
||||||
-e 's/ ubuntu\n/ trisquel\n/g' \
|
|
||||||
-e 's/ubuntu\ /trisquel\ /g' \
|
|
||||||
-e 's/\ ubuntu/\ trisquel/g' \
|
|
||||||
-e 's/Ubuntu/Trisquel/g' \
|
|
||||||
-e 's/ubuntu-desktop/trisquel-/g' \
|
|
||||||
-e 's/www.ubuntu.com/trisquel.info/g' \
|
|
||||||
-e 's/www.ubuntulinux.org/trisquel.info/g' \
|
|
||||||
po/*.po \
|
|
||||||
$(find -type f -name '*.py') \
|
|
||||||
$(find -type f -name '*.glade')
|
|
||||||
|
|
||||||
|
/bin/sed -i 's/kubuntu/triskel/g; s/xubuntu/trisquel-mini/g; s/<2F>~Lubuntu/<2F>~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#https://gitlab.trisquel.org/trisquel/package-helpers#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find -type f | grep py$) $(find -type f | grep '\.glade$')
|
||||||
replace Trisquel-Gettext Ubuntu-Gettext
|
replace Trisquel-Gettext Ubuntu-Gettext
|
||||||
|
|
||||||
sed '1s/trisquel/ubuntu/' debian/control -i
|
sed '1s/trisquel/ubuntu/' debian/control -i
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
# such packages from Debian in order to build the required udeb packages.
|
# such packages from Debian in order to build the required udeb packages.
|
||||||
##
|
##
|
||||||
|
|
||||||
#STAGE-4-UDEBS
|
#STAGE-4-UDEBS || #STAGE-1-DEBOOTSTRAP
|
||||||
|
|
||||||
VERSION=0
|
VERSION=0
|
||||||
NETINST=true
|
NETINST=true
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=2
|
VERSION=1
|
||||||
EXTERNAL='deb-src http://deb.debian.org/debian sid main'
|
EXTERNAL='deb-src http://deb.debian.org/debian sid main'
|
||||||
REPOKEY=0E98404D386FA1D9
|
REPOKEY=0E98404D386FA1D9
|
||||||
BACKPORTS=true
|
BACKPORTS=true
|
||||||
|
|
@ -32,8 +32,6 @@ sed -i "/Currently supported/s|are:|are at:|" debian/control
|
||||||
[ "$SUPPORTED_SITES" != "$(tail -n2 debian/control|awk NF|sed 's|^ ||')" ] && \
|
[ "$SUPPORTED_SITES" != "$(tail -n2 debian/control|awk NF|sed 's|^ ||')" ] && \
|
||||||
echo -e ">>>Site replacement needs fixing, exiting...<<<\n" && exit
|
echo -e ">>>Site replacement needs fixing, exiting...<<<\n" && exit
|
||||||
|
|
||||||
apply_patch_changes
|
|
||||||
|
|
||||||
changelog "Remove explicit site listing, redirecting to website author."
|
changelog "Remove explicit site listing, redirecting to website author."
|
||||||
|
|
||||||
package
|
package
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue