diff --git a/helpers/DATA/software-properties/fix_PPA_upstream_codename.patch b/helpers/DATA/software-properties/fix_PPA_upstream_codename.patch index f74374d..6e1ac8f 100644 --- a/helpers/DATA/software-properties/fix_PPA_upstream_codename.patch +++ b/helpers/DATA/software-properties/fix_PPA_upstream_codename.patch @@ -1,6 +1,7 @@ -diff -Nru software-properties-0.99.22.4+11.0trisquel9/softwareproperties/ppa.py software-properties-0.99.22.4+11.0trisquel9_fix/softwareproperties/ppa.py ---- software-properties-0.99.22.4+11.0trisquel9/softwareproperties/ppa.py 2023-01-21 14:29:00.314035991 -0600 -+++ software-properties-0.99.22.4+11.0trisquel9_fix/softwareproperties/ppa.py 2023-01-21 14:31:47.658510565 -0600 +diff --git a/softwareproperties/ppa.py b/softwareproperties/ppa.py +index a979a3c9..c4e7cadc 100644 +--- a/softwareproperties/ppa.py ++++ b/softwareproperties/ppa.py @@ -32,6 +32,8 @@ from urllib.parse import urlparse @@ -10,12 +11,12 @@ diff -Nru software-properties-0.99.22.4+11.0trisquel9/softwareproperties/ppa.py PPA_URI_FORMAT = 'https://ppa.launchpadcontent.net/{team}/{ppa}/ubuntu/' PRIVATE_PPA_URI_FORMAT = 'https://private-ppa.launchpadcontent.net/{team}/{ppa}/ubuntu/' -@@ -85,7 +87,7 @@ +@@ -98,7 +98,7 @@ class PPAShortcutHandler(ShortcutHandler): + entry = Deb822SourceEntry(None, '') + entry.types = [self.binary_type] + entry.uris = [uri] +- entry.suites = [self.dist] ++ entry.suites = [trisquel_upstream_rel] + entry.comps = comps - uri_format = PRIVATE_PPA_URI_FORMAT if self.lpppa.private else PPA_URI_FORMAT - uri = uri_format.format(team=self.teamname, ppa=self.ppaname) -- line = ('%s %s %s %s' % (self.binary_type, uri, self.dist, ' '.join(comps))) -+ line = ('%s %s %s %s' % (self.binary_type, uri, trisquel_upstream_rel, ' '.join(comps))) - self._set_source_entry(line) - - @property + self._set_source_entry(str(entry)) diff --git a/helpers/DATA/software-properties/l10n/de_po_r202405.po.patch b/helpers/DATA/software-properties/l10n/de_po_r202405.po.patch new file mode 100644 index 0000000..03cdbdb --- /dev/null +++ b/helpers/DATA/software-properties/l10n/de_po_r202405.po.patch @@ -0,0 +1,20 @@ +diff --git a/po/de.po b/po/de.po +index d3910630..fd57d848 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -1083,7 +1083,7 @@ msgstr "Wenn andere Aktualisierungen verfügbar sind:" + + #: ../data/gtkbuilder/main.ui.h:32 + msgid "Notify me of a new Trisquel version:" +-msgstr "Über neue Trisquel-Versionen benachrichtigen:" ++msgstr "Mich benachrichtigen, wenn eine neue Version von Trisquel verfügbar ist:" + + #: ../data/gtkbuilder/main.ui.h:33 + msgid "Updates" +@@ -1423,3 +1423,6 @@ msgstr "_Abbrechen" + #: ../data/gtkbuilder/dialog-ua-fips-enable.ui.h:8 + msgid "_Continue" + msgstr "_Fortsetzen" ++ ++msgid "This system has:" ++msgstr "Aktuelle Version des Systems:" diff --git a/helpers/DATA/software-properties/l10n/es_po_r202312.po.patch b/helpers/DATA/software-properties/l10n/es_po_r202312.po.patch deleted file mode 100644 index e0dcbb0..0000000 --- a/helpers/DATA/software-properties/l10n/es_po_r202312.po.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/po/es.po b/po/es.po -index e38d16e..49e88bf 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -2027,3 +2027,11 @@ msgstr "Servidor maś cercano" - #~ "\n" - #~ "El gestor de actualizaciones encontró los siguientes paquetes " - #~ "actualizables. Puede actualizarlos usando el botón Instalar." -+ -+# data/gtkbuilder/main.ui:822 -+msgid "Notify me of a new Trisquel version:" -+msgstr "Notificarme de una nueva versión de Trisquel:" -+ -+# data/gtkbuilder/main.ui:549 -+msgid "This system has:" -+msgstr "Este sistema tiene:" diff --git a/helpers/DATA/software-properties/l10n/es_po_r202405.po.patch b/helpers/DATA/software-properties/l10n/es_po_r202405.po.patch new file mode 100644 index 0000000..24e14ff --- /dev/null +++ b/helpers/DATA/software-properties/l10n/es_po_r202405.po.patch @@ -0,0 +1,12 @@ +diff --git a/po/es.po b/po/es.po +index 1745f863..2a424020 100644 +--- a/po/es.po ++++ b/po/es.po +@@ -1401,3 +1401,7 @@ msgstr "Cance_lar" + #: ../data/gtkbuilder/dialog-ua-fips-enable.ui.h:8 + msgid "_Continue" + msgstr "_Continuar" ++ ++# data/gtkbuilder/main.ui:549 ++msgid "This system has:" ++msgstr "Este sistema tiene:" diff --git a/helpers/DATA/software-properties/l10n/fr_po_r202312.po.patch b/helpers/DATA/software-properties/l10n/fr_po_r202312.po.patch deleted file mode 100644 index c952516..0000000 --- a/helpers/DATA/software-properties/l10n/fr_po_r202312.po.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/po/fr.po b/po/fr.po -index 70cb85e..0f9e7bd 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -2029,3 +2029,15 @@ msgstr "Serveur le plus proche" - - #~ msgid "0" - #~ msgstr "0" -+ -+# data/gtkbuilder/main.ui:822 -+msgid "Notify me of a new Trisquel version:" -+msgstr "M’avertir lorsqu’une nouvelle version de Trisquel est disponible :" -+ -+# data/gtkbuilder/main.ui:549 -+msgid "This system has:" -+msgstr "Version actuelle du système :" -+ -+# data/gtkbuilder/main.ui:682 -+msgid "Automatically check for updates:" -+msgstr "Vérifier automatiquement si les logiciels sont à jour :" diff --git a/helpers/DATA/software-properties/l10n/fr_po_r202405.po.patch b/helpers/DATA/software-properties/l10n/fr_po_r202405.po.patch new file mode 100644 index 0000000..3f59617 --- /dev/null +++ b/helpers/DATA/software-properties/l10n/fr_po_r202405.po.patch @@ -0,0 +1,30 @@ +diff --git a/po/fr.po b/po/fr.po +index 73a64794..6f57ce1a 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -1058,7 +1058,7 @@ msgstr "Abonné à :" + + #: ../data/gtkbuilder/main.ui.h:29 + msgid "Automatically check for updates:" +-msgstr "Vérifier automatiquement les mises à jour :" ++msgstr "Vérifier automatiquement si les logiciels sont à jour :" + + #: ../data/gtkbuilder/main.ui.h:30 + msgid "When there are security updates:" +@@ -1070,7 +1070,7 @@ msgstr "Lorsqu’il y a d’autres mises à jour :" + + #: ../data/gtkbuilder/main.ui.h:32 + msgid "Notify me of a new Trisquel version:" +-msgstr "Me prévenir lorsqu'une nouvelle version d’Trisquel est disponible :" ++msgstr "M’avertir lorsqu’une nouvelle version de Trisquel est disponible :" + + #: ../data/gtkbuilder/main.ui.h:33 + msgid "Updates" +@@ -1371,3 +1371,7 @@ msgstr "_Annuler" + #: ../data/gtkbuilder/dialog-ua-fips-enable.ui.h:8 + msgid "_Continue" + msgstr "_Continuer" ++ ++# data/gtkbuilder/main.ui:549 ++msgid "This system has:" ++msgstr "Version actuelle du système :" diff --git a/helpers/DATA/software-properties/remove_snap_label.patch b/helpers/DATA/software-properties/remove_snap_label.patch index 57dccb7..da2427a 100644 --- a/helpers/DATA/software-properties/remove_snap_label.patch +++ b/helpers/DATA/software-properties/remove_snap_label.patch @@ -1,5 +1,5 @@ ---- data/gtkbuilder/main.ui 2021-11-26 14:49:57.068200377 -0600 -+++ data/gtkbuilder/main.ui_remove_label 2021-11-26 15:06:51.035673116 -0600 +--- a/data/gtkbuilder/main.ui 2021-11-26 14:49:57.068200377 -0600 ++++ b/data/gtkbuilder/main.ui_remove_label 2021-11-26 15:06:51.035673116 -0600 @@ -534,19 +534,6 @@ 12 18 diff --git a/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch b/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch index 6038afb..413fc95 100644 --- a/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch +++ b/helpers/DATA/software-properties/remove_ubuntu_suscription_tab.patch @@ -1,10 +1,12 @@ -diff -Nru software-properties-0.99.22.5+11.0trisquel12/data/gtkbuilder/main.ui software-properties-0.99.22.5+11.0trisquel12_fix/data/gtkbuilder/main.ui ---- software-properties-0.99.22.5+11.0trisquel12/data/gtkbuilder/main.ui 2023-01-26 15:15:06.253819392 -0600 -+++ software-properties-0.99.22.5+11.0trisquel12_fix/data/gtkbuilder/main.ui 2023-01-26 15:17:19.325782731 -0600 -@@ -1211,423 +1211,6 @@ +diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui +index fe0a50f0..2943052f 100644 +--- a/data/gtkbuilder/main.ui ++++ b/data/gtkbuilder/main.ui +@@ -1210,423 +1210,6 @@ + 5 - +- - - True - False @@ -17,7 +19,7 @@ diff -Nru software-properties-0.99.22.5+11.0trisquel12/data/gtkbuilder/main.ui s - - - -- True +- False - - - True @@ -315,7 +317,7 @@ diff -Nru software-properties-0.99.22.5+11.0trisquel12/data/gtkbuilder/main.ui s - - - True -- <b>FIPS 140-2</b> +- <b>FIPS 140-2</b> - True - 0 - @@ -421,7 +423,6 @@ diff -Nru software-properties-0.99.22.5+11.0trisquel12/data/gtkbuilder/main.ui s - - - -- + True - False diff --git a/helpers/make-software-properties b/helpers/make-software-properties index 00bc6bc..733b81f 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2023 Luis Guzman +# Copyright (C) 2024 Luis Guzman # Copyright (C) 2011-2022 Ruben Rodriguez # Copyright (C) 2019 Mason Hock # Copyright (C) 2011 Carlos Pais @@ -20,7 +20,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=13 +VERSION=15 . ./config @@ -29,7 +29,7 @@ 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 +patch_p1 $DATA/remove_snap_label.patch #Python specific changes cp $DATA/trisquel_info.py softwareproperties/ @@ -52,7 +52,7 @@ replace TrisquelDistribution UbuntuDistribution . sed '/NoDisplay/d; s/Trisquel/Ubuntu/' -i data/software-properties-gtk.desktop.in sed '/ubuntu-drivers-common/d' -i debian/control -sed '/ubuntu-advantage-tools/d' -i debian/control +sed '/ubuntu-pro-client/d' -i debian/control sed '/ubuntu-advantage-desktop-daemon/d' -i debian/control sed '/software-properties-drivers/d' -i debian/software-properties-gtk.install setup.cfg @@ -75,17 +75,17 @@ sed -i '/TrisquelProPage/d' softwareproperties/gtk/SoftwarePropertiesGtk.py sed -i '/init_ubuntu_pro/d' softwareproperties/gtk/SoftwarePropertiesGtk.py #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_p1 $DATA/remove_ubuntu_suscription_tab.patch +patch_p1 $DATA/remove_proposed_updates.patch #Patch codename for PPAs -patch --no-backup-if-mismatch -p1 < $DATA/fix_PPA_upstream_codename.patch +patch_p1 $DATA/fix_PPA_upstream_codename.patch #Fix mention of "other packages" as we don't distribute snap. -patch --no-backup-if-mismatch -p1 < $DATA/removal_of_snaps_other_packages_referral.patch +patch_p1 $DATA/removal_of_snaps_other_packages_referral.patch # Trisquel l10n modifications using git patches. for patch in $(ls -v ${DATA}/l10n/*.patch) do - echo "> Applying $patch" + echo "> Applying $(echo $patch|xargs basename)" patch --no-backup-if-mismatch -Np1 < $patch done