helpers/DATA/casper/set_liveuser_uid_1000.patch

+diff --git a/bin/casper-snapshot b/bin/casper-snapshot
+index ab075292..33243f63 100755
+--- a/bin/casper-snapshot
++++ b/bin/casper-snapshot
+@@ -33,7 +33,7 @@ VERSION=0.0.1
+ if [ -e /etc/casper.conf ]; then
+ 	. /etc/casper.conf
+ else
+-	USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
++	USERNAME=$(cat /etc/passwd | grep "1000" | cut -f1 -d ':')
+ 	HOSTNAME=$(hostname)
+ 	BUILD_SYSTEM="Debian"
+ fi
+diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
+index d6c75e66..c80e2058 100755
+--- a/scripts/casper-bottom/15autologin
++++ b/scripts/casper-bottom/15autologin
+@@ -90,9 +90,6 @@ if [ -f /root/usr/bin/sddm ]; then
+         sddm_session=QLubuntu.desktop
+     fi
+     cat >>/root/etc/sddm.conf <<EOF
+-[Users]
+-MinimumUid=999
+-
+ [Autologin]
+ User=$USERNAME
+ Session=$sddm_session
+diff --git a/scripts/casper-bottom/25adduser b/scripts/casper-bottom/25adduser
+index 8320e710..efbf5677 100755
+--- a/scripts/casper-bottom/25adduser
++++ b/scripts/casper-bottom/25adduser
+@@ -57,7 +57,8 @@ db_set passwd/root-password-crypted '*'
+ db_set passwd/user-password-crypted U6aMy0wojraho
+ db_set passwd/user-fullname "$USERFULLNAME"
+ db_set passwd/username "$USERNAME"
+-db_set passwd/user-uid 999
++# Per LP: #2004092, systemd uses 995-999
++db_set passwd/user-uid 1000
+ 
+ chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
+ if [ ! -f /root/usr/bin/sddm ]; then
+@@ -93,11 +94,6 @@ for file in /usr/share/applications/ubiquity.desktop /usr/share/applications/kde
+     fi
+ done
+ 
+-# GDM
+-if [ -d /root/etc/gdm3 ]; then
+-    sed -i '/^[UG]ID_MIN/s/\<1000$/ 999/' /root/etc/login.defs
+-fi
+-
+ # Kubuntu
+ if [ -f "/root/usr/bin/plasma-desktop" ]; then
+     if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/a_welcome.desktop" ]; then

helpers/DATA/casper/set_trisquel_iso_suggestion.patch

+--- a/scripts/casper    2023-02-13 23:53:18.908768968 -0600
++++ b/scripts/casper    2023-02-21 03:28:55.176581755 -0600
+@@ -376,18 +376,18 @@
+     # maybe make livecd-rootfs embed something in the casper initrd?
+     case $PRETTY_NAME in
+         *development*)
+-            server_url=http://cdimage.ubuntu.com/ubuntu-server/daily-live/current/$UBUNTU_CODENAME-live-server-$DPKG_ARCH.iso
+-            desktop_url=http://cdimage.ubuntu.com/daily-live/current/$UBUNTU_CODENAME-desktop-$DPKG_ARCH.iso
++            server_url=""
++            desktop_url=""
+             ;;
+         *)
+             case $DPKG_ARCH in
+                 amd64)
+-                    server_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
+-                    desktop_url=https://releases.ubuntu.com/$UBUNTU_CODENAME/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
++                    server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
++                    desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
+                     ;;
+                 *)
+-                    server_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-live-server-$DPKG_ARCH.iso
+-                    desktop_url=http://cdimage.ubuntu.com/releases/$UBUNTU_CODENAME/release/ubuntu-$VERSION_ID-desktop-$DPKG_ARCH.iso
++                    server_url=http://cdimage.trisquel.org/trisquel-images/${ID}-netinst_${VERSION_ID}_${DPKG_ARCH}.iso
++                    desktop_url=http://cdimage.trisquel.org/trisquel-images/${ID}_${VERSION_ID}_${DPKG_ARCH}.iso
+                     ;;
+             esac
+             ;;

helpers/DATA/choose-mirror/rev_Makefile.patch

+diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile choose-mirror-2.111/Makefile
+--- choose-mirror-2.78ubuntu7+10.0trisquel3/Makefile	2021-02-26 15:22:56.000000000 -0600
++++ choose-mirror-2.111/Makefile	2021-06-04 12:09:55.000000000 -0500
+@@ -33,8 +33,8 @@
+ STRIP=strip
+ 
+ # Derivative distributions may want to change these.
+-#MIRRORLISTURL=https://gitlab.trisquel.org/trisquel/trisquel-packages/-/raw/master/extra/mirrors/Mirrors.masterlist
+-MASTERLIST=Mirrors.masterlist.trisquel
++MIRRORLISTURL=https://salsa.debian.org/mirror-team/masterlist/raw/master/Mirrors.masterlist
++MASTERLIST=Mirrors.masterlist
+ 
+ ifdef DEBUG
+ CFLAGS:=$(CFLAGS) -DDODEBUG

helpers/DATA/choose-mirror/rev_choose-mirror-bin.templates-in.patch

+diff -ru choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in choose-mirror-2.111/debian/choose-mirror-bin.templates-in
+--- choose-mirror-2.78ubuntu7+10.0trisquel3/debian/choose-mirror-bin.templates-in	2021-02-26 15:22:56.000000000 -0600
++++ choose-mirror-2.111/debian/choose-mirror-bin.templates-in	2021-02-08 06:52:03.000000000 -0600
+@@ -12,10 +12,14 @@
+ Type: select
+ Choices-C: ${CHOICES-C}
+ Choices: ${CHOICES}
+-Default: _CODENAME_
+-Description: Trisquel version to install:
+- In Trisquel, this question is never asked, and is only for preseeding.
+- Caveat emptor.
++# :sl2:
++_Description: Debian version to install:
++ Debian comes in several flavors. Stable is well-tested and rarely changes.
++ Unstable is untested and frequently changing. Testing is a middle ground,
++ that receives many of the new versions from unstable if they are not too
++ buggy.
++ .
++ Only flavors available on the selected mirror are listed.
+ 
+ Template: mirror/codename
+ Type: string

helpers/DATA/command-not-found/fix_test.patch

+diff -ru source/CommandNotFound/db/tests/test_db.py source/CommandNotFound/db/tests/test_db.py_fix
+--- source/CommandNotFound/db/tests/test_db.py	2021-12-08 04:53:19.000000000 -0600
++++ source/CommandNotFound/db/tests/test_db.py_fix	2022-08-26 01:26:06.984427040 -0500
+@@ -11,7 +11,7 @@
+ from CommandNotFound.db.creator import DbCreator
+ from CommandNotFound.db.db import SqliteDatabase
+ 
+-mock_commands_bionic_backports = """suite: bionic-backports
++mock_commands_etiona_backports = """suite: etiona-backports
+ component: main
+ arch: all
+ 
+@@ -20,7 +20,7 @@
+ commands: script,wall,new-stuff-only-in-backports
+ """
+ 
+-mock_commands_bionic_proposed = """suite: bionic-proposed
++mock_commands_etiona_proposed = """suite: etiona-proposed
+ component: main
+ arch: all
+ 
+@@ -29,7 +29,7 @@
+ commands: script,wall
+ """
+ 
+-mock_commands_bionic = """suite: bionic
++mock_commands_etiona = """suite: etiona
+ component: main
+ arch: all
+ 
+@@ -65,7 +65,7 @@
+ ignore-commands: ignore-me
+ """
+ 
+-mock_commands_bionic_universe = """suite: bionic
++mock_commands_etiona_universe = """suite: etiona
+ component: universe
+ arch: all
+ 
+@@ -84,7 +84,7 @@
+         shutil.rmtree(self.tmpdir)
+ 
+     def make_mock_commands_file(self, suite, content):
+-        path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.ubuntu.com_ubuntu_dists_%s_Commands-all" % suite)
++        path = os.path.join(self.tmpdir, "var", "lib", "apt", "lists", "archive.trisquel.org_trisquel_dists_%s_Commands-all" % suite)
+         try:
+             os.makedirs(os.path.dirname(path))
+         except OSError:
+@@ -95,7 +95,7 @@
+         
+     def test_create_trivial_db(self):
+         mock_commands_file = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_file])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -108,9 +108,9 @@
+ 
+     def test_create_multiple_dbs(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-proposed_main", mock_commands_bionic_proposed)
++            "etiona-proposed_main", mock_commands_etiona_proposed)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -131,9 +131,9 @@
+ 
+     def test_create_backports_excluded_dbs(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-backports_main", mock_commands_bionic_backports)
++            "etiona-backports_main", mock_commands_etiona_backports)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -146,7 +146,7 @@
+ 
+     def test_create_no_versions_does_not_crash(self):
+         mock_commands = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic.replace("version: 1.0\n", ""))
++            "etiona_main", mock_commands_etiona.replace("version: 1.0\n", ""))
+         cre = DbCreator([mock_commands])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -157,11 +157,8 @@
+         
+     def test_create_priorities_work(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
+-        mock_commands_2 = self.make_mock_commands_file(
+-            "bionic_universe", mock_commands_bionic_universe)
+-        self.assertNotEqual(mock_commands_1, mock_commands_2)
+-        cre = DbCreator([mock_commands_1, mock_commands_2])
++            "etiona_main", mock_commands_etiona)
++        cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+         # validate content
+@@ -173,12 +170,11 @@
+                 db.lookup("bzr"), [
+                     ("bzr1", "1.0", "main"),
+                     ("bzr2", "2.7", "main"),
+-                    ("bzr-tng", "3.0", "universe"),
+                 ])
+ 
+     def test_priorities_bonus_works(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -193,7 +189,7 @@
+ 
+     def test_visible_pkgname_works(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_1])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -205,9 +201,9 @@
+ 
+     def test_create_multiple_no_unneeded_creates(self):
+         mock_commands_1 = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         mock_commands_2 = self.make_mock_commands_file(
+-            "bionic-proposed_main", mock_commands_bionic_proposed)
++            "etiona-proposed_main", mock_commands_etiona_proposed)
+         cre = DbCreator([mock_commands_1, mock_commands_2])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)
+@@ -220,7 +216,7 @@
+ 
+     def test_create_honors_ignore_comamnds(self):
+         mock_commands_file = self.make_mock_commands_file(
+-            "bionic_main", mock_commands_bionic)
++            "etiona_main", mock_commands_etiona)
+         cre = DbCreator([mock_commands_file])
+         dbpath = os.path.join(self.tmpdir, "test.db")
+         cre.create(dbpath)

helpers/DATA/command-not-found/no_extra_repos.patch

+diff -ru source.orig/CommandNotFound/CommandNotFound.py source/CommandNotFound/CommandNotFound.py
+--- source.orig/CommandNotFound/CommandNotFound.py	2021-12-08 05:53:19.000000000 -0500
++++ source/CommandNotFound/CommandNotFound.py	2023-06-09 16:52:12.675354733 -0400
+@@ -227,8 +227,6 @@
+         else:
+             print("apt install %s" % packages[0][0], file=self.output_fd)
+             print(_("Please ask your administrator."))
+-            if not packages[0][2] in self.sources_list:
+-                print(_("You will have to enable the component called '%s'") % packages[0][2], file=self.output_fd)
+         self.output_fd.flush()
+ 
+     def sudo(self):
+@@ -246,10 +244,7 @@
+                     ver = "  # version %s, or" % (package[1])
+                 else:
+                     ver = "  # version %s" % (package[1])
+-            if package[2] in self.sources_list:
+-                print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver), file=self.output_fd)
+-            else:
+-                print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver) + " (" + _("You will have to enable component called '%s'") % package[2] + ")", file=self.output_fd)
++            print("%sapt install %-*s%s" % (self.sudo(), pad, package[0], ver), file=self.output_fd)
+         if self.euid != 0 and not self.user_can_sudo:
+             print(_("Ask your administrator to install one of them."), file=self.output_fd)
+         self.output_fd.flush()

helpers/DATA/compton/compton-launcher

-#!/bin/sh
-
-[ $DESKTOP_SESSION = "trisquel-session" ] || exit 0
-[ -f $HOME/.config/disable-compton ] && exit 0
-
-FILE=/etc/compton.conf
-[ -f $HOME/.config/compton.conf ] && FILE="$HOME/.config/compton.conf"
-
-[ 0 != $(glxinfo |grep "renderer string:" |grep -v llvmpipe | wc -c) ]  && exec compton --config $FILE &

helpers/DATA/compton/compton.conf

@@ -8,12 +8,11 @@
 # GLX backend is typically much faster but depends on a sane driver.
 backend = "glx";
 
-#################################
-#
-# GLX backend
-#
-#################################
+# Needed on some systems to avoid delay in changes of screen contents. (e.g. Pluma)
+xrender-sync         = true;
+xrender-sync-fence   = true;
 
+# GLX backend: Avoid using stencil buffer, useful if you don’t have a stencil buffer.
 glx-no-stencil = true;
 
 # GLX backend: Copy unmodified regions from front buffer instead of redrawing them all.
@@ -34,7 +33,6 @@ glx-copy-from-front = false;
 # Recommended if it works.
 # glx-no-rebind-pixmap = true;
 
-
 # GLX backend: GLX buffer swap method we assume.
 # Could be undefined (0), copy (1), exchange (2), 3-6, or buffer-age (-1).
 # undefined is the slowest and the safest, and the default value.
@@ -60,15 +58,15 @@ no-dnd-shadow = true;
 # Avoid drawing shadows on dock/panel windows.
 no-dock-shadow = true;
 # Zero the part of the shadow's mask behind the window. Fix some weirdness with ARGB windows.
-clear-shadow = true;
+clear-shadow = false;
 # The blur radius for shadows. (default 12)
-shadow-radius = 5;
+shadow-radius = 10;
 # The left offset for shadows. (default -15)
-shadow-offset-x = -8;
+shadow-offset-x = -12;
 # The top offset for shadows. (default -15)
-shadow-offset-y = -8;
+shadow-offset-y = -12;
 # The translucency for shadows. (default .75)
-shadow-opacity = 0.6;
+shadow-opacity = 0.4;
 
 # Set if you want different colour shadows
 # shadow-red = 0.0;
@@ -79,8 +77,7 @@ shadow-opacity = 0.6;
 # (most applications are fine, only apps that do weird things with xshapes or argb are affected).
 # This list includes all the affected apps I found in my testing. The "! name~=''" part excludes shadows on any "Unknown" windows, this prevents a visual glitch with the XFWM alt tab switcher.
 shadow-exclude = [
-    "argb",
-    #"! name~=''",
+    "! name~=''",
     "name = 'Notification'",
     "name = 'Plank'",
     "name = 'Docky'",
@@ -88,10 +85,7 @@ shadow-exclude = [
     "name = 'xfce4-notifyd'",
     "name *= 'VLC'",
     "name *= 'compton'",
-    "name *= 'Chromium'",
-    "name *= 'Chrome'",
     "name *= 'Firefox'",
-    "name *= 'Abrowser'",
     "name *= 'IceCat'",
     "name *= 'Totem'",
     "name *= 'XBMC'",
@@ -101,7 +95,8 @@ shadow-exclude = [
     "class_g ?= 'Notify-osd'",
     "class_g ?= 'Cairo-dock'",
     "class_g ?= 'Xfce4-notifyd'",
-    "class_g ?= 'Xfce4-power-manager'"
+    "class_g ?= 'Xfce4-power-manager'",
+    "_GTK_FRAME_EXTENTS@:c"
 ];
 # Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
 shadow-ignore-shaped = false;
@@ -112,7 +107,7 @@ shadow-ignore-shaped = false;
 #
 #################################
 
-menu-opacity = 0.95;
+menu-opacity = 1;
 inactive-opacity = 1;
 active-opacity = 1;
 frame-opacity = 1;
@@ -152,7 +147,7 @@ fade-out-step = 0.03;
 # no-fading-openclose = true;
 
 # Specify a list of conditions of windows that should not be faded.
-fade-exclude = [ ];
+fade-exclude = [ " window_type *= 'menu'" ];
 
 #################################
 #
@@ -187,7 +182,7 @@ refresh-rate = 0;
 # opengl-swc: Try to VSync with SGI_swap_control OpenGL extension. Only work on some drivers. Works only with GLX backend. Known to be most effective on many drivers. Does not actually control paint timing, only buffer swap is affected, so it doesn’t have the effect of --sw-opti unlike other methods. Experimental.
 # opengl-mswc: Try to VSync with MESA_swap_control OpenGL extension. Basically the same as opengl-swc above, except the extension we use.
 # (Note some VSync methods may not be enabled at compile time.)
-vsync = "opengl-swc";
+vsync = "opengl";
 
 # Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing.
 # Reported to have no effect, though.
@@ -229,7 +224,7 @@ wintypes:
         # shadow: Give those windows shadow
         shadow = false;
         # opacity: Default opacity for the type of windows.
-        opacity = 0.85;
+        opacity = 1;
         # focus: Whether to always consider windows of this type focused.
         focus = true;
     };

helpers/DATA/compton/trisquel-compton-switcher

-#!/bin/bash
-
-
-DONT_SUPPORT_3D="Your machine does not support 3D acceleration"
-
-if [ $LANG = es_ES.UTF-8 ]; then
-    DONT_SUPPORT_3D="Su equipo no soporta aceleración 3D"
-fi
-
-# First, check if the computer
-# supports 3D acceleration. If not, it 
-# it informs the user and then exits.
-[ 0 = $(glxinfo |grep "renderer string:" |grep -v llvmpipe | wc -c) ] && zenity \
-    --info --text="$DONT_SUPPORT_3D" && exit 0
-
-# Check if compton is currently running.
-case "$(pgrep -u $USER compton | wc -w)" in
-
-    0)  COMPTON_RUNNING=false
-	;;
-    1)  COMPTON_RUNNING=true
-	;;
-esac
-
-
-if $COMPTON_RUNNING; then
-    COMPTON=true
-    DISCOMPTON=false
-
-elif ! $COMPTON_RUNNING; then
-    COMPTON=false
-    DISCOMPTON=true
-fi
-
-# The text that will be showed to the user.
-TEXT="Use Compton compositor if 3d acceleration available"
-TITLE="Choose between enabling or disabling Compton"
-COMPTON_ENABLED="Compton enabled"
-COMPTON_DISABLED="Compton disabled"
-INFO="Compton is already running"
-
-
-#Checks the languange of the system (more can be added in the future) and displays the text corresponding to the language selected.
-if [ $LANG = es_ES.UTF-8 ]; then
-    TEXT="Usar el compositor Compton si el equipo soporta aceleración 3D"
-    TITLE="Seleccionar entre habilitar o deshabilitar los efectos de Compton"
-    COMPTON_ENABLED="Compton habilitado"
-    COMPTON_DISABLED="Compton deshabilitado"
-    INFO="Compton ya se encuentra en ejecución"
-fi
-
-# Zenity is summoned to interact with the user.
-# The XOR with the "exit 0" means that the script
-# will exit with no error if zenity is "canceled"
-# (user clicking on the "cancel" button, for
-# instance).
-ans=$(zenity --list --hide-header\
-    --title "$TITLE"\
-    --text "$TEXT"\
-    --radiolist\
-    --column "" --column ""\
-    $COMPTON "$COMPTON_ENABLED"\
-    $DISCOMPTON "$COMPTON_DISABLED" || exit 0)
-
-# Evaluate if compton is runnning or not, if it does,
-# warn the user if he/she tries to run compton again
-# or disable the compositor if he/she select to disable
-# it. If compton is not running, run and enable it if
-# the user selects to do so:
-# .-----------------.
-# |                 |
-# |                 |
-# | Compton running |
-# |                 |
-# |                 |
-# '-----------------'
-#          |
-#          |   .-----------------.   .-----------------.
-#          |-->| User selects no |-->| Disable compton |
-#          |   '-----------------'   '-----------------'
-#          |   .------------------.  .-----------------.
-#          '-->| User selects yes |->| Inform the user |
-#              '------------------'  '-----------------'
-# .---------------------.
-# |                     |
-# |                     |
-# | Compton not running |
-# |                     |
-# |                     |
-# '---------------------'
-#            |
-#            |   .-----------------.   .------------.
-#            |-->| User selects no |-->| Do nothing |
-#            |   '-----------------'   '------------'
-#            |   .------------------.   .-----------------.
-#            '-->| User selects yes |-->| Enable compton  |
-#                '------------------'   '-----------------'
-if $COMPTON_RUNNING  # Compton running
-then
-    if  [[ $ans == $COMPTON_DISABLED ]]; then
-	touch $HOME/.config/disable-compton
-	killall compton
-    elif [[ $ans == $COMPTON_ENABLED  ]]; then
-	zenity --info --text="$INFO"
-    fi
-else  # Compton not running
-    if [[ $ans == $COMPTON_ENABLED ]]; then
-	rm -f $HOME/.config/disable-compton
-	compton-launcher
-    else
-	exit 0
-    fi
-fi
\ No newline at end of file

helpers/DATA/console-setup/modify_20console-setup.patch

+diff -Nru console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer
+--- console-setup/console-setup-1.205ubuntu3-11.0trisquel5.4/debian/console-setup-udeb.base-installer	2021-07-23 22:45:19.000000000 -0500
++++ console-setup_diff/console-setup-1.205ubuntu3-11.0trisquel5.2/debian/console-setup-udeb.base-installer	2022-12-17 18:07:01.460681582 -0600
+@@ -21,9 +21,8 @@
+     if ! db_get oem-config/enable || [ "$RET" != true ]; then
+ 	# create the required templates
+ 	debconf-copydb -p "^keyboard-configuration/.*$" configdb target_configdb
+-
+-	# mark the questions as seen
+-	for template in \## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp
++	for template in \
++## SEEN TEMPLATES ## all templates of keyb-conf except alerts and ctrl_alt_bksp
+ 	do
+ 	    echo keyboard-configuration $template seen true
+ 	done | chroot /target debconf-set-selections

helpers/DATA/cwidget/0002-Fix-cwidget-and-aptitude-FTBFS.patch

+Description: Fix FTBFS in cwidget as well as in aptitude due to missing #include <pthread.h>
+Author: Paul Wise <pabs@debian.org>
+Reviewed-By: Axel Beckert <abe@debian.org>
+Bug-Debian: https://bugs.debian.org/1015925
+Bug: https://bugs.debian.org/1015925
+
+--- a/src/cwidget/generic/threads/threads.h
++++ b/src/cwidget/generic/threads/threads.h
+@@ -26,6 +26,7 @@
+ #define THREADS_H
+ 
+ #include <errno.h>
++#include <pthread.h>
+ #include <cwidget/generic/util/exception.h>
+ 
+ namespace cwidget

helpers/DATA/db/007-mt19937db.c_license.patch

-Description: mt19937db.c license should include the GPL
- This file is distributed from upstream Berkeley DB under the Artistic
- License (no version specified), althouth it was later released by the
- original author under both GPL2+ and BSD.
- .
- References:
- http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
- http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
- https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
- https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
- .
-Author: Ruben Rodriguez <ruben@trisquel.info>
-
-
---- db-5.1.25.orig/src/crypto/mersenne/mt19937db.c
-+++ db-5.1.25/src/crypto/mersenne/mt19937db.c
-@@ -16,16 +16,27 @@
- /*   Coded by Takuji Nishimura, considering the suggestions by    */
- /* Topher Cooper and Marc Rieffel in July-Aug. 1997.              */
- 
--/* This library is free software under the Artistic license:       */
--/* see the file COPYING distributed together with this code.       */
--/* For the verification of the code, its output sequence file      */
--/* mt19937int.out is attached (2001/4/2)                           */
--
- /* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
- /* Any feedback is very welcome. For any question, comments,       */
- /* see http://www.math.keio.ac.jp/matumoto/emt.html or email       */
- /* matumoto@math.keio.ac.jp                                        */
- 
-+/* This library is free software; you can redistribute it and/or   */
-+/* modify it under the terms of the GNU Library General Public     */
-+/* License as published by the Free Software Foundation; either    */
-+/* version 2 of the License, or (at your option) any later         */
-+/* version.                                                        */
-+/* This library 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 Library General Public License for more details.    */
-+/* You should have received a copy of the GNU Library General      */
-+/* Public License along with this library; if not, write to the    */
-+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA   */ 
-+/* 02111-1307  USA                                                 */
-+
-+/* This library is free software under the Artistic license:       */
-+
- /* REFERENCE                                                       */
- /* M. Matsumoto and T. Nishimura,                                  */
- /* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform  */

helpers/DATA/db4.7/007-mt19937db.c_license.patch

-Description: mt19937db.c license should include the GPL
- This file is distributed from upstream Berkeley DB under the Artistic
- License (no version specified), althouth it was later released by the
- original author under both GPL2+ and BSD.
- .
- References:
- http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
- http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
- https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
- https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
- .
-Author: Ruben Rodriguez <ruben@trisquel.info>
-
-
---- a/crypto/mersenne/mt19937db.c
-+++ b/crypto/mersenne/mt19937db.c
-@@ -16,16 +16,27 @@
- /*   Coded by Takuji Nishimura, considering the suggestions by    */
- /* Topher Cooper and Marc Rieffel in July-Aug. 1997.              */
- 
--/* This library is free software under the Artistic license:       */
--/* see the file COPYING distributed together with this code.       */
--/* For the verification of the code, its output sequence file      */
--/* mt19937int.out is attached (2001/4/2)                           */
--
- /* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
- /* Any feedback is very welcome. For any question, comments,       */
- /* see http://www.math.keio.ac.jp/matumoto/emt.html or email       */
- /* matumoto@math.keio.ac.jp                                        */
- 
-+/* This library is free software; you can redistribute it and/or   */
-+/* modify it under the terms of the GNU Library General Public     */
-+/* License as published by the Free Software Foundation; either    */
-+/* version 2 of the License, or (at your option) any later         */
-+/* version.                                                        */
-+/* This library 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 Library General Public License for more details.    */
-+/* You should have received a copy of the GNU Library General      */
-+/* Public License along with this library; if not, write to the    */
-+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA   */ 
-+/* 02111-1307  USA                                                 */
-+
-+/* This library is free software under the Artistic license:       */
-+
- /* REFERENCE                                                       */
- /* M. Matsumoto and T. Nishimura,                                  */
- /* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform  */

helpers/DATA/db4.8/007-mt19937db.c_license.patch

-Description: mt19937db.c license should include the GPL
- This file is distributed from upstream Berkeley DB under the Artistic
- License (no version specified), althouth it was later released by the
- original author under both GPL2+ and BSD.
- .
- References:
- http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
- http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
- https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
- https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
- .
-Author: Ruben Rodriguez <ruben@trisquel.info>
-
-
---- a/crypto/mersenne/mt19937db.c
-+++ b/crypto/mersenne/mt19937db.c
-@@ -16,16 +16,27 @@
- /*   Coded by Takuji Nishimura, considering the suggestions by    */
- /* Topher Cooper and Marc Rieffel in July-Aug. 1997.              */
- 
--/* This library is free software under the Artistic license:       */
--/* see the file COPYING distributed together with this code.       */
--/* For the verification of the code, its output sequence file      */
--/* mt19937int.out is attached (2001/4/2)                           */
--
- /* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
- /* Any feedback is very welcome. For any question, comments,       */
- /* see http://www.math.keio.ac.jp/matumoto/emt.html or email       */
- /* matumoto@math.keio.ac.jp                                        */
- 
-+/* This library is free software; you can redistribute it and/or   */
-+/* modify it under the terms of the GNU Library General Public     */
-+/* License as published by the Free Software Foundation; either    */
-+/* version 2 of the License, or (at your option) any later         */
-+/* version.                                                        */
-+/* This library 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 Library General Public License for more details.    */
-+/* You should have received a copy of the GNU Library General      */
-+/* Public License along with this library; if not, write to the    */
-+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA   */ 
-+/* 02111-1307  USA                                                 */
-+
-+/* This library is free software under the Artistic license:       */
-+
- /* REFERENCE                                                       */
- /* M. Matsumoto and T. Nishimura,                                  */
- /* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform  */

helpers/DATA/debian-installer/chmod_755_ld-linux2.patch

+diff --git a/build/Makefile b/build/Makefile
+index c073a32..cace03d 100644
+--- a/build/Makefile
++++ b/build/Makefile
+@@ -431,6 +431,12 @@ endif
+ 
+ ifeq ($(DEB_HOST_ARCH_OS),linux)
+ ifdef KERNELVERSION
++ifneq ($(DEB_HOST_ARCH),ppc64el)
++	find $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ -name "ld-linux*" | xargs -r chmod 755
++endif
++ifeq ($(DEB_HOST_ARCH),ppc64el)
++	chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld*.so*
++endif
+ 	# Set up modules.dep, ensure there is at least one standard dir (kernel
+ 	# in this case), so depmod will use its prune list for archs with no
+ 	# modules.

helpers/DATA/debian-installer/di_focal/1422_1421.diff

+=== modified file 'build/Makefile'
+--- build/Makefile	2010-11-05 16:34:29 +0000
++++ build/Makefile	2011-03-01 11:42:39 +0000
+@@ -294,6 +294,7 @@
+ 	rm -rf $(TREE)
+ 	# Set up the basic files [u]dpkg needs.
+ 	mkdir -p $(DPKGDIR)/info
++	ln -nsf . $(DPKGDIR)/info/$(shell dpkg --print-architecture)
+ 	touch $(DPKGDIR)/status
+ 	# Create a tmp tree
+ 	mkdir -p $(TREE)/tmp
+@@ -457,6 +458,7 @@
+ 
+ 	mkdir -p $(EXTRAUDEBSDIR)
+ 	mkdir -p $(EXTRAUDEBSDPKGDIR)/info $(EXTRAUDEBSDPKGDIR)/updates
++	ln -nsf . $(EXTRAUDEBSDPKGDIR)/info/$(shell dpkg --print-architecture)
+ 	touch $(EXTRAUDEBSDPKGDIR)/status $(EXTRAUDEBSDPKGDIR)/available
+ 
+ ifdef EXTRADRIVERS
+
+#=== modified file 'debian/changelog'
+#--- debian/changelog	2011-03-01 10:36:50 +0000
+#+++ debian/changelog	2011-03-01 11:42:39 +0000
+#@@ -1,3 +1,10 @@
+#+debian-installer (20101020ubuntu21) UNRELEASED; urgency=low
+#+
+#+  * Install /var/lib/dpkg/info/$(dpkg --print-architecture) -> . symlink so
+#+    that images build correctly in the presence of multiarch dpkg.
+#+
+#+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 01 Mar 2011 11:41:38 +0000
+#+
+# debian-installer (20101020ubuntu20) natty; urgency=low
+# 
+#   * Stop building the armel dove subarchitecture; it no longer has a kernel
+#

helpers/DATA/debian-installer/di_focal/1677_1676.diff

+=== modified file 'build/Makefile'
+#--- build/Makefile	2011-12-15 15:35:38 +0000
+#+++ build/Makefile	2012-04-18 05:24:59 +0000
+#@@ -493,6 +493,12 @@
+# 		`find $(TEMP) -type f -a \( -perm +0111 -o -name '*.so' -o -name '*.so.*' \) | \
+# 		 grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
+# 
+#+ifeq ($(DEB_HOST_ARCH),armhf)
+#+	# armhf has two linkers for now, while the world gets sorted
+#+	mkdir -p $(TREE)/lib/arm-linux-gnueabihf
+#+	ln -s /lib/ld-linux-armhf.so.3 $(TREE)/lib/arm-linux-gnueabihf/ld-linux.so.3
+#+endif
+#+
+# ifeq ($(DEB_HOST_ARCH_OS),hurd)
+# 	# On Hurd the SONAME for the dynamic linker is ld.so.1, but binaries
+# 	# have the ld.so symlink as the interpreter. Ideally mklibs should
+#
+=== modified file 'build/config/armhf.cfg'
+--- build/config/armhf.cfg	2012-04-11 08:52:18 +0000
++++ build/config/armhf.cfg	2012-04-18 05:24:59 +0000
+@@ -1,5 +1,7 @@
+ SUBARCH_SUPPORTED = omap omap4 armadaxp
+ 
++MKLIBS = mklibs --ldlib=/lib/ld-linux-armhf.so.3
++
+ KERNELMAJOR = 2.6
+ KERNELVERSION = 3.2.0-23
+ KERNEL_FLAVOUR = di
+
+#=== modified file 'debian/changelog'
+#--- debian/changelog	2012-04-13 13:14:35 +0000
+#+++ debian/changelog	2012-04-18 05:24:59 +0000
+#@@ -1,3 +1,12 @@
+#+debian-installer (20101020ubuntu134) precise; urgency=low
+#+
+#+  * Call mklibs with a hardcoded --ldlib in armhf.cfg, so we get a
+#+    deterministic result in our linker search, and then add the
+#+    symlink from the old linker path in build/Makefile (LP: #984007)
+#+  * Rebuild with latest omap4 kernels for ext2 support (LP: #984180)
+#+
+#+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 17 Apr 2012 23:20:29 -0600
+#+
+# debian-installer (20101020ubuntu133) precise; urgency=low
+# 
+#   * Move armel/omap4 and armhf/omap4 to 3.2.0-1412.
+#