From 63f1a0f06132305a09a5f5d31bcc4e83559524ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Fri, 26 Sep 2025 14:37:13 -0600 Subject: [PATCH] software-properties: backport v111 for improved deb822 sources --- .../001-remove_ubuntu_subscription_tab.patch} | 0 .../002-remove_proposed_updates.patch} | 0 .../003-fix_PPA_upstream_codename.patch} | 0 ...al_of_snaps_other_packages_referral.patch} | 0 .../005-rm_extend_esm_url_link.patch} | 0 .../006-add_new_dependency_for_s-p-111.patch | 12 ++++++++++ helpers/make-software-properties | 22 +++++++++---------- 7 files changed, 23 insertions(+), 11 deletions(-) rename helpers/DATA/software-properties/{remove_ubuntu_subscription_tab.patch => patch_changes/001-remove_ubuntu_subscription_tab.patch} (100%) rename helpers/DATA/software-properties/{remove_proposed_updates.patch => patch_changes/002-remove_proposed_updates.patch} (100%) rename helpers/DATA/software-properties/{fix_PPA_upstream_codename.patch => patch_changes/003-fix_PPA_upstream_codename.patch} (100%) rename helpers/DATA/software-properties/{removal_of_snaps_other_packages_referral.patch => patch_changes/004-removal_of_snaps_other_packages_referral.patch} (100%) rename helpers/DATA/software-properties/{rm_extend_esm_url_link.patch => patch_changes/005-rm_extend_esm_url_link.patch} (100%) create mode 100644 helpers/DATA/software-properties/patch_changes/006-add_new_dependency_for_s-p-111.patch diff --git a/helpers/DATA/software-properties/remove_ubuntu_subscription_tab.patch b/helpers/DATA/software-properties/patch_changes/001-remove_ubuntu_subscription_tab.patch similarity index 100% rename from helpers/DATA/software-properties/remove_ubuntu_subscription_tab.patch rename to helpers/DATA/software-properties/patch_changes/001-remove_ubuntu_subscription_tab.patch diff --git a/helpers/DATA/software-properties/remove_proposed_updates.patch b/helpers/DATA/software-properties/patch_changes/002-remove_proposed_updates.patch similarity index 100% rename from helpers/DATA/software-properties/remove_proposed_updates.patch rename to helpers/DATA/software-properties/patch_changes/002-remove_proposed_updates.patch diff --git a/helpers/DATA/software-properties/fix_PPA_upstream_codename.patch b/helpers/DATA/software-properties/patch_changes/003-fix_PPA_upstream_codename.patch similarity index 100% rename from helpers/DATA/software-properties/fix_PPA_upstream_codename.patch rename to helpers/DATA/software-properties/patch_changes/003-fix_PPA_upstream_codename.patch diff --git a/helpers/DATA/software-properties/removal_of_snaps_other_packages_referral.patch b/helpers/DATA/software-properties/patch_changes/004-removal_of_snaps_other_packages_referral.patch similarity index 100% rename from helpers/DATA/software-properties/removal_of_snaps_other_packages_referral.patch rename to helpers/DATA/software-properties/patch_changes/004-removal_of_snaps_other_packages_referral.patch diff --git a/helpers/DATA/software-properties/rm_extend_esm_url_link.patch b/helpers/DATA/software-properties/patch_changes/005-rm_extend_esm_url_link.patch similarity index 100% rename from helpers/DATA/software-properties/rm_extend_esm_url_link.patch rename to helpers/DATA/software-properties/patch_changes/005-rm_extend_esm_url_link.patch diff --git a/helpers/DATA/software-properties/patch_changes/006-add_new_dependency_for_s-p-111.patch b/helpers/DATA/software-properties/patch_changes/006-add_new_dependency_for_s-p-111.patch new file mode 100644 index 0000000..ffc4da1 --- /dev/null +++ b/helpers/DATA/software-properties/patch_changes/006-add_new_dependency_for_s-p-111.patch @@ -0,0 +1,12 @@ +diff --git a/debian/control b/debian/control +index 2dc835cb..d7ec094e 100644 +--- a/debian/control ++++ b/debian/control +@@ -102,6 +102,7 @@ Depends: debconf-kde-helper, + python3-pyqt6, + python3-sip, + python3-software-properties (= ${binary:Version}), ++ pyqt6-dev-tools, + software-properties-common, + ${misc:Depends}, + ${python3:Depends} diff --git a/helpers/make-software-properties b/helpers/make-software-properties index 653a35d..e3a2996 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2024 Luis Guzman +# Copyright (C) 2025 Luis Guzman # Copyright (C) 2011-2022 Ruben Rodriguez # Copyright (C) 2019 Mason Hock # Copyright (C) 2011 Carlos Pais @@ -21,6 +21,7 @@ # VERSION=17 +EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu plucky main' . ./config @@ -59,7 +60,7 @@ sed '/software-properties-drivers/d' -i debian/software-properties-gtk.install s replace "Trisquel-Gettext" "Ubuntu-Gettext" . -sed '/test_suite/d' -i setup.py +#sed '/test_suite/d' -i setup.py rm -rf tests rm data/software-properties-drivers.desktop.in @@ -75,15 +76,13 @@ sed -i '/software-properties-livepatch.desktop/s|^|#|' debian/software-propertie patch_p1 $DATA/rm_init_ubuntu_pro_if_lts.patch sed -i '/.TrisquelProPage/d' softwareproperties/gtk/SoftwarePropertiesGtk.py -#Livepatch - aramo -patch_p1 $DATA/remove_ubuntu_subscription_tab.patch -patch_p1 $DATA/remove_proposed_updates.patch -#Patch codename for PPAs -patch_p1 $DATA/fix_PPA_upstream_codename.patch -#Fix mention of "other packages" as we don't distribute snap. -patch_p1 $DATA/removal_of_snaps_other_packages_referral.patch +##Apply patch changes +# Livepatch - aramo +# Patch codename for PPAs +# Fix mention of "other packages" as we don't distribute snap. # Remove extend esm url from update tabs -patch_p1 $DATA/rm_extend_esm_url_link.patch +# Add s-p - 111 new dependency +apply_patch_changes # Make software-properties-qt visible on Triskel sed -i '/^NoDisplay=/s|true|false|' data/software-properties-qt.desktop.in @@ -96,7 +95,8 @@ do patch_p1 $patch done -changelog "Removed Ubuntu-specifc tests, Livepatch, Snap and fix PPA integration." +changelog "Removed Ubuntu-specifc tests, Livepatch, Snap and fix PPA integration. +Backport v111 on Ecne for improved deb822 sources support." package