Hello Mike,
it seems that you are short of time. That is why I have updated my patch
adopting Simon's proposal. I hope it helps to get this issue fixed for
Debian bookworm.
Thank you in advance!
Cheers,
Thomas
On Fri, 2 Dec 2022, Mike Gabriel wrote:
On Fr 02 Dez 2022 20:55:32 CET, Thomas Uhle wrote:
I think that moving polkit-mate-authentication-agent-1 to /usr/libexec and
updating debian/control appropriately would be just enough to close this
ticket.
Sorry, I am delayed with this. I'll see to an upload the coming days. Thanks
to Simon for the various solution approaches, I'll agree with the
/usr/libexec switch as the best and least invasive solution.
Thanks!
Mike
diff --git a/debian/bin/mate-polkit b/debian/bin/mate-polkit
new file mode 100755
index 0000000..059a22f
--- /dev/null
+++ b/debian/bin/mate-polkit
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/libexec/polkit-mate-authentication-agent-1 &
diff --git a/debian/bin/mate-polkit.in b/debian/bin/mate-polkit.in
deleted file mode 100755
index a08dbb5..0000000
--- a/debian/bin/mate-polkit.in
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/@DEB_HOST_MULTIARCH@/polkit-mate/polkit-mate-authentication-agent-1 &
diff --git a/debian/control b/debian/control
index e1ccb8c..fe5e461 100644
--- a/debian/control
+++ b/debian/control
@@ -24,9 +24,11 @@
Package: mate-polkit-bin
Architecture: all
+Multi-Arch: foreign
Depends: mate-polkit (>= ${source:Version}),
${misc:Depends},
-Breaks: mate-polkit (<< 1.12.0-3~),
+Breaks: mate-polkit (<< 1.26.1-2~),
+Replaces: mate-polkit (<< 1.26.1-2~),
Description: MATE authentication agent for PolicyKit-1 (executable wrapper script)
The mate-polkit package provides a D-Bus session bus service that is used to
bring up authentication dialogs used for obtaining privileges.
@@ -40,9 +42,8 @@
Package: mate-polkit
Architecture: any
-Multi-Arch: same
Depends: accountsservice,
- mate-polkit-common (= ${binary:Version}),
+ mate-polkit-common (>= ${source:Version}),
policykit-1,
${misc:Depends},
${shlibs:Depends},
@@ -54,10 +55,9 @@
This package contains the MATE policy kit authentication agent.
Package: mate-polkit-common
-Architecture: any
+Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends},
- ${shlibs:Depends},
Breaks: mate-polkit (<< 1.8.0),
Description: MATE authentication agent for PolicyKit-1 (common files)
The mate-polkit package provides a D-Bus session bus service that is used to
diff --git a/debian/mate-polkit-bin.manpages b/debian/mate-polkit-bin.manpages
new file mode 100644
index 0000000..43f8a64
--- /dev/null
+++ b/debian/mate-polkit-bin.manpages
@@ -0,0 +1 @@
+debian/man/mate-polkit.1
diff --git a/debian/mate-polkit.install b/debian/mate-polkit.install
index b0bfa1a..f1c4c0a 100644
--- a/debian/mate-polkit.install
+++ b/debian/mate-polkit.install
@@ -1 +1 @@
-usr/lib/*/polkit-mate/
+usr/libexec/
diff --git a/debian/mate-polkit.manpages b/debian/mate-polkit.manpages
deleted file mode 100644
index 43f8a64..0000000
--- a/debian/mate-polkit.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/mate-polkit.1
diff --git a/debian/rules b/debian/rules
index bceb5d7..a8c7469 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,11 +17,10 @@ DEB_INSTALL_DOCS_ALL = README AUTHORS HACKING
DEB_CONFIGURE_SCRIPT := ./autogen.sh
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-silent-rules \
- --localstatedir=/var \
+DEB_CONFIGURE_EXTRA_FLAGS := --localstatedir=/var \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--includedir=/usr/include/$(DEB_HOST_MULTIARCH) \
- --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/polkit-mate \
+ --libexecdir=/usr/libexec \
--disable-silent-rules \
--disable-static \
--enable-gtk-doc
@@ -35,7 +34,7 @@ remove-cruft::
install-wrapper::
mkdir -p debian/tmp/usr/bin/
- sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' < debian/bin/mate-polkit.in > debian/tmp/usr/bin/mate-polkit
+ cp -p debian/bin/mate-polkit debian/tmp/usr/bin/mate-polkit
get-orig-source:
uscan --noconf --force-download --rename --download-current-version --destdir=..
