helpers/make-0ad

 #!/bin/sh
 #
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
+#    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
@@ -18,9 +18,9 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/oibaf/graphics-drivers/ubuntu $UPSTREAM main'
-REPOKEY="957D2708A03A4626"
-BACKPORT=true
+EXTERNAL='deb-src http://ppa.launchpadcontent.net/wfg/0ad/ubuntu $UPSTREAM main'
+REPOKEY="8CA7A6E8E4FA953A"
+BACKPORTS=true
 BUILD_UNTIL=10.0
 
 . ./config

helpers/make-0ad-data

 #!/bin/sh
 #
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
+#    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
@@ -18,9 +18,9 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ppa.launchpad.net/oibaf/graphics-drivers/ubuntu $UPSTREAM main'
-REPOKEY="957D2708A03A4626"
-BACKPORT=true
+EXTERNAL='deb-src http://ppa.launchpadcontent.net/wfg/0ad/ubuntu $UPSTREAM main'
+REPOKEY="8CA7A6E8E4FA953A"
+BACKPORTS=true
 BUILD_UNTIL=10.0
 
 . ./config

helpers/make-a11y-profile-manager

@@ -18,11 +18,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 
 . ./config
 
 sed 's/OnlyShowIn=Unity;/OnlyShowIn=Unity;MATE;/' -i a11y-profile-manager-indicator-autostart.desktop.in
+sed 's/GSettings.*/GSettings org.mate.interface accessibility/' -i a11y-profile-manager-indicator-autostart.desktop.in
 
 cat << EOF >> profiles/blindness/profile.gsettings
 

helpers/make-abiword

+#!/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
+
+#Remove unwanted plugin
+sed -i 's|google ||' debian/rules
+
+#Replace non-free fonts references
+replace 'Arial Unicode MS' 'Liberation Sans' .
+replace 'Times New Roman' 'Liberation Serif' .
+replace 'Arial' 'Liberation Sans' .
+
+
+changelog "Remove google-search plugin and non-free fonts references."
+
+compile

helpers/make-accountsservice

+#!/bin/sh
+#
+#    Copyright (C) 2022 Alexandre Oliva <oliva@gnu.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 to enable users with low uid to be configured as non-systemusers.
+patch -p1 < $DATA/daemon_Allow_SystemAccount-false_to_be_set_in_cache_file.patch
+
+changelog "Enable users with low uid to be configured as non-systemusers."
+
+compile

helpers/make-akregator

@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=1
+VERSION=2
 
 . ./config
 

helpers/make-apt-mirror

@@ -18,13 +18,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 . ./config
 
 cp $DATA/Trisquel-mirror.list debian/
 
-changelog "Added config for Trisquel GNU/Linux"
 
 sed 's/Debian or Ubuntu/Trisquel/' -i apt-mirror
 sed 's/Debian/Trisquel/g' -i apt-mirror
@@ -33,7 +32,7 @@ sed "s/stable/$CODENAME/g" -i apt-mirror
 sed 's/ contrib//g' -i apt-mirror
 sed 's/ non-free//g' -i apt-mirror
 
-changelog "Update manpage for Trisquel"
+changelog "Added config and update manpage for Trisquel."
 
 compile
 

helpers/make-base-files

@@ -17,11 +17,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 
 . ./config
 
 CODENAMECAPS=$(echo $CODENAME | /bin/sed -e "s/\b\(.\)/\u\1/g")
+POINT_RELEASE=".1"
 
 # Disable dynamic motd
 find -name *motd-news* -delete
@@ -85,28 +86,28 @@ fi
 EOF
 
 cat > etc/issue <<EOF
-Trisquel GNU/Linux $REVISION \n \l
+Trisquel GNU/Linux $REVISION$POINT_RELEASE \n \l
 
 EOF
 
 cat > etc/issue.net <<EOF
-Trisquel GNU/Linux $REVISION
+Trisquel GNU/Linux $REVISION$POINT_RELEASE
 EOF
 
 cat > etc/lsb-release <<EOF
 DISTRIB_ID=Trisquel
-DISTRIB_RELEASE=$REVISION
+DISTRIB_RELEASE=$REVISION$POINT_RELEASE
 DISTRIB_CODENAME=$CODENAME
-DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION, $CODENAMECAPS"
+DISTRIB_DESCRIPTION="Trisquel GNU/Linux $REVISION$POINT_RELEASE, $CODENAMECAPS"
 EOF
 
 cat > etc/os-release <<EOF
 NAME="Trisquel GNU/Linux"
-VERSION="$REVISION, $CODENAMECAPS"
+VERSION="$REVISION$POINT_RELEASE, $CODENAMECAPS"
 ID=trisquel
 ID_LIKE=debian
-PRETTY_NAME="Trisquel GNU/Linux $CODENAMECAPS ($REVISION)"
-VERSION_ID="$REVISION"
+PRETTY_NAME="Trisquel GNU/Linux $CODENAMECAPS ($REVISION$POINT_RELEASE)"
+VERSION_ID="$REVISION$POINT_RELEASE"
 VERSION_CODENAME="$CODENAME"
 UBUNTU_CODENAME="$UPSTREAM"
 HOME_URL="https://trisquel.info/"

helpers/make-birdtray

+#!/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=2
+. ./config
+
+#Replace name & paths.
+rpl -R '/.thunderbird' '/.icedove' .
+rpl -R 'Mozilla Thunderbird' 'Icedove Mail' .
+rpl -R 'Thunderbirda' 'Icedove' src/translations
+rpl -R 'Thunderbird' 'Icedove' src/translations \
+                               contrib \
+                               debian \
+                               CMakeLists.txt \
+                               README.md
+rpl -R ' Thunderbird' ' Icedove' src/
+rpl -R 'thunderbird' 'icedove' debian/
+sed -i '/bindir/s|thunderbird|icedove|' $(find . -name birdtray.spec)
+sed -i 's|Thunderbird|Icedove|g' $(find . -name com.ulduzsoft.Birdtray.desktop)
+sed -i '/return/s|Thunderbird|Icedove|g' src/utils.cpp
+sed -i '/return/s|thunderbird|icedove|g' src/utils.cpp
+sed -si '/string/s|Thunderbird|Icedove|g' src/*.ui
+
+#Replace icons
+cp -r $DATA/* src/res/
+
+#Set path
+cat << EOF | patch -p0
+--- src/utils.cpp	2022-09-08 03:46:23.713263610 -0500
++++ src/utils.cpp_fix	2022-09-08 03:48:19.925695988 -0500
+@@ -195,13 +195,7 @@
+ }
+ 
+ QStringList Utils::getDefaultThunderbirdCommand() {
+-#if defined (OPT_THUNDERBIRD_CMDLINE)
+-    return Utils::splitCommandLine( OPT_THUNDERBIRD_CMDLINE );
+-#elif defined (Q_OS_WIN)
+-    return {R"("%ProgramFiles(x86)%\Icedove Mail\icedove.exe")"};
+-#else
+     return { "/usr/bin/icedove" };
+-#endif
+ }
+ 
+ QStringList Utils::splitCommandLine(const QString &src)
+EOF
+
+changelog "Customization for Icedove."
+compile

helpers/make-bleachbit

@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 . ./config
 
@@ -38,10 +38,6 @@ replace firefox abrowser .
 
 cp $DATA/icecat.xml cleaners/icecat.xml
 
-changelog "Rename firefox to abrowser"
-
-changelog "Add icecat cleaner"
-
-changelog "Remove cleaners for non-free programs and stop advertising them"
+changelog "Rename firefox to abrowser, add icecat cleaner and remove cleaners for non-free programs and stop advertising them"
 
 compile

helpers/make-cargo

+#!/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=0
+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-command-not-found

@@ -2,7 +2,7 @@
 #
 #    Copyright (C) 2013  Rubén Rodríguez <ruben@trisquel.info>
 #    Copyright (C) 2019 Mason Hock <mason@masonhock.com>
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
+#    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
@@ -19,25 +19,22 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
-REPOKEY=04EE7237B7D453EC
-VERSION=1
+VERSION=2
 
 . ./config
 
-
 # ---
 # New way of working the db
 #https://bugs.launchpad.net/ubuntu/+source/command-not-found/+bug/1844651
 # ---
 
 # Delete components upstream, keep universe for passing test making main the first (only) parsed.
-#sed -i '/universe/d' CommandNotFound/db/creator.py
+sed -i '/universe/d' CommandNotFound/db/creator.py
 sed -i '/contrib/d;/restricted/d;/non-free/d;/multiverse/d' CommandNotFound/db/creator.py
 
 #Remove reference to non-free software or mirrors.
-#do-mirror
-sed -i 's|ARCH_LIST=.*|ARCH_LIST="amd64,armhf"|' mirror/do-mirror
+#do-mirror - aramo arch.
+sed -i 's|ARCH_LIST=.*|ARCH_LIST="i386,amd64,armhf,arm64,ppc64el"|' mirror/do-mirror
 sed -i 's|SECTION_LIST=.*|SECTION_LIST="main"|' mirror/do-mirror
 sed -i 's|MIRROR_HOST=.*|MIRROR_HOST="archive.trisquel.org"|' mirror/do-mirror
 sed -i 's|MIRROR_ROOT=.*|MIRROR_ROOT=":trisquel"|' mirror/do-mirror
@@ -45,6 +42,12 @@ sed -i 's|--dist=$DIST,$DIST-updates,$DIST-backports|--dist=$DIST,$DIST-updates,
 #control
 sed -i '/snapd/d' debian/control
 
+#Remove update-from-web
+rm update-from-web.sh
+
+#Patch test
+patch -p1 < $DATA/fix_test.patch
+
 changelog "Removed references to non-free software"
 
 compile

helpers/make-console-setup

+#!/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=0
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
+REPOKEY="871920D1991BC93C"
+COMPONENT=main
+NAME_CI=true
+BUILD_UNTIL=10.0
+
+. ./config
+
+
+changelog "Backported from Impish"
+
+compile
+

helpers/make-debian-installer

@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=9
+VERSION=10
 NETINST=true
 
 . ./config
@@ -63,7 +63,7 @@ open-ath9k-htc-firmware-udeb
 openfwwf-udeb
 EOF
 
-replace "2004-20.." "2004-20$(date +'%y')" . -R
+replace "2004-20.." "2004-20$(date +'%y')" .
 rpl www.ubuntu.com trisquel.info . -R
 rpl ubuntu.com trisquel.info build/boot/ -R
 rpl www.ubuntu trisquel build/boot/ -R

helpers/make-debootstrap

 #!/bin/sh
 #
-#    Copyright (C) 2008-2020  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,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=5
+VERSION=6
 NETINST=true
 
 . ./config
@@ -25,9 +25,7 @@ NETINST=true
 rm scripts/*
 cp -a $DATA/* scripts/
 
-replace ports.trisquel.org archive.trisquel.org
-
-changelog "Only include trisquel origins + armfh ports to archive"
+changelog "Only include trisquel origins"
 
 compile
 

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) 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
@@ -18,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=86
+VERSION=93
 
 . ./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
 
@@ -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