helpers/DATA/thunderbird/process-json-files.py

@@ -51,10 +51,18 @@ class RemoteSettings:
     DUMPS_PATH_ABSOLUTE = arguments.MAIN_PATH / DUMPS_PATH_RELATIVE
 
     _WRAPPER_NAME = 'data'
+    _LAST_MODIFIED_KEY_NAME = 'last_modified'
+
+    @classmethod
+    def get_collection_timestamp(cls, collection):
+        return max((record[cls._LAST_MODIFIED_KEY_NAME]
+                   for record in collection.content), default=0)
 
     @classmethod
     def wrap(cls, processed):
-        return File(processed.path, {cls._WRAPPER_NAME: processed.content})
+        return File(processed.path,
+                    {cls._WRAPPER_NAME: processed.content,
+                     'timestamp': cls.get_collection_timestamp(processed)})
 
     @classmethod
     def unwrap(cls, parsed_jsons):
@@ -88,13 +96,15 @@ class RemoteSettings:
                         while timestamp in timestamps:
                             timestamp += 1
                         timestamps.append(timestamp)
-                        record['last_modified'] = timestamp
+                        record[cls._LAST_MODIFIED_KEY_NAME] = timestamp
 
                 if parsed_schema is not None:
                     validate(record, schema=parsed_schema)
 
                 result.append(record)
 
+        result.sort(
+            key=lambda record: record[cls._LAST_MODIFIED_KEY_NAME], reverse=True)
         cls.OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
 
         return File(cls.OUTPUT_PATH, result)
@@ -109,7 +119,7 @@ class RemoteSettings:
 
 class Changes(RemoteSettings):
     JSON_PATHS = tuple(RemoteSettings.DUMPS_PATH_ABSOLUTE.glob('*/*.json'))
-    OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes.json'
+    OUTPUT_PATH = RemoteSettings.DUMPS_PATH_ABSOLUTE / 'monitor/changes'
 
     @classmethod
     def wrap(cls, processed):
@@ -124,8 +134,8 @@ class Changes(RemoteSettings):
         for collection in unwrapped_jsons:
             if collection.path != RemoteSettings.DUMPS_PATH_ABSOLUTE / 'main/example.json':
                 latest_change = {}
-                latest_change['last_modified'] = max(
-                    (record['last_modified'] for record in collection.content), default=0)
+                latest_change[cls._LAST_MODIFIED_KEY_NAME] = cls.get_collection_timestamp(
+                    collection)
                 latest_change['bucket'] = collection.path.parent.name
                 latest_change['collection'] = collection.path.stem
                 changes.append(latest_change)

helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.etiona

@@ -10,8 +10,8 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
 # Distro contains global information about the upgrade
 [Distro]
 # the meta-pkgs we support
-MetaPkgs=trisquel-recommended, trisquel-mini-recommended, triskel-recommended, trisquel-sugar-recommended
-BaseMetaPkgs=trisquel-minimal, trisquel-base-recommended
+MetaPkgs=trisquel, trisquel-mini, triskel, trisquel-sugar
+BaseMetaPkgs=trisquel-minimal, trisquel-base
 Demotions=demoted.cfg
 #RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
 RemovalBlacklistFile=removal_blacklist.cfg
@@ -46,17 +46,32 @@ Types=386,ec2,generic,generic-lpae,lowlatency,powerpc-e500mc,powerpc-smp,
 
 # information about the individual meta-pkgs
 [trisquel]
-KeyDependencies=trisquel-desktop-common-data, unity-greeter, lightdm
+KeyDependencies=mate-desktop-environment
 # those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=casper, xscreensaver,  powermanagement-interface, compiz-core, gdm, gnome-ppp, remmina-common, resolvconf
+PostUpgradeRemove=casper, xscreensaver, powermanagement-interface, compiz-core, gdm, gnome-ppp, resolvconf
 ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
 
 [trisquel-mini]
-KeyDependencies=trisquel-mini-data unity-greeter
+KeyDependencies=lxde
 #Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
-PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager, resolvconf
+PostUpgradeRemove=casper, gnome-bluetooth, resolvconf
 ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
 
+[triskel]
+KeyDependencies=triskel-settings-desktop, plasma-desktop, sddm
+# those pkgs will be marked remove right after the distUpgrade in the cache
+PostUpgradeRemove=casper, powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix
+# those packages are marked as obsolete right after the upgrade
+ForcedObsoletes=ivman, gtk-qt-engine
+# help the resolver a bit: LP: #1426132
+PostUpgradeInstall=baloo-kf5
+
+[trisquel-sugar]
+KeyDependencies=sugar, lightdm-gtk-greeter
+
+[trisquel-gnome]
+KeyDependencies=gnome-core, gdm3
+
 [Files]
 BackupExt=distUpgrade
 LogDir=/var/log/dist-upgrade/

helpers/DATA/update-notifier/apt_check.py

+#!/usr/bin/python3
+
+
+# nice apt-get -s -o Debug::NoLocking=true upgrade | grep ^Inst
+
+import apt
+import apt_pkg
+import os
+import sys
+from optparse import OptionParser
+import re
+import gettext
+import distro_info
+import subprocess
+
+
+SYNAPTIC_PINFILE = "/var/lib/synaptic/preferences"
+OS_RELEASE_PATH = "/etc/os-release"
+
+
+def _get_info_from_os_release(key):
+    " get info directly from os-release file "
+    if os.path.exists(OS_RELEASE_PATH):
+        with open(OS_RELEASE_PATH) as f:
+            search_res = re.search(
+                r"{}=(?P<name>.*)".format(key),
+                f.read()
+            )
+            if search_res:
+                return search_res.group("name")
+            else:
+                raise Exception(
+                    "Could not find {} in {}".format(
+                        key, OS_RELEASE_PATH
+                    )
+                )
+    else:
+        raise Exception(
+            "File {} was not found on the system".format(
+                OS_RELEASE_PATH
+            )
+        )
+
+
+def _get_output_from_lsb_release(lsb_option):
+    " get info from lsb_release output "
+    return subprocess.check_output(
+        ["lsb_release", lsb_option, "-s"], universal_newlines=True
+    ).strip()
+
+
+def get_distro():
+    " get distro name "
+    try:
+        return _get_info_from_os_release(key="UBUNTU_CODENAME")
+    except Exception:
+        # If the system does not have os-release file or does not have the
+        # required entry in it, we will get the distro name from lsb_release
+        # command
+        return _get_output_from_lsb_release("-c")
+
+
+DISTRO = get_distro()
+
+def _(msg):
+    return gettext.dgettext("update-notifier", msg)
+
+
+def _handleException(type, value, tb):
+    sys.stderr.write("E: " + _("Unknown Error: '%s' (%s)") % (type, value))
+    sys.exit(-1)
+
+
+def get_distro_version():
+    " get distro version "
+    try:
+        return _get_info_from_os_release(key="VERSION_ID").replace('"', "")
+    except Exception:
+        # If the system does not have os-release file or does not have the
+        # required entry in it, we will get the distro name from lsb_release
+        # command
+        return _get_output_from_lsb_release("-r")
+
+
+def clean(cache, depcache):
+    " unmark (clean) all changes from the given depcache "
+    # mvo: looping is too inefficient with the new auto-mark code
+    # for pkg in cache.Packages:
+    #     depcache.MarkKeep(pkg)
+    depcache.init()
+
+
+def saveDistUpgrade(cache, depcache):
+    """ this function mimics a upgrade but will never remove anything """
+    depcache.upgrade(True)
+    if depcache.del_count > 0:
+        clean(cache, depcache)
+    depcache.upgrade()
+
+
+def isSecurityUpgrade(ver):
+    " check if the given version is a security update (or masks one) "
+    security_pockets = [("Ubuntu", "%s-security" % DISTRO),
+                        ("gNewSense", "%s-security" % DISTRO),
+                        ("Debian", "%s-updates" % DISTRO)]
+    for (file, index) in ver.file_list:
+        for origin, archive in security_pockets:
+            if (file.archive == archive and file.origin == origin):
+                return True
+    return False
+
+def write_package_names(outstream, cache, depcache):
+    " write out package names that change to outstream "
+    pkgs = [pkg for pkg in cache.packages if depcache.marked_install(pkg)
+            or depcache.marked_upgrade(pkg)]
+    outstream.write("\n".join([p.name for p in pkgs]))
+
+
+def is_lts_distro():
+    " check if the current distro is LTS or not"
+    return distro_info.TrisquelDistroInfo().is_lts(DISTRO)
+
+
+def write_human_readable_summary(outstream, upgrades, security_updates):
+    " write out human summary to outstream "
+    lts_distro = is_lts_distro()
+
+    outstream.write(
+        gettext.dngettext("update-notifier",
+                          "%i update can be applied immediately.",
+                          "%i updates can be applied immediately.",
+                          upgrades) % upgrades
+    )
+
+    if security_updates > 0:
+        outstream.write("\n")
+        outstream.write(gettext.dngettext("update-notifier",
+                                          "%i of these updates is a "
+                                          "standard security update.",
+                                          "%i of these updates are "
+                                          "standard security updates.",
+                                          security_updates) %
+                        security_updates)
+
+
+def init():
+    " init the system, be nice "
+    # FIXME: do a ionice here too?
+    os.nice(19)
+    apt_pkg.init()
+
+
+def run(options=None):
+
+    # we are run in "are security updates installed automatically?"
+    # question mode
+    if options.security_updates_unattended:
+        res = apt_pkg.config.find_i("APT::Periodic::Unattended-Upgrade", 0)
+        # print(res)
+        sys.exit(res)
+
+    # get caches
+    try:
+        cache = apt_pkg.Cache(apt.progress.base.OpProgress())
+    except SystemError as e:
+        sys.stderr.write("E: " + _("Error: Opening the cache (%s)") % e)
+        sys.exit(-1)
+    depcache = apt_pkg.DepCache(cache)
+
+    # read the synaptic pins too
+    if os.path.exists(SYNAPTIC_PINFILE):
+        depcache.read_pinfile(SYNAPTIC_PINFILE)
+        depcache.init()
+
+    if depcache.broken_count > 0:
+        sys.stderr.write("E: " + _("Error: BrokenCount > 0"))
+        sys.exit(-1)
+
+    # do the upgrade (not dist-upgrade!)
+    try:
+        saveDistUpgrade(cache, depcache)
+    except SystemError as e:
+        sys.stderr.write("E: " + _("Error: Marking the upgrade (%s)") % e)
+        sys.exit(-1)
+
+
+    # analyze the ugprade
+    upgrades = 0
+    security_updates = 0
+
+    # we need another cache that has more pkg details
+    with apt.Cache() as aptcache:
+        for pkg in cache.packages:
+
+            # skip packages that are not marked upgraded/installed
+            if not (depcache.marked_install(pkg)
+                    or depcache.marked_upgrade(pkg)):
+                continue
+            # check if this is really a upgrade or a false positive
+            # (workaround for ubuntu #7907)
+            inst_ver = pkg.current_ver
+            cand_ver = depcache.get_candidate_ver(pkg)
+            if cand_ver == inst_ver:
+                continue
+            # check for security upgrades
+            if isSecurityUpgrade(cand_ver):
+                security_updates += 1
+
+                upgrades += 1
+                continue
+
+            # check to see if the update is a phased one
+            try:
+                from UpdateManager.Core.UpdateList import UpdateList
+                ul = UpdateList(None)
+                ignored = ul._is_ignored_phased_update(
+                    aptcache[pkg.get_fullname()])
+                if ignored:
+                    depcache.mark_keep(pkg)
+                    continue
+            except ImportError:
+                pass
+
+            upgrades = upgrades + 1
+
+            # now check for security updates that are masked by a
+            # candidate version from another repo (-proposed or -updates)
+            for ver in pkg.version_list:
+                if (inst_ver
+                        and apt_pkg.version_compare(ver.ver_str,
+                                                    inst_ver.ver_str) <= 0):
+                    continue
+                if isSecurityUpgrade(ver):
+                    security_updates += 1
+                    break
+
+    # print the number of upgrades
+    if options and options.show_package_names:
+        write_package_names(sys.stderr, cache, depcache)
+    elif options and options.readable_output:
+        write_human_readable_summary(sys.stdout, upgrades, security_updates)
+    else:
+        # print the number of regular upgrades and the number of
+        # security upgrades
+        sys.stderr.write("%s;%s" % (upgrades, security_updates))
+
+    # return the number of upgrades (if its used as a module)
+    return(upgrades, security_updates)
+
+
+if __name__ == "__main__":
+    # setup a exception handler to make sure that uncaught stuff goes
+    # to the notifier
+    sys.excepthook = _handleException
+
+    # gettext
+    APP = "update-notifier"
+    DIR = "/usr/share/locale"
+    gettext.bindtextdomain(APP, DIR)
+    gettext.textdomain(APP)
+
+    # check arguments
+    parser = OptionParser()
+    parser.add_option("-p",
+                      "--package-names",
+                      action="store_true",
+                      dest="show_package_names",
+                      help=_("Show the packages that are "
+                             "going to be installed/upgraded"))
+    parser.add_option("",
+                      "--human-readable",
+                      action="store_true",
+                      dest="readable_output",
+                      help=_("Show human readable output on stdout"))
+    parser.add_option("",
+                      "--security-updates-unattended",
+                      action="store_true",
+                      help=_("Return the time in days when security updates "
+                             "are installed unattended (0 means disabled)"))
+    (options, args) = parser.parse_args()
+
+    # run it
+    init()
+    run(options)
+

helpers/config

@@ -46,7 +46,7 @@ export DOMAIN=trisquel.info
 export UPSTREAM=focal
 export UPSTREAMRELEASE=20.04
 MIRROR=http://archive.ubuntu.com/ubuntu
-LOCALMIRROR=https://archive.trisquel.org/trisquel
+LOCALMIRROR=http://archive.trisquel.org/trisquel
 LOCAL_APT=`mktemp -d` 
 
 if [ -n "$BUILD_UNTIL" ] && (( $(echo "$BUILD_UNTIL $REVISION" | awk '{print ($1 > $2)}') )); then
@@ -68,7 +68,12 @@ find ${@:3} -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -e
 changelog(){
 head -n 1 debian/changelog | grep -q $UPSTREAM-security && REPO=$CODENAME-security || REPO=$CODENAME
 [ "$BACKPORT" = true ] || [ "$BACKPORTS" = true ] && REPO=${CODENAME}-backports
+#Name convention issue "+" breaking packages build like console-setup, using "-" instead.
+if [ "$NAME_CI" = true ];then
+echo | dch -D $REPO -v `pkgversion`-${REVISION}trisquel${VERSION} "$1"
+else
 echo | dch -D $REPO -v `pkgversion`+${REVISION}trisquel${VERSION} "$1"
+fi
 
 # Make sure the changelog file is identical between archs
 /bin/sed "/-- Trisquel/s/.*/ -- Trisquel GNU\/Linux developers <trisquel-devel@listas.trisquel.info>  $DATE/" -i debian/changelog
@@ -159,9 +164,9 @@ cd PACKAGES/$PACKAGE
 #Get package and uncompress it
 apt-get update -c $LOCAL_APT/etc/apt.conf
 if [ -n "$FIXED_VER" ]; then
-  apt-get source $PACKAGE=$FIXED_VER --download-only -c ${LOCAL_APT}/etc/apt.conf
+  apt-get source --only-source $PACKAGE=$FIXED_VER --download-only -c ${LOCAL_APT}/etc/apt.conf
 else
-  apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf
+  apt-get source --only-source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf
 fi
 # Verify it first
 if grep -q "BEGIN PGP SIGNATURE" *.dsc; then
@@ -189,10 +194,8 @@ cd source
 [ -f debian/source/format ] && rm debian/source/format
 [ -f debian/source/options ] && rm debian/source/options
 
-#for i in debian.master/control.stub.in debian.master/control.stub debian.master/control debian/control.stub.in debian/control.stub debian/control
-#do
-#    [ -f $i ] && /bin/sed "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g" -i $i
-#done
+grep -lr 'Maintainer:' debian*/control* | \
+xargs sed -i "s_^Maintainer.*_Maintainer: $DEBFULLNAME <$DEBEMAIL>_g"
 
 compile(){
 
@@ -266,4 +269,7 @@ else
 fi
 }
 
-
+remove_patch(){
+  rm "$(find debian/patches -name "$1")"
+  sed -i "/$1/d" debian/patches/series
+}

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-aiohttp-socks

@@ -18,13 +18,13 @@
 #
 
 VERSION=2
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=648ACFD622F3D138
 DEPENDS=python-pytest-asyncio
 BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from debian stable"
+changelog "Backported from debian bullseye"
 
 compile

helpers/make-aiorpcx

@@ -18,12 +18,12 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=648ACFD622F3D138
 BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from debian-testing"
+changelog "Backported from debian-bullseye"
 
 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-alembic

@@ -18,13 +18,13 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
+EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
 REPOKEY=648ACFD622F3D138
 BACKPORTS=true
 BUILD_UNTIL=10.0
 
 . ./config
 
-changelog "Backported from debian stable"
+changelog "Backported from debian bullseye"
 
 compile

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,23 @@
 #    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
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu jammy main universe'
+REPOKEY="871920D1991BC93C"
 . ./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 +43,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