From 252ef900f4ea5535d0d4afff213bcca0f2f78f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Mon, 11 Oct 2021 05:12:06 +0000
Subject: [PATCH] Remove unused patch lines and small adjustments
---
.../ubiquity/apply-before-21.10.9-release.patch | 17 -----------------
helpers/make-ubiquity | 11 ++---------
2 files changed, 2 insertions(+), 26 deletions(-)
delete mode 100644 helpers/DATA/ubiquity/apply-before-21.10.9-release.patch
diff --git a/helpers/DATA/ubiquity/apply-before-21.10.9-release.patch b/helpers/DATA/ubiquity/apply-before-21.10.9-release.patch
deleted file mode 100644
index aa0c8aa61..000000000
--- a/helpers/DATA/ubiquity/apply-before-21.10.9-release.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/bin/ubiquity-dm b/bin/ubiquity-dm
-index 08e96d1..227301c 100755
---- a/bin/ubiquity-dm
-+++ b/bin/ubiquity-dm
-@@ -404,11 +404,7 @@ EndSection
- stdin=null, stdout=logfile, stderr=logfile,
- preexec_fn=self.drop_privileges))
-
-- if (
-- osextras.find_on_path("kwin") or
-- osextras.find_on_path("kwin_x11") or
-- osextras.find_on_path("gnome-shell")
-- ) and osextras.find_on_path("dbus-update-activation-environment"):
-+ if osextras.find_on_path("dbus-update-activation-environment"):
- subprocess.Popen(
- [
- "dbus-update-activation-environment",
diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index b35f6b6c9..8f76372b3 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=15
+VERSION=16
EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu impish main universe'
#REPOKEY="871920D1991BC93C"
@@ -38,14 +38,7 @@ replace grub-efi-amd64-signed grub-efi-amd64 .
/bin/sed '/canonical/d' -i debian/ubiquity.install*
rm tests/test_ubi_partman*
-sed -i '0,/ubuntu-artwork/{/ubuntu-artwork/d;}' debian/control
-
-#Early patch ubiquity-dm, remove after 21.10.9 is out.
-NEED_PATCH="$(grep 'osextras.find_on_path("kwin") or' bin/ubiquity-dm)"
-if [ -n "$NEED_PATCH" ]; then
- echo "Applying a11n fix patch."
- patch -p1 < $DATA/apply-before-21.10.9-release.patch
-fi
+#sed -i '0,/ubuntu-artwork/{/ubuntu-artwork/d;}' debian/control
export DEB_BUILD_OPTIONS=nocheck
--
GitLab