Subject: [PATCH] libpolkit-gobject-consolekit-1-0: #911

From: "Plasma (David Paul)" <[email-masked]>
Date: Fri, 26 Sep 2025 20:13:26 -0500

Control: tags -1 patch

Dear Maintainer,

Attached are two patches which fix #911. They can be applied to the
head of the suites/unstable branch in the policykit-1 packaging
repository. Please also consider backporting them into
excalibur-proposed for the upcoming Excalibur release.

-- 
Plasma
From 375408241ad69054800e5d4790915d89b4a59ee4 Mon Sep 17 00:00:00 2001
From: "Plasma (David Paul)" <[email-masked]>
Date: Fri, 26 Sep 2025 16:00:39 -0500
Subject: [PATCH 1/2] refactor: rules: Move ubuntu-specific snippet

dh_auto_install is concerned with copying build artifacts to some
$DESTDIR, usually by running the buildsystem's install command.
dh_install handles copying individual files from a $DESTDIR to
binary-package-specific directories. The ubuntu-specific snippet
fits conceptually in the former category, so move it from
override_dh_install to override_dh_auto_install.
---
 debian/rules | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8bba501e..ddb2be3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,12 @@ override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install --builddirectory=build-consolekit --destdir=debian/install/consolekit
 
+	# on Debian/Devuan use sudo group; on Ubuntu, also allow the admin group for
+	# historical reasons
+	if dpkg-vendor --is ubuntu; then \
+		install -m644 debian/49-ubuntu-admin.rules debian/tmp/usr/share/polkit-1/rules.d/; \
+	fi
+
 override_dh_install:
 	dh_install \
 	-plibpolkit-gobject-consolekit-1-0       \
@@ -88,9 +94,4 @@ override_dh_install:
 	dh_install -a                           \
 	-Nlibpolkit-gobject-consolekit-1-0
 
-	# on Debian/Devuan use sudo group; on Ubuntu, also allow the admin group for
-	# historical reasons
-	if dpkg-vendor --is ubuntu; then \
-		install -m644 debian/49-ubuntu-admin.rules debian/tmp/usr/share/polkit-1/rules.d/; \
-	fi
 	dh_install
-- 
2.30.2

From d703477bfdabe4b2fae81a748568f3f3acb3032d Mon Sep 17 00:00:00 2001
From: "Plasma (David Paul)" <[email-masked]>
Date: Fri, 26 Sep 2025 20:02:23 -0500
Subject: [PATCH 2/2] Fix override_dh_install target

Closes: #911
---
 debian/changelog | 6 ++++++
 debian/rules     | 5 +----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc89fa70..28abc520 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+policykit-1 (126-2devuan2) UNRELEASED; urgency=medium
+
+  * d/rules: Fix override_dh_install target. (Closes: #911)
+
+ -- Plasma (David Paul) <[email-masked]>  Fri, 26 Sep 2025 19:23:41 -0500
+
 policykit-1 (126-2devuan1) unstable; urgency=medium
 
   * Merge tag debian/126-2.
diff --git a/debian/rules b/debian/rules
index ddb2be3c..3d94358b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,7 +91,4 @@ override_dh_install:
 	-plibpolkit-gobject-consolekit-1-0       \
 	--sourcedir=debian/install/consolekit
 
-	dh_install -a                           \
-	-Nlibpolkit-gobject-consolekit-1-0
-
-	dh_install
+	dh_install --remaining-packages
-- 
2.30.2