diff --git a/helpers/DATA/apt/trisquel/apt-vendor.ent b/helpers/DATA/apt/trisquel/apt-vendor.ent index e61a665..c443816 100644 --- a/helpers/DATA/apt/trisquel/apt-vendor.ent +++ b/helpers/DATA/apt/trisquel/apt-vendor.ent @@ -6,11 +6,15 @@ - + + +Types: deb +URIs: http://archive.trisquel.org/trisquel +Suites: &trisquel-codename;-security +Components: main"> diff --git a/helpers/DATA/apt/trisquel/sources.list.in b/helpers/DATA/apt/trisquel/sources.list.in new file mode 100644 index 0000000..9c530ba --- /dev/null +++ b/helpers/DATA/apt/trisquel/sources.list.in @@ -0,0 +1,10 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://archive.trisquel.org/trisquel &trisquel-codename; main +deb-src http://archive.trisquel.org/trisquel &trisquel-codename; main + +deb http://archive.trisquel.org/trisquel &trisquel-codename;-security main +deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-security main + +deb http://archive.trisquel.org/trisquel &trisquel-codename;-updates main +deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-updates main diff --git a/helpers/DATA/apt/trisquel/trisquel.sources.in b/helpers/DATA/apt/trisquel/trisquel.sources.in deleted file mode 100644 index 32f8209..0000000 --- a/helpers/DATA/apt/trisquel/trisquel.sources.in +++ /dev/null @@ -1,40 +0,0 @@ -## Trisquel distribution repository -## -## The following settings can be adjusted to configure which packages to use from Trisquel. -## Mirror your choices (except for URIs and Suites) in the security section below to -## ensure timely security updates. -## -## Types: Append deb-src to enable the fetching of source package. -## URIs: A URL to the repository (you may add multiple URLs) -## Suites: The following additional suites can be configured -## -updates - Major bug fix updates produced after the final release of the -## distribution. -## -backports - software from this repository may not have been tested as -## extensively as that contained in the main release, although it includes -## newer versions of some applications which may provide useful features. -## Also, please note that software in backports WILL NOT receive any review -## or updates from the Trisquel security team. -## -## See the sources.list(5) manual page for further settings. - -# Trisquel repositories for supported software and updates -Types: deb -URIs: http://archive.trisquel.org/trisquel/ -Suites: &trisquel-codename; &trisquel-codename;-updates &trisquel-codename;-security -Components: main -Signed-By: /usr/share/keyrings/trisquel-archive-keyring.gpg - -# Uncomment to enable source package repositories -Types: deb-src -URIs: http://archive.trisquel.org/trisquel/ -Suites: &trisquel-codename; &trisquel-codename;-updates &trisquel-codename;-security -Components: main -Signed-By: /usr/share/keyrings/trisquel-archive-keyring.gpg - -# Uncomment to enable optional backports repository -Enabled: no -Types: deb deb-src -URIs: http://archive.trisquel.org/trisquel/ -Suites: &trisquel-codename;-backports -Components: main -Signed-By: /usr/share/keyrings/trisquel-archive-keyring.gpg diff --git a/helpers/DATA/python-apt/patch_changes/000-add_cmxsl_mirror.patch b/helpers/DATA/python-apt/patch_changes/000-add_cmxsl_mirror.patch deleted file mode 100644 index 424fa1f..0000000 --- a/helpers/DATA/python-apt/patch_changes/000-add_cmxsl_mirror.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/data/templates/Trisquel.mirrors b/data/templates/Trisquel.mirrors -index b6c391e..e4b0bca 100644 ---- a/data/templates/Trisquel.mirrors -+++ b/data/templates/Trisquel.mirrors -@@ -22,6 +22,9 @@ https://quantum-mirror.hu/mirrors/pub/trisquel/packages/ - http://quantum-mirror.hu/mirrors/pub/trisquel/packages/ - #LOC:JP - https://repo.jing.rocks/trisquel/ -+#LOC:MX -+https://mirror.cmxsl.org/trisquel/ -+http://mirror.cmxsl.org/trisquel/ - #LOC:SE - https://ftp.acc.umu.se/mirror/trisquel/packages/ - http://ftp.acc.umu.se/mirror/trisquel/packages/ diff --git a/helpers/config b/helpers/config index 821aa90..2f07c55 100755 --- a/helpers/config +++ b/helpers/config @@ -37,20 +37,19 @@ fi [ -d PACKAGES ] || mkdir PACKAGES -CMXSLVER=${CMXSLVER:-0} export DEBIAN_FRONTEND=noninteractive -export DEBEMAIL=devel@cmxsl.org -export DEBFULLNAME="Capitulo Mexicano de Software Libre" +export DEBEMAIL=trisquel-devel@listas.trisquel.info +export DEBFULLNAME="Trisquel GNU/Linux developers" export CODENAME=ecne export REVISION=12.0 -export RELEASE=cmxsl -export DOMAIN=cmxsl.org +export RELEASE=trisquel +export DOMAIN=trisquel.info export UPSTREAM=noble export UPSTREAMRELEASE=24.04 -MIRROR=http://archive.ubuntu.com/ubuntu/ +MIRROR=http://archive.ubuntu.com/ubuntu LOCALMIRROR=http://archive.trisquel.org/trisquel -GIT_TPH_REPO=https://git.cmxsl.org/CMXSL.org/package-helpers-cmxsl -LOCAL_APT=`mktemp -d` +GIT_TPH_REPO=https://gitlab.trisquel.org/trisquel/package-helpers +LOCAL_APT=`mktemp -d` 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) truncate_version() { @@ -113,7 +112,7 @@ head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-securi changelog_multiline "$msg" "$FULLVERSION" "$REPO" # Make sure the changelog file is identical between archs -/bin/sed "/-- Desarrollo/s/.*/ -- Desarrollo CMXSL $DATE/" -i debian/changelog +/bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers $DATE/" -i debian/changelog } @@ -220,7 +219,7 @@ cd source UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version) -export FULLVERSION=$(dpkg-parsechangelog --show-field Version)trisquel${VERSION}cmxsl${CMXSLVER} +export FULLVERSION=$(dpkg-parsechangelog --show-field Version)trisquel${VERSION} # Use 3.0 (native) deb source format [ -f debian/source/format ] && echo "3 (native)" > debian/source/format @@ -245,7 +244,7 @@ cd .. mv source $PACKAGE-$FULLVERSION dpkg-source -b -I.falsefileextension99 $PACKAGE-$FULLVERSION 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 } diff --git a/helpers/make-apt b/helpers/make-apt index 42a7f02..4442978 100644 --- a/helpers/make-apt +++ b/helpers/make-apt @@ -1,6 +1,5 @@ #!/bin/sh # -# Copyright (C) 2025 Luis Guzmán # Copyright (C) 2008-2018 Rubén Rodríguez # # This program is free software; you can redistribute it and/or modify @@ -21,10 +20,7 @@ #STAGE-1-DEBOOTSTRAP VERSION=4 -CMXSLVER=1 COMPONENT=main -EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' -REPOKEY=6ED0E7B82643E131 . ./config @@ -35,12 +31,8 @@ replace Ubuntu Trisquel . sed -i "s|trisquel-codename \".*\"|trisquel-codename \"$CODENAME\"|" doc/apt-verbatim.ent replace "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg" "http://archive.trisquel.org/trisquel/trisquel-archive-signkey.gpg" . -replace http://security.ubuntu.com/ubuntu http://archive.trisquel.org/trisquel . -replace http://archive.ubuntu.com/ubuntu/ http://archive.trisquel.org/trisquel . replace ubuntu-keyring trisquel-keyring . replace ubuntu-archive-keyring trisquel-archive-keyring . -sed -i 's|https://snapshot.ubuntu.com/ubuntu/|https://archive.trisquel.org/trisquel/|' abicheck/symbol-merge.py -sed -i 's|debian.sources|trisquel.sources|' abicheck/symbol-merge.py # hack, preserve this test untouched cp test/libapt/cdromfindpackages_test.cc /tmp @@ -113,7 +105,7 @@ EOF ## end non-free examples -/bin/sed -i 's_http://archive.ubuntu.com/ubuntu/project/_http://archive.trisquel.info/trisquel/_g; s/ubuntu-archive-keyring/trisquel-archive-keyring/g; s/ubuntu-keyring/trisquel-keyring/g; ' debian/control* +/bin/sed -i 's_http://archive.ubuntu.com/ubuntu/project/_http://archive.trisquel.info/trisquel/_g; s/ubuntu-archive-keyring/trisquel-archive-keyring/g; s/ubuntu-keyring/trisquel-keyring/g; ' cmdline/apt-key.in debian/control* replace Ubuntu Trisquel methods/http.cc replace ubuntu-archive.gpg trisquel-archive.gpg . diff --git a/helpers/make-python-apt b/helpers/make-python-apt index 07169ac..6970245 100644 --- a/helpers/make-python-apt +++ b/helpers/make-python-apt @@ -25,7 +25,6 @@ # The same way as 'ubiquity' is for for the next Live Desktop ISOs. VERSION=11 -CMXSLVER=1 COMPONENT=main #Be aware to not pull/build before publish date on T12. @@ -88,7 +87,6 @@ diff -ru source.orig/apt/progress/base.py source/apt/progress/base.py self.percent = float(percent) EOF -apply_patch_changes export DEB_BUILD_OPTIONS=nocheck changelog "Compiled for Trisquel"