helpers/make-distro-info-data

 #!/bin/sh
 #
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2023 Luis Guzman <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
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=5
 
 . ./config
 
@@ -26,7 +26,10 @@ patch -p0 < $DATA/README.Debian.patch
 
 cp $DATA/trisquel.csv  ./
 
-changelog "Adding trisquel distro info."
+# The Breaks prevents upgrades
+sed '/Breaks:/d' -i debian/control
+
+changelog "Adding trisquel distro info and upstream equivalent."
 
 compile
 

helpers/make-emacs-non-dfsg

@@ -18,13 +18,16 @@
 # emacs-non-dfsg is under GFDL but due to "invariant sections" is considered
 # problematic for Debian
 
-VERSION=1
+VERSION=2
 
 EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM multiverse'
 
 . ./config
 
-sed -i '/Package/s|emacs-common-non-dfsg|emacs-common-gfdl|' debian/control
+replace emacs-common-non-dfsg emacs-common-gfdl
+find -type d |xargs rename s/emacs-common-non-dfsg/emacs-common-gfdl/g
+find -type f |xargs rename s/emacs-common-non-dfsg/emacs-common-gfdl/g
+
 sed -i '/Section:/,/Priority:/s|non-free/editors|editors|' debian/control
 sed -i '/Description:/s|non-DFSG ||' debian/control
 sed -i '/GNU Emacs is the/,$d' debian/control

helpers/make-epson-inkjet-printer-escpr

+#!/bin/sh
+#
+#    Copyright (C) 2022 Luis Guzman <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
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
+REPOKEY="871920D1991BC93C"
+. ./config
+
+sed -i '/debhelper-compat/s|13|12|' debian/control
+
+changelog "Backported from jammyg to add newer models support."
+
+compile

helpers/make-firefox

 #!/bin/bash
 #
-#    Copyright (C) 2008-2021  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2015       Santiago Rodriguez <santi@trisquel.info>
+#    Copyright (C) 2023       Luis Guzman <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
@@ -18,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=86
+VERSION=95
 
 . ./config
 
@@ -50,14 +51,27 @@ sed -i '/activity-stream.showSponsored/s|true|false|g' browser/app/profile/firef
 sed '/"browser.privatebrowsing.vpnpromourl"/s/https.*"/"/' -i browser/app/profile/firefox.js
 
 sed '/network.connectivity-service.IPv/s/http.*success.txt?ipv[46]//' -i modules/libpref/init/all.js
-
-# do not alter useragent/platform/oscpu/etc with fingerprinting countermeasure, it makes things worse
-sed '/ShouldResistFingerprinting/,/}/s/^/\/\//' -i ./netwerk/protocol/http/nsHttpHandler.cpp
-sed '/If fingerprinting resistance is on/,/}/s/^/\/\//' -i ./dom/base/Navigator.cpp
+sed 's/accounts-static.cdn.mozilla.net.*sync.services.mozilla.com//' -i modules/libpref/init/all.js
+
+# Disable 106 firefox-view and other firefox-branded popups
+sed -i '/browser.urlbar.quicksuggest.shouldShowOnboardingDialog/s|true|false|' browser/app/profile/firefox.js
+sed -i '/services.sync.prefs.sync.browser.firefox-view.feature-tour/s|true|false|' browser/app/profile/firefox.js
+##disable firefox-view
+sed -i '/"browser.tabs.firefox-view"/s|true|false|' browser/app/profile/firefox.js
+##disable ui tour
+sed -i '/browser.uitour.enabled/s|true|false|' browser/app/profile/firefox.js
+##disable colorways closet
+sed -i '/browser.theme.colorway-closet/s|true|false|' browser/app/profile/firefox.js
+##disable newtab intro - check adjustment for versions greater than 106
+grep -rl browser.newtabpage.introShown |xargs sed -i '/browser.newtabpage.introShown/s|true|false|' || true
 
 # Replace ubufox recommendation
 sed 's/xul-ext-ubufox/xul-ext-youtube-html5-video-player/' -i debian/control.in
 
+#Remove exceptions on warnings when installing addons.
+sed -i '/addons.mozilla.org/d' browser/app/permissions
+sed -i '/fpn.firefox.com/d' browser/app/permissions
+
 # Disable healtreport
 cat << EOF > toolkit/components/telemetry/healthreport-prefs.js
 pref("datareporting.healthreport.uploadEnabled", false);
@@ -76,11 +90,19 @@ sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
 # Disable DRM support, armhf has no such option.
 ## Add other archs that might present the same lack of disable-eme option
 cat << ARCH >> debian/config/mozconfig.in
+%%if DEB_HOST_ARCH != ppc64el
+%%if DEB_HOST_ARCH != arm64
 %%if DEB_HOST_ARCH != armhf
 ac_add_options --disable-eme
 %%endif
+%%endif
+%%endif
 ARCH
 
+cat << SIGN >> debian/config/mozconfig.in
+export MOZ_REQUIRE_SIGNING=
+SIGN
+
 sed '/gmp-clearkey/d' -i ./debian/firefox.install.in
 
 # Locale packages should provide firefox-locale-$LANG
@@ -134,13 +156,14 @@ cat << EOF >> browser/components/newtab/data/content/tippytop/top_sites.json
     "favicon_url": "favicons/wikipedia.ico"
   },
   {
-    "domains": ["wikinews.org"],
-    "image_url": "images/wikinews.png",
-    "favicon_url": "favicons/wikinews.ico"
+    "domains": ["h-node.org"],
+    "image_url": "images/hnode.png",
+    "favicon_url": "favicons/hnode.ico"
   }
 ]
 EOF
 
+#uuidgen --sha1 --namespace @dns --name "trisquel.info"
 cat << TOP_JSON > services/settings/dumps/main/top-sites.json
 {
   "data": [
@@ -148,52 +171,53 @@ cat << TOP_JSON > services/settings/dumps/main/top-sites.json
       "url": "https://trisquel.info/",
       "order": 0,
       "title": "Trisquel",
-      "id": "17aeb24c-da88-53bc-8915-c3e3d458070d",
+      "id": "ec7f4843-6be5-5e86-870a-1c8383500a4b",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://www.gnu.org/",
       "order": 1,
       "title": "GNU",
-      "id": "2a833806-e5c1-58e9-8b7c-69d9417a1253",
+      "id": "1baee931-751c-5993-b6fe-d86fbf78f9b0",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://www.fsf.org/",
       "order": 2,
       "title": "FSF",
-      "id": "d4e3e7e2-64d3-5bac-9c59-3c5c8e1efd8c",
+      "id": "fcc60dd8-4d97-5aca-8e5d-784652c75818",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://directory.fsf.org/",
       "order": 3,
       "title": "FSF Directory",
-      "id": "dbff6206-2ada-57ad-8091-8a62ac37be4c",
+      "id": "abe5bfb2-9487-5697-9f27-e0b782dfe006",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://libreplanet.org/",
       "order": 4,
       "title": "LibrePlanet",
-      "id": "6f586839-4063-58b8-95ed-62e034e1915e",
+      "id": "e3d2cf88-a4dc-5d2e-9f9a-f3ea241d17d8",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
       "url": "https://www.wikipedia.org/",
       "order": 5,
       "title": "Wikipedia",
-      "id": "5a18acd7-0440-5512-b3a4-20a35bdc9a1d",
+      "id": "02c295f5-54a8-5d29-8d1f-b619216b20c0",
       "last_modified": $(date +%s%N | cut -b1-13)
     },
     {
-      "url": "https://www.wikinews.org/",
+      "url": "https://h-node.org/",
       "order": 6,
-      "title": "Wikinews",
-      "id": "3bb633ba-0823-4501-b3b5-bc1b8670e3e1",
+      "title": "h-node",
+      "id": "c426481f-8c3f-53b8-b23a-431a91a1c7b4",
       "last_modified": $(date +%s%N | cut -b1-13)
     }
-  ]
+  ],
+  "timestamp": $(date +%s%N | cut -b1-13)
 }
 TOP_JSON
 
@@ -201,11 +225,11 @@ cp $DATA/newtab/*.ico browser/components/newtab/data/content/tippytop/favicons/
 cp $DATA/newtab/*.png browser/components/newtab/data/content/tippytop/images/
 
 # Custom DDG
-sed '/"params"/,/],/d' -i browser/components/search/extensions/ddg/manifest.json
 cp browser/components/search/extensions/ddg browser/components/search/extensions/ddg-html -a
 sed 's|/duckduckgo.com/|/html.duckduckgo.com/html/|' -i browser/components/search/extensions/ddg-html/manifest.json
 sed 's|DuckDuckGo|DuckDuckGo (HTML)|' -i browser/components/search/extensions/ddg-html/manifest.json
 sed 's|ddg@|ddg-html@|' -i browser/components/search/extensions/ddg-html/manifest.json
+patch  --no-backup-if-mismatch -p1 < $DATA/rollback_ddg_firefox_partnership_codes.patch
 # disable ads, disable redirect
 #sed '/search/s|q=|k1=-1\&kd=-1\&ko=1\&q=|' -i browser/components/search/extensions/ddg/manifest.json
 
@@ -231,20 +255,24 @@ sed  "s/^MOZ_PKG_NAME\t.*/MOZ_PKG_NAME\t\t:= abrowser/;" debian/build/config.mk
 ############################################################################3
 ############################################################################3
 ############################################################################3
-sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i debian/control.in
 
 # Branding files
 cp -a $DATA/branding/* browser/branding/official
 cp -a $DATA/branding/* browser/branding/unofficial
 cp -a $DATA/branding/* browser/branding/nightly
+cp -a $DATA/branding/* browser/branding/aurora
+
 sed '/about-wordmark.svg/d' -i browser/base/content/aboutDialog.css
 echo '#warningDesc, #communityExperimentalDesc, #communityDesc, #contributeDesc {display:none!important}' >> browser/base/content/aboutDialog.css
 # Disable preprocessor
 sed 's/_PP//' -i browser/branding/branding-common.mozbuild
-cat << EOF >> debian/config/branch.mk
+#Prevent duplicated values.
+cat << EOF > debian/config/branch.mk
+MOZILLA_REPO = https://hg.mozilla.org/releases/mozilla-release
+L10N_REPO = https://hg.mozilla.org/l10n-central
 CHANNEL                 = release
 MOZ_WANT_UNIT_TESTS     = 0
-MOZ_BUILD_OFFICIAL      = 0
+MOZ_OFFICIAL_BUILD      = 0
 MOZ_ENABLE_BREAKPAD     = 0
 MOZ_ENABLE_TELEMETRY    = 0
 EOF
@@ -260,8 +288,9 @@ s|www.mozilla.com/firefox/central|trisquel.info/browser|g;
 s|mozilla.com/plugincheck|trisquel.info/browser|g;
 s|www.mozilla.com/legal/privacy|trisquel.info/legal|g;
 s|Firefox Nightly|Abrowser|;
+s|Firefox Developer Edition|Abrowser|g;
 s|Nightly|Abrowser|g;
-s|brandProductName=Firefox|brandProductName=Abrowser|;
+s|brand-product-name = Firefox|brand-product-name = Abrowser|;
 s|Sign in to Firefox|Sign in to Sync|;
 s|Search addons.mozilla.org|Search|g;
 s|firefox.settings.services.mozilla.com|127.0.0.1|g;
@@ -282,7 +311,7 @@ sed "s/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel $REVISION/; s/1
 rm -rf ./browser/metro ./addon-sdk/source/doc/static-files/media ./browser/themes/osx ./b2g
 
 #Trisquel custom bookmarks
-cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
+cp $DATA/default-bookmarks.html browser/base/content/default-bookmarks.html
 
 #Trisquel custom search engines
 cp -a $DATA/searchplugins/* browser/components/search/extensions/
@@ -309,20 +338,20 @@ echo ".discopane-notice, .privacy-policy-link, #main header, #plugindeprecation-
 echo ".warning{display: none!important; } .addon[notification=warning]{background-image: none!important;}" >> toolkit/mozapps/extensions/content/extensions.css
 # Hide extra links in about box
 
+# about: page mods, like rights.
+## Hide extra links in about box
 find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
 
 for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing
 do
  find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
 done
-#Remove invalid policy for trisquel.
+##Remove invalid policy for trisquel.
 find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d'
-delete_point() {
-sed -i "/$1/d" "$(find -name $2)"
-}
-delete_point rights-intro-point-5 aboutRights.xhtml
-delete_point rights-intro-point-6 aboutRights.xhtml
-delete_point rights-intro-point-5 aboutRights-unbranded.xhtml
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/d"
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d"
+find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/d"
+#EO about: mods.
 
 sed -i 's/<a\ href\=\"http\:\/\/www.mozilla.org\/\">Mozilla\ Project<\/a>/<a\ href\=\"http\:\/\/www.trisquel.info\/\"\>Trisquel\ Project<\/a>/g' browser/base/content/overrides/app-license.html
 
@@ -358,16 +387,8 @@ MOZ_TELEMETRY_REPORTING=0
 MOZ_ADDON_SIGNING=0
 EOF
 
-# Fix locale
-cat << EOF >> mobile/locales/en-US/chrome/region.properties
-browser.search.defaultenginename=DuckDuckGo
-browser.search.order.1=DuckDuckGo
-browser.search.order.2=Google
-browser.search.order.3=Yahoo
-browser.suggestedsites.restricted_mozilla.url=https://www.trisquel.info
-browser.suggestedsites.webmaker.title=GNU Project
-browser.suggestedsites.webmaker.url=https://www.gnu.org
-EOF
+#Enable EGL by default
+sed -i '/gfx.x11-egl.force-enabled/,/mirror/s|false|true|' modules/libpref/init/StaticPrefList.yaml
 
 # Branding
 rm mobile/android/branding/{official,unofficial,beta,nightly} -rf
@@ -376,6 +397,10 @@ cp $DATA/android/mobile.ico mobile/android/app/
 #cp $DATA/android/images/* mobile/android/themes/core/images/
 cp -a $DATA/android/res/main/* mobile/android/geckoview/src/main/res
 
+#Fixes by patch on source.
+##Firefox v100, based on parabola 9004-FSDG-misc.patch
+patch -p1 < $DATA/patch_changes/Remove_moreFromMozilla_Focus_and_Klar.patch
+
 # Postinst script to manage profile migration and system links
 echo '
 

helpers/make-freedom-maker

+#!/bin/sh
+
+# trisquel package helper for 'freedom-maker'
+#
+#    Copyright (C) 2022 bill-auger <bill-auger@programmer.net>
+#
+#    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 3 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, see <https://www.gnu.org/licenses/>.
+
+
+VERSION=1
+
+. ./config
+
+for patch in $(ls -v ${DATA}/*.patch)
+do
+echo "Applying $patch"
+patch -Np1 < $patch
+done
+
+changelog "Build from Trisquel repos - Delete support for non-free hardware and emulators"
+
+compile

helpers/make-gfxboot-theme-ubuntu

@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 . ./config
 
@@ -100,8 +100,7 @@ diff -ru gfxboot-theme-ubuntu-0.13.3.orig/timeout.inc gfxboot-theme-ubuntu-0.13.
  
 EOF
 
-sed 's/gfxboot-theme-ubuntu/gfxboot-theme-trisquel/' debian/control -i
-sed '1s/gfxboot-theme-ubuntu/gfxboot-theme-trisquel/' debian/changelog -i
+sed '/Package:/s/gfxboot-theme-ubuntu/gfxboot-theme-trisquel/' debian/control -i
 mv debian/gfxboot-theme-ubuntu.install debian/gfxboot-theme-trisquel.install
 sed 's/ubuntu/trisquel/' debian/gfxboot-theme-trisquel.install -i
 

helpers/make-greybird-gtk-theme

 #!/bin/sh
 #
-#    Copyright (C) 2021  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2021,2022  Ruben Rodriguez <ruben@trisquel.info>
 #
 #    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
@@ -16,8 +16,8 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-VERSION=7
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
+VERSION=9
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 
 . ./config
 
@@ -104,6 +104,9 @@ sed '/Paned/,/^$/s/background-image.*//' -i light/gtk-3.0/_common.scss
 sed '/Paned/,/^$/s/background-size.*//' -i light/gtk-3.0/_common.scss
 sed '/Paned/,/^}$/s/image($backdrop_borders_color)/image($bg_color)/' -i light/gtk-3.0/_common.scss
 
+# fix panel toggles too wide
+sed '/min-width: 44px/d' -i light/gtk-3.0/_others.scss dark/gtk-3.0/_others.scss
+
 # lxde panel
 cat << EOF >> dark/gtk-2.0/apps/xfce-panel.rc
 

helpers/make-grub2

@@ -20,7 +20,6 @@
 #
 
 VERSION=6
-FIXED_VER=2.04-1ubuntu26.13
 COMPONENT=main
 
 . ./config

helpers/make-grub2-unsigned

+#!/bin/sh
+#
+#    Copyright (C) 2011-2017  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2019  Mason Hock <mason@masonhock.com>
+#    Copyright (C) 2022  Luis Guzman <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=6
+COMPONENT=main
+
+. ./config
+
+# http://grub.johnlane.ie/
+## updated to 2.04-1 on https://aur.archlinux.org/packages/grub-luks-keyfile/
+for i in $DATA/*.patch; do
+echo Applying patch $i
+patch -p1 < $i
+done
+
+#apt-get remove -y --force-yes dosfstools
+#sed '/dosfstools/d' -i debian/control
+sed '/mkfs.minix/s/-B $BLKSIZE//g' -i tests/util/grub-fs-tester.in
+
+remove_patch mkconfig-ubuntu-distributor.patch
+
+#Prevent to built grub2-unsigned on armhf and ppc64el arch
+sed -i "/Architecture:/s|any-arm$|armel|g;s|any-arm |armel|g" debian/control
+sed -i "/Architecture:/s|linux-any|linux|" debian/control
+sed -i '/Package: grub-common/,/Built-Using:/s|Architecture: any|Architecture: any-i386 any-amd64 any-ia64 any-arm64 riscv64|' debian/control
+
+#Allow passwords https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1311302
+/bin/sed '/CLASS=/s/class os/class os --unrestricted/' -i util/grub.d/* debian/patches/mkconfig-other-inits.patch
+
+replace "with Linux" "with Linux-Libre" util
+replace "with Linux" "with Linux-Libre" debian
+replace "Linux" "Linux-Libre" po
+replace Kubuntu Triskel .
+replace Ubuntu Trisquel .
+replace kubuntu triskel .
+replace ubuntu trisquel .
+find |grep ubuntu|xargs rename s/ubuntu/trisquel/g
+
+#Avoid the use of signed grub efi package
+sed -i '/Recommends:/s|grub-efi-amd64-signed|grub-efi-amd64|' debian/control
+
+# Allow Windows and MacOX entries to boot without a password
+sed 's/class osx/class osx --unrestricted/; s/class windows/class osx --unrestricted/;' -i ./util/grub.d/30_os-prober.in
+
+sed -i '/set -e/aexit 77' tests/grub_cmd_set_date.in
+
+changelog "skip test grub_cmd_set_date.in"
+
+compile
+

helpers/make-hplip

@@ -18,12 +18,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 
 # note, we need version 3.20.6 or higher, the binary plugin requirement
 # was reworked on that version.
 
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu hirsute main universe'
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
 REPOKEY=871920D1991BC93C
 QUILT=skip
 
@@ -31,9 +31,6 @@ QUILT=skip
 
 sed '/debhelper-compat/s/13/12/' -i debian/control
 
-# This is somehow missing from the source tarball, fetched from Debian git
-cp $DATA/Common.h .
-
 rm debian/patches/*-Install-check-plugin.py-as-a-script.patch
 sed -i '/Install-check-plugin.py-as-a-script.patch/d' debian/patches/series
 sed '/plugin/d' -i debian/hplip-gui.manpages debian/hplip.manpages debian/hplip-gui.install debian/hplip.install

helpers/make-libtorrent-rasterbar

+#!/bin/sh
+#
+#    Copyright (C) 2022  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
+EXTERNAL='deb-src http://ppa.launchpad.net/deluge-team/stable/ubuntu $UPSTREAM main'
+REPOKEY="C5E6A5ED249AD24C"
+BACKPORT=true
+
+. ./config
+
+changelog "Imported to Trisquel from oficial PPA as dependency for deluge 2.x."
+
+compile
+

helpers/make-liferea

@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=7
 
 . ./config
 
@@ -32,18 +32,18 @@ cat << EOF > opml/feedlist
 </head>
 <body>  
     <outline text="Trisquel GNU/Linux">          <!-- translate this for localized feed list -->
-      <outline text="News" htmlUrl="http://trisquel.info/" xmlUrl="http://trisquel.info/en/node/feed" />
-      <outline text="Release announcements" htmlUrl="http://trisquel.info/" xmlUrl="http://trisquel.info/en/taxonomy/term/700/0/feed" />
-      <outline text="Forum" htmlUrl="http://trisquel.info/en/forum" xmlUrl="http://trisquel.info/en/taxonomy/term/50/0/feed" />
-      <outline text="Trisquel at Reddit" htmlUrl="http://www.reddit.com/r/gnu" xmlUrl="http://www.reddit.com/r/trisquel/.rss" />
+      <outline text="News" htmlUrl="https://trisquel.info/" xmlUrl="https://trisquel.info/en/node/feed" />
+      <outline text="Release announcements" htmlUrl="https://trisquel.info/" xmlUrl="https://trisquel.info/en/taxonomy/term/700/0/feed" />
+      <outline text="Forum" htmlUrl="https://trisquel.info/en/forum" xmlUrl="https://trisquel.info/en/taxonomy/term/50/0/feed" />
+      <outline text="Trisquel at Reddit" htmlUrl="https://www.reddit.com/r/gnu" xmlUrl="https://www.reddit.com/r/trisquel/.rss" />
     </outline>
     <outline text="Free Software">          <!-- translate this for localized feed list -->
-      <outline text="What's New at GNU" htmlUrl="http://www.gnu.org/" xmlUrl="http://www.gnu.org/rss/whatsnew.rss" />
-      <outline text="FSF News" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/news.xml" />
-      <outline text="FSF Events" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/events.xml" />
-      <outline text="FSF Blogs" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/blogs.xml" />
-      <outline text="fsdaily.com - Free Software News" htmlUrl="http://www.fsdaily.com/" xmlUrl="http://www.fsdaily.com/feed/published/All" />
-      <outline text="GNU at Reddit" htmlUrl="http://www.reddit.com/r/gnu" xmlUrl="http://www.reddit.com/r/gnu/.rss" />
+      <outline text="What's New at GNU" htmlUrl="https://www.gnu.org/" xmlUrl="https://www.gnu.org/rss/whatsnew.rss" />
+      <outline text="FSF News" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/news.xml" />
+      <outline text="FSF Events" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/events.xml" />
+      <outline text="FSF Blogs" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/blogs.xml" />
+      <outline text="fsdaily.com - Free Software News" htmlUrl="https://www.fsdaily.com/" xmlUrl="https://www.fsdaily.com/feed/published/All" />
+      <outline text="GNU at Reddit" htmlUrl="https://www.reddit.com/r/gnu" xmlUrl="https://www.reddit.com/r/gnu/.rss" />
     </outline>
 
         <!-- the following search folders should also be in sync for all feed lists -->
@@ -73,18 +73,18 @@ cat << EOF > opml/feedlist_es.opml
 </head>
 <body>  
     <outline text="Trisquel GNU/Linux">          <!-- translate this for localized feed list -->
-      <outline text="Noticias" htmlUrl="http://trisquel.info/" xmlUrl="http://trisquel.info/es/node/feed" />
-      <outline text="Foro" htmlUrl="http://trisquel.info/es/forum" xmlUrl="http://trisquel.info/es/taxonomy/term/29/0/feed" />
-      <outline text="Anuncio de nuevas versiones" htmlUrl="http://trisquel.info/" xmlUrl="http://trisquel.info/en/taxonomy/term/700/0/feed" />
-      <outline text="Trisquel en Reddit" htmlUrl="http://www.reddit.com/r/gnu" xmlUrl="http://www.reddit.com/r/trisquel/.rss" />
+      <outline text="Noticias" htmlUrl="https://trisquel.info/" xmlUrl="https://trisquel.info/es/node/feed" />
+      <outline text="Foro" htmlUrl="https://trisquel.info/es/forum" xmlUrl="https://trisquel.info/es/taxonomy/term/29/0/feed" />
+      <outline text="Anuncio de nuevas versiones" htmlUrl="https://trisquel.info/" xmlUrl="https://trisquel.info/en/taxonomy/term/700/0/feed" />
+      <outline text="Trisquel en Reddit" htmlUrl="https://www.reddit.com/r/gnu" xmlUrl="https://www.reddit.com/r/trisquel/.rss" />
     </outline>
     <outline text="Free Software">          <!-- translate this for localized feed list -->
-      <outline text="What's New at GNU" htmlUrl="http://www.gnu.org/" xmlUrl="http://www.gnu.org/rss/whatsnew.rss" />
-      <outline text="FSF News" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/news.xml" />
-      <outline text="FSF Events" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/events.xml" />
-      <outline text="FSF Blogs" htmlUrl="http://www.fsf.org/" xmlUrl="http://static.fsf.org/fsforg/rss/blogs.xml" />
-      <outline text="fsdaily.com - Free Software News" htmlUrl="http://www.fsdaily.com/" xmlUrl="http://www.fsdaily.com/feed/published/All" />
-      <outline text="GNU en Reddit" htmlUrl="http://www.reddit.com/r/gnu" xmlUrl="http://www.reddit.com/r/gnu/.rss" />
+      <outline text="What's New at GNU" htmlUrl="https://www.gnu.org/" xmlUrl="https://www.gnu.org/rss/whatsnew.rss" />
+      <outline text="FSF News" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/news.xml" />
+      <outline text="FSF Events" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/events.xml" />
+      <outline text="FSF Blogs" htmlUrl="https://www.fsf.org/" xmlUrl="https://static.fsf.org/fsforg/rss/blogs.xml" />
+      <outline text="fsdaily.com - Free Software News" htmlUrl="https://www.fsdaily.com/" xmlUrl="https://www.fsdaily.com/feed/published/All" />
+      <outline text="GNU en Reddit" htmlUrl="https://www.reddit.com/r/gnu" xmlUrl="https://www.reddit.com/r/gnu/.rss" />
     </outline>
 
         <!-- the following search folders should also be in sync for all feed lists -->

helpers/make-linux

 #!/bin/sh
 #
 #    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
-#    Copyright (C) 2008-2020  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=10
+VERSION=11
 
 . ./config
 
@@ -108,6 +108,10 @@ sed 's/.unsigned//' -i debian/scripts/control-create
 line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1)
 sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i
 sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
+cat << EOF > debian.master/etc/kernelconfig
+archs="amd64 i386 armhf arm64 ppc64el"
+family='trisquel'
+EOF
 
 rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
 

helpers/make-linux-hwe-5.13

 #!/bin/sh
 #
 #    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2022 Luis Guzman <ark@switnet.org>
 #    Copyright (C) 2021 Pablo Correa Gómez <ablocorrea@hotmail.com>
 #    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
 #
@@ -20,7 +20,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 
 . ./config
 

helpers/make-network-manager-applet

+#!/bin/sh
+#
+#    Copyright (C) 2022 Luis Guzman <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=0
+
+. ./config
+
+#Remove gnome-shell and notification-daemon dependency
+sed -i 's/gnome-shell <!s390x> | //g' debian/control
+sed -i 's/notification-daemon <!s390x>/policykit-1-gnome <!s390x>/g' debian/control
+
+changelog "Remove gnome-shell and notification-daemon dependency from network-manager-gnome"
+
+compile

helpers/make-python-apt

 #!/bin/sh
 #
-#    Copyright (C) 2008-2019 Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info>
 #
 #    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
@@ -17,47 +17,46 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 COMPONENT=main
 
 . ./config
 
 cat << EOF > data/templates/Trisquel.mirrors
 #LOC:CA
-https://mirror.freemirror.org/trisquel-packages/
-#LOC:FR
-https://archive.trisquel.info/trisquel/
-#LOC:US
-https://mirror.fsf.org/trisquel/
-http://mirrors.knoesis.org/trisquel/packages
-https://mirrors.ocf.berkeley.edu/trisquel/
-#LOC:IN
-http://in.archive.trisquel.info/trisquel/
-#LOC:EC
-https://mirror.cedia.org.ec/trisquel.packages
-#LOC:RO
-http://mirrors.serverhost.ro/trisquel/packages
+https://mirror.csclub.uwaterloo.ca/trisquel/packages/
 #LOC:CN
 https://mirrors.ustc.edu.cn/trisquel
+https://mirrors.nju.edu.cn/trisquel/
+#LOC:DE
+https://mirrors.dotsrc.org/trisquel/
+#LOC:EC
+https://mirror.cedia.org.ec/trisquel.packages
+#LOC:HU
+https://quantum-mirror.hu/mirrors/pub/trisquel/packages/
 #LOC:ES
 https://ftp.caliu.cat/pub/distribucions/trisquel/packages
 https://mirror.librelabucm.org/trisquel/
-#LOC:TW
-https://ftp.yzu.edu.tw/Linux/trisquel.packages/
 #LOC:SE
 https://mirror.linux.pizza/trisquel/packages/
 https://ftp.acc.umu.se/mirror/trisquel/packages/
-#LOC:HU
-https://quantum-mirror.hu/mirrors/pub/trisquel/packages/
+https://ftpmirror1.infania.net/mirror/trisquel/packages/
+https://mirror.operationtulip.com/trisquel/packages/
+#LOC:US
+https://archive.trisquel.info/trisquel/
+https://archive.trisquel.org/trisquel/
+https://mirror.fsf.org/trisquel/
+https://mirrors.ocf.berkeley.edu/trisquel/
+https://mirror.math.princeton.edu/pub/trisquel-packages/
 EOF
 
 cat << EOF > data/templates/Trisquel.info.in
-_ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/changelog
+_ChangelogURI: https://packages.trisquel.org/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
 Suite: $CODENAME
 RepositoryType: deb
-BaseURI: https://archive.trisquel.info/trisquel/
-MatchURI: archive.trisquel.info/trisquel
+BaseURI: https://archive.trisquel.org/trisquel/
+MatchURI: archive.trisquel.org/trisquel
 MirrorsFile: Trisquel.mirrors
 _Description: Trisquel $REVISION '$CODENAME'
 Component: main
@@ -67,8 +66,8 @@ _CompDescriptionLong: Officially supported
 Suite: $CODENAME-security
 ParentSuite: $CODENAME
 RepositoryType: deb
-BaseURI: https://archive.trisquel.info/trisquel/
-MatchURI: archive.trisquel.info/trisquel
+BaseURI: https://archive.trisquel.org/trisquel/
+MatchURI: archive.trisquel.org/trisquel
 _Description: Important security updates
 
 Suite: $CODENAME-updates

helpers/make-rustc

+#!/bin/sh
+#
+#    Copyright (C) 2022 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
+#
+
+##
+# rustc 1.63+ version
+##
+
+VERSION=1
+EXTERNAL='deb-src http://ppa.launchpadcontent.net/ubuntu-mozilla-security/rust-updates/ubuntu $UPSTREAM main'
+REPOKEY=A6DCF7707EBC211F
+BACKPORTS=true
+. ./config
+
+
+changelog "Import as dependency of newer abrowser deb dependencies."
+
+compile

helpers/make-screenfetch

+#!/bin/sh
+#
+#    Copyright (C) 2022  Luis Guzman <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
+
+patch -p1 < $DATA/screenfetch_3.9.patch
+
+changelog "Adding ASC-II trisquel logo update, thanks to @LegoLeprechaun"
+
+compile
+

helpers/make-software-properties

 #!/bin/sh
 #
-#    Copyright (C) 2011-2020  Ruben Rodriguez <ruben@trisquel.info>
-#    Copyright (C) 2011  Carlos Pais <freemind@lavabit.com>
+#    Copyright (C) 2023 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2011-2022  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2019 Mason Hock <mason@masonhock.com>
+#    Copyright (C) 2011  Carlos Pais <freemind@lavabit.com>
 #
 #    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
@@ -19,47 +20,23 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=6
+VERSION=7
 
 . ./config
 
-cat << EOF | patch -p1
---- source.orig/softwareproperties/SoftwareProperties.py        2014-04-14 17:10:58.000000000 +0200
-+++ source/softwareproperties/SoftwareProperties.py     2014-05-18 03:02:05.309290804 +0200
-@@ -725,8 +725,18 @@
-     site is in whitelist or the shortcut implementer adds it.
-     """
- 
-+    codenames = {}
-+    codenames["nabia"] = "focal" 
-+    codenames["etiona"] = "bionic" 
-+    codenames["flidas"] = "xenial" 
-+    codenames["belenos"] = "trusty" 
-+    codenames["toutatis"] = "precise" 
-+    codenames["brigantia"] = "oneiric" 
-+    codenames["dagda"] = "natty"
-+    codenames["slaine"] = "maverick"
-+    codenames["taranis"] = "lucid"
-+    codenames["awen"] = "karmic" 
-+    (deb_line, file) = shortcut.expand(codename=codenames[self.distro.codename])
--    (deb_line, file) = shortcut.expand(
--        codename=self.distro.codename, distro=self.distro.id.lower())
-     deb_line = self.expand_http_line(deb_line)
-     debsrc_entry_type = 'deb-src' if enable_source_code else '# deb-src'
-     debsrc_line = debsrc_entry_type + deb_line[3:]
-EOF
-
-patch -p1 < $DATA/remove_livepatch_from_gtk_uiv1_1.patch
-patch -p1 < $DATA/disable-livepatch.patch
-patch -p0 < $DATA/remove_snap_label.patch
+#Remove logo
+rm data/ubuntu-pro-logo*.svg
+sed -i '/ubuntu-pro-logo/d' debian/software-properties-gtk.install
+
+rm softwareproperties/gtk/UbuntuProPage.py
+patch  --no-backup-if-mismatch -p0 < $DATA/remove_snap_label.patch
 
 #Python specific changes
-cp $DATA/trisquel_info.py softwareproperties/gtk/
-sed -i '/import softwareproperties.SoftwareProperties/a from softwareproperties.gtk.trisquel_info import trisquel_rel_desc, trisquel_eol' softwareproperties/gtk/SoftwarePropertiesGtk.py
+cp $DATA/trisquel_info.py softwareproperties/
+sed -i '/import softwareproperties.SoftwareProperties/a from softwareproperties.trisquel_info import trisquel_rel_desc, trisquel_eol' softwareproperties/gtk/SoftwarePropertiesGtk.py
 sed -i 's|eol_date = distro.eol|eol_date = trisquel_eol|' softwareproperties/gtk/SoftwarePropertiesGtk.py
 sed -i 's|eol_text = .*|eol_text = trisquel_rel_desc|' softwareproperties/gtk/SoftwarePropertiesGtk.py
 #Allow to start and remove drivers tab for qt flavor
-sed -i '/info_bar_ubuntu_pro/d' softwareproperties/gtk/SoftwarePropertiesGtk.py
 sed -i '/UbuntuDrivers/d' softwareproperties/qt/SoftwarePropertiesQt.py
 sed -i '/tab_switched(self)/i \ \ \ \ self.userinterface.tabWidget.removeTab(4)' softwareproperties/qt/SoftwarePropertiesQt.py
 sed -i '/tab_switched(self)/,/self.button_revert.setVisible(True)/{//!d}' softwareproperties/qt/SoftwarePropertiesQt.py
@@ -74,31 +51,34 @@ replace cdimage@ubuntu.com trisquel-devel@listas.trisquel.info .
 replace TrisquelDistribution UbuntuDistribution .
 sed '/NoDisplay/d; s/Trisquel/Ubuntu/' -i data/software-properties-gtk.desktop.in
 
-#Replace went too far
-sed -i 's|TrisquelDistroInfo|UbuntuDistroInfo|' softwareproperties/gtk/utils.py
-
-sed '/ubuntu-drivers-common/d' -i debian/control
+patch --no-backup-if-mismatch -p1 < $DATA/fix_debian_control_file.patch
 sed '/software-properties-drivers/d' -i debian/software-properties-gtk.install setup.cfg
 
 replace "Trisquel-Gettext" "Ubuntu-Gettext" .
-sed -i 's|UbuntuDistroInfo|TrisquelDistroInfo|g' softwareproperties/gtk/utils.py
+#sed -i 's|UbuntuDistroInfo|TrisquelDistroInfo|g' softwareproperties/gtk/utils.py
 
 sed '/test_suite/d' -i setup.py
 rm -rf tests
 
-sed '/gir1.2-snapd-1/d' -i debian/control
-sed '/self.init_livepatch/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py
-sed 's/status = self.get_status()/status = Snapd.SnapStatus.UNKNOWN/' -i softwareproperties/LivepatchSnap.py
-
 rm data/software-properties-drivers.desktop.in
 sed -i '/software-properties-drivers/d' po/POTFILES.in
+sed -i '/TrisquelProPage/d' po/POTFILES.in
 
 rm data/software-properties-livepatch.desktop.in
 sed -i '/software-properties-livepatch.desktop.in/d' po/POTFILES.in
 sed -i '/software-properties-livepatch.desktop.in/d' setup.cfg
 sed -i '/software-properties-livepatch.desktop/s|^|#|' debian/software-properties-gtk.install
 
-changelog "Removed Ubuntu-specifc tests, Livepatch, Snap"
+#Remove ProPage
+sed -i '/TrisquelProPage/d' softwareproperties/gtk/SoftwarePropertiesGtk.py
+sed -i '/init_ubuntu_pro/d' softwareproperties/gtk/SoftwarePropertiesGtk.py
 
-compile
+#Livepatch - aramo
+patch --no-backup-if-mismatch -p1 < $DATA/remove_ubuntu_suscription_tab.patch
+patch --no-backup-if-mismatch -p1 < $DATA/remove_proposed_updates.patch
+#Patch codename for PPAs
+patch --no-backup-if-mismatch -p1 < $DATA/fix_PPA_upstream_codename.patch
 
+changelog "Removed Ubuntu-specifc tests, Livepatch, Snap and fix PPA integration."
+
+compile

helpers/make-thunderbird

 #!/bin/bash
 #
+#    Copyright (C) 2022  Luis Guzmán <ark@switnet.org>
 #    Copyright (C) 2020  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2019  David Trudgian <dave@trudgian.net>
 #
@@ -18,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=13
+VERSION=17
 
 . ./config
 
@@ -117,7 +118,10 @@ EOF
 #cp toolkit/components/telemetry/healthreport-prefs.js mobile/android/chrome/content/healthreport-prefs.js
 # Browser legal page
 sed 's%https://www.mozilla.org/legal/privacy/%https://trisquel.info/legal%' -i ./browser/app/profile/firefox.js ./toolkit/content/aboutRights.xhtml
-sed -i 's|https://www.mozilla.org/thunderbird/legal/privacy/|https://trisquel.info/legal|' comm/mail/components/newmailaccount/content/accountProvisioner.js comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/thunderbird/legal/privacy/|https://trisquel.info/legal|' comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/en-US/privacy/thunderbird/|https://trisquel.info/legal|' comm/mail/app/profile/all-thunderbird.js
+sed -i 's|https://www.mozilla.org/privacy/|https://trisquel.info/legal|' comm/mail/components/newmailaccount/content/accountProvisioner.xhtml
+grep -rl https://www.mozilla.org/privacy/thunderbird/ | xargs sed -i 's|https://www.mozilla.org/privacy/thunderbird/|https://trisquel.info/legal|g'
 # Org branding
 sed 's/com.ubuntu/org.trisquel/' -i debian/config/mozconfig.in
 # Disable DRM support, armhf has no such option.
@@ -128,7 +132,6 @@ ac_add_options --disable-eme
 %%endif
 ARCH
 ########################################################
-
 sed '/^MOZ_PKG_NAME/s/.*/MOZ_PKG_NAME=icedove/' -i debian/build/config.mk
 
 cat << EOF >> debian/build/config.mk
@@ -167,8 +170,12 @@ find . -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -not -i
 
 sed 's|https://www.icedove.net/features/|https://trisquel.info/wiki/icedove|' -i comm/mail/base/content/utilityOverlay.js
 sed 's|https://www.icedove.net/get-involved/|https://trisquel.info/wiki/|' -i comm/mail/base/content/utilityOverlay.js
-sed 's|https://donate.mozilla.org/.*help-menu|https://trisquel.info/donate/|' -i comm/mail/base/content/utilityOverlay.js
-sed 's|https://give.icedove.net/.*|https://trisquel.info/donate/"|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://give.icedove.net/.*"|https://trisquel.info/donate/"|' -i comm/mail/base/content/utilityOverlay.js
+sed 's|https://www.icedove.net/.*/features/|https://trisquel.info/wiki/icedove|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://give.icedove.net/.*"|https://trisquel.info/donate/"|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://support.mozilla.org/products/icedove|https://trisquel.info/wiki/icedove|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://www.icedove.net/.*/get-involved/|https://trisquel.info/wiki/|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
+sed 's|https://developer.icedove.net/|https://gitlab.trisquel.org/trisquel|' -i comm/mailnews/base/content/msgAccountCentral.xhtml
 
 replace Daily Trisquel comm/mail/branding/
 sed '/.*<description.*communityExperimentalDesc/,/\/description/d' -i ./comm/mail/base/content/aboutDialog.xhtml
@@ -180,6 +187,10 @@ sed 's/Provides: mail-reader,/Provides: mail-reader, thunderbird,/' -i debian/co
 sed "s/Provides.*/Provides: icedove-locale-@LANGCODE@/" -i debian/control.langpacks
 
 #Manual fixes to allow rebranding processed through hash checks and other changes.
+# Restore wrong replacement module name.
+grep -rl IcedoveProfileImporter.jsm | xargs sed -i 's|IcedoveProfileImporter.jsm|ThunderbirdProfileImporter.jsm|g'
+grep -rl IcedoveImport.jsm | xargs sed -i 's|IcedoveImport.jsm|ThunderbirdImport.jsm|g'
+grep -rl IcedoveProfileMigrator.jsm | xargs sed -i 's|IcedoveProfileMigrator.jsm|ThunderbirdProfileMigrator.jsm|g'
 #Fix 1 character bigger than allowed yml line (81 > 80)
 sed -i 's|Abrowser is not running.  It|Abrowser is not running. It|' toolkit/mozapps/update/pings.yaml
 
@@ -188,19 +199,19 @@ sed -i \
 third_party/dump_syms/vendor/regex/.cargo-checksum.json
 
 sed -i \
-'s|af4ff013841da9bf00cf88ad3ae468f30c122b730ed37327d965d11b8e367459|a68c2df0024ff65f43efd5f5a48fe39a35d859ac459cce8695e4b09120cc1f35|' \
+'s|bcb4b59cfc5f48fbaba954b8ae4daa9eaecf9044afc89208a78a7e995c321b81|5f33885b0cc238abc78622e32bd56e6c550d90f1de419d5d7768c8da7f53f039|' \
 third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json
 
 sed -i \
-'s|eb9f00340e0f6ba3d01f4770356062ab2142e1646c7c2556c9b35348f90980f0|af2b7e2811c649615d4726c7dc4fd9b2e8aa35c229e8225c930e8e7d8e003fa2|' \
+'s|a64116a6d46ab30ce91deabdb4c5388f03be632326e8a00110bfb0c598474a0a|5cd020aae75fdcd21aca4799d302f1720075c9dd6fb12ba19e6403a8012970b2|' \
 third_party/dump_syms/vendor/encoding_rs/.cargo-checksum.json
 
 sed -i \
-'s|04fc9b146177e7bf615156b8570fa0f97b89f68a2c02b946778711728b81e81f|16221c6c37245cd078ffdb1bd314e45334ddf60098742fc38b821e733fc4c5ca|' \
+'s|fe4881780e8cd0181748a891102b2dd54c2060546d7648ec1b6435529bd0dcc2|40588888ea0d4b7e86bc1e184be9e667bd1b0480fe00406ebb828821f5080a07|' \
 third_party/dump_syms/vendor/h2/.cargo-checksum.json
 
 sed -i \
-'s|caabd31cbcb00172bb7f31a1398dbed27a3bf36b01d69729c3d6fbd9a4008e05|080cba5e2b65e6542f364aa4703a179c58b20e41489573d941ef68b9619a2734|' \
+'s|6f3be57dae549574569b812acab6213f4136ba9c4ad60a21848043d26e6aaece|07f28083516d3660082d9c46fe2349a1099720b4f30cc7431f1cc267690d6505|' \
 third_party/dump_syms/vendor/httparse/.cargo-checksum.json
 
 sed -i \
@@ -210,8 +221,27 @@ third_party/dump_syms/vendor/openssl/.cargo-checksum.json
 sed -i \
 's|82c82f8ef547f67f3f449a0b240e2df4ed538d976a379b07e53d5ce7cde2438c|01baa5e11aa7ec74360151d379ba8b5607abcd34132e69568c816c0116958a26|' \
 third_party/dump_syms/vendor/symbolic-minidump/.cargo-checksum.json
+
+sed -i \
+'s|6018b016930c86610953a88ca35e8cebffd2dbbd92f11502c2464ab4281e7bbc|04c8d6c8a498abac61ffb2725484c2732328270e25a7e3ed452657962ce76f4e|' \
+third_party/dump_syms/vendor/bitvec/.cargo-checksum.json
 #EO Manual fixing.
 
+# about: page mods, like rights.
+## Hide extra links in about box
+find -wholename '*/brand.dtd' |xargs /bin/sed 's/trademarkInfo.part1.*/trademarkInfo.part1 "">/' -i
+
+for STRING in rights-intro-point-2 rights-intro-point-3 rights-intro-point-4 rights-intro-point-5 rights-intro-point-6 rights-webservices rights-safebrowsing
+do
+ find -name aboutRights.ftl | xargs sed -i "s/^$STRING.*/$STRING = /"
+done
+##Remove invalid policy for trisquel.
+find -name aboutRights.ftl | xargs sed -i '/rights-intro-point-5/,$d'
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-5/d"
+find -name aboutRights.xhtml |xargs sed -i "/rights-intro-point-6/d"
+find -name aboutRights-unbranded.xhtml |xargs sed -i "/rights-intro-point-5/d"
+#EO about: mods.
+
 #Debbuging tools
 sed -i 's|this-firefox|this-abrowser|g' devtools/client/framework/test/browser_about-devtools-toolbox_reload.js
 #Rebrand debug tools
@@ -220,8 +250,7 @@ devtools/client/themes/images/aboutdebugging-fenix-nightly.svg \
 devtools/client/themes/images/aboutdebugging-firefox-aurora.svg \
 devtools/client/themes/images/aboutdebugging-firefox-beta.svg \
 devtools/client/themes/images/aboutdebugging-firefox-nightly.svg \
-devtools/client/themes/images/aboutdebugging-firefox-release.svg \
-devtools/startup/aboutdevtools/images/dev-edition-logo.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
+devtools/client/themes/images/aboutdebugging-firefox-release.svg" | xargs -n1 cp $DATA/debug_brand/debuglogo.svg
 cp $DATA/debug_brand/debuglogo_gray.svg devtools/client/themes/images/aboutdebugging-firefox-logo.svg
 cp $DATA/debug_brand/about-logo.svg comm/mail/branding/icedove/TB-symbolic.svg
 cp $DATA/debug_brand/about-logo.svg comm/mail/themes/shared/mail/icons/aboutdebugging-logo.svg