Merge branch 'ecne-cmxsl' of git.cmxsl.org:CMXSL.org/package-helpers-cmxsl into ecne

helpers/DATA/python-apt/patch_changes/000-add_cmxsl_mirror.patch

@@ -0,0 +1,14 @@
+diff --git a/data/templates/Trisquel.mirrors b/data/templates/Trisquel.mirrors
+index 3d766a2..84f76f7 100644
+--- a/data/templates/Trisquel.mirrors
++++ b/data/templates/Trisquel.mirrors
+@@ -20,6 +20,9 @@ http://mirrors.dotsrc.org/trisquel/
+ #LOC:ES
+ https://ftp.caliu.cat/pub/distribucions/trisquel/packages/
+ http://ftp.caliu.cat/pub/distribucions/trisquel/packages/
++#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/

helpers/config

@@ -37,20 +37,21 @@ fi
 
 [ -d PACKAGES ] || mkdir PACKAGES
 
+CMXSLVER=${CMXSLVER:-0}
 export DEBIAN_FRONTEND=noninteractive
-export DEBEMAIL=trisquel-devel@listas.trisquel.info
-export DEBFULLNAME="Trisquel GNU/Linux developers"
+export DEBEMAIL=devel@cmxsl.org
+export DEBFULLNAME="Capitulo Mexicano de Software Libre"
 export CODENAME=ecne
 export REVISION=12.0
-export RELEASE=trisquel
-export DOMAIN=trisquel.info
+export RELEASE=cmxsl
+export DOMAIN=cmxsl.org
 export UPSTREAM=noble
 export UPSTREAMRELEASE=24.04
 export DEBLOB=1
 MIRROR=http://archive.ubuntu.com/ubuntu
 LOCALMIRROR=http://archive.trisquel.org/trisquel
-GIT_TPH_REPO=https://gitlab.trisquel.org/trisquel/package-helpers
-LOCAL_APT=`mktemp -d` 
+GIT_TPH_REPO=https://git.cmxsl.org/CMXSL.org/package-helpers-cmxsl
+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() {
@@ -112,7 +113,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 "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info>  $DATE/" -i debian/changelog
+/bin/sed "/-- Desarrollo/s/.*/ -- Desarrollo CMXSL <devel@cmxsl.org>  $DATE/" -i debian/changelog
 }
 
 
@@ -219,7 +220,7 @@ cd source
 
 UPSTREAMVERSION=$(dpkg-parsechangelog --show-field Version)
 
-export FULLVERSION=$(dpkg-parsechangelog --show-field Version)trisquel${VERSION}
+export FULLVERSION=$(dpkg-parsechangelog --show-field Version)trisquel${VERSION}cmxsl${CMXSLVER}
 
 # Use 3.0 (native) deb source format
 [ -f debian/source/format ] && echo "3 (native)" > debian/source/format
@@ -244,7 +245,7 @@ cd ..
 mv source $PACKAGE-$FULLVERSION
 dpkg-source -b -I.falsefileextension99 $PACKAGE-$FULLVERSION
 rm -rf ${LOCAL_APT}
-echo -e "> Trisquel source package built! - $(date -R)\n"
+echo -e "> CMXSL source package built! - $(date -R)\n"
 
 notify_found_distro_match_on_debian_rules
 }

helpers/make-apt

@@ -21,6 +21,7 @@
 #STAGE-1-DEBOOTSTRAP
 
 VERSION=5
+CMXSLVER=1
 COMPONENT=main
 EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
 REPOKEY=6ED0E7B82643E131
@@ -112,8 +113,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* 
-#cmdline/apt-key.in
+/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*
 replace Ubuntu Trisquel  methods/http.cc
 replace ubuntu-archive.gpg trisquel-archive.gpg .
 

helpers/make-python-apt

@@ -25,6 +25,7 @@
 # The same way as 'ubiquity' is for for the next Live Desktop ISOs.
 
 VERSION=14
+CMXSLVER=1
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu resolute main'
 REPOKEY=871920D1991BC93C
 COMPONENT=main
@@ -93,7 +94,6 @@ diff -ru source.orig/apt/progress/base.py source/apt/progress/base.py
 EOF
 
 apply_patch_changes
-
 export DEB_BUILD_OPTIONS=nocheck
 
 changelog "Compiled for Trisquel