software-properties: backport v111 for improved deb822 sources

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}

helpers/make-software-properties

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2024 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2025 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>
@@ -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
 
+##Apply patch changes
 # 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
 # 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