Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package mate-polkit
The mate-polkit XDG autostart launcher would not execute properly on
non-amd64 architectures due to the executable being installed into a
multi-arch path while the XDG autostart .desktop file would always
reference the amd64 path. Also, the .desktop file gets installed via the
mate-polkit-common package which makes the situation more complex.
The solution was to install the mate-polkit executable into /usr/libexec
for all architectures and adjust the multi-arch tags in the bin:pkgs.
[ Reason ]
+ [ Thomas Uhle ]
+ * debian/:
+ + Move polkit-agent executable to /usr/libexec directory. Move man page
+ into mate-polkit-bin bin:pkg. (Closes: #1006996). Re-adjust inter-package
+ relations and bin:pkg architecture declarations. Remove remnants of this
+ package being a shared library once (i.e. drop Multi-Arch: fields).
-> This change tackles the above mention architecture problem on non-amd64.
+ * debian/rules:
+ + Drop duplicate --disable-silent-rules from configure run.
-> Cleaning up d/rules dh_configure override.
+ [ Mike Gabriel ]
+ * debian/control:
+ + Switch from D: policykit-1 (deprecated) to polkitd. (Closes: #1025598).
-> policykit-1 deprecation fix.
+ * debian/copyright:
+ + Update copyright attributions for debian/.
-> Adjust copyright attributions.
[ Impact ]
MATE can be used out-of-the-box on other architectures except from amd64.
[ Tests ]
Manual installation on amd64 and arm64.
[ Risks ]
MATE on amd64 might break, but manual tests do not hint that.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
None.
unblock mate-polkit/1.26.1-3
diff -Nru mate-polkit-1.26.1/debian/bin/mate-polkit
mate-polkit-1.26.1/debian/bin/mate-polkit
--- mate-polkit-1.26.1/debian/bin/mate-polkit 1970-01-01 01:00:00.000000000
+0100
+++ mate-polkit-1.26.1/debian/bin/mate-polkit 2023-04-25 14:57:11.000000000
+0200
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/libexec/polkit-mate-authentication-agent-1 &
diff -Nru mate-polkit-1.26.1/debian/bin/mate-polkit.in
mate-polkit-1.26.1/debian/bin/mate-polkit.in
--- mate-polkit-1.26.1/debian/bin/mate-polkit.in 2019-02-02
01:45:22.000000000 +0100
+++ mate-polkit-1.26.1/debian/bin/mate-polkit.in 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/@DEB_HOST_MULTIARCH@/polkit-mate/polkit-mate-authentication-agent-1 &
diff -Nru mate-polkit-1.26.1/debian/changelog
mate-polkit-1.26.1/debian/changelog
--- mate-polkit-1.26.1/debian/changelog 2022-10-16 22:15:12.000000000 +0200
+++ mate-polkit-1.26.1/debian/changelog 2023-04-25 16:12:33.000000000 +0200
@@ -1,3 +1,28 @@
+mate-polkit (1.26.1-3) unstable; urgency=medium
+
+ * Re-upload source-only. (By mistake, previous upload was src+amd64 upload).
+
+ -- Mike Gabriel <sunwea...@debian.org> Tue, 25 Apr 2023 16:12:33 +0200
+
+mate-polkit (1.26.1-2) unstable; urgency=medium
+
+ [ Thomas Uhle ]
+ * debian/:
+ + Move polkit-agent executable to /usr/libexec directory. Move man page
+ into mate-polkit-bin bin:pkg. (Closes: #1006996). Re-adjust inter-package
+ relations and bin:pkg architecture declarations. Remove remnants of this
+ package being a shared library once (i.e. drop Multi-Arch: fields).
+ * debian/rules:
+ + Drop duplicate --disable-silent-rules from configure run.
+
+ [ Mike Gabriel ]
+ * debian/control:
+ + Switch from D: policykit-1 (deprecated) to polkitd. (Closes: #1025598).
+ * debian/copyright:
+ + Update copyright attributions for debian/.
+
+ -- Mike Gabriel <sunwea...@debian.org> Tue, 25 Apr 2023 13:15:11 +0000
+
mate-polkit (1.26.1-1) unstable; urgency=medium
* New upstream release.
diff -Nru mate-polkit-1.26.1/debian/control mate-polkit-1.26.1/debian/control
--- mate-polkit-1.26.1/debian/control 2022-10-16 22:14:50.000000000 +0200
+++ mate-polkit-1.26.1/debian/control 2023-04-25 15:12:24.000000000 +0200
@@ -26,7 +26,8 @@
Architecture: all
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,10 +41,9 @@
Package: mate-polkit
Architecture: any
-Multi-Arch: same
Depends: accountsservice,
- mate-polkit-common (= ${binary:Version}),
- policykit-1,
+ mate-polkit-common (>= ${source:Version}),
+ polkitd,
${misc:Depends},
${shlibs:Depends},
Provides: polkit-1-auth-agent,
@@ -54,10 +54,8 @@
This package contains the MATE policy kit authentication agent.
Package: mate-polkit-common
-Architecture: any
-Multi-Arch: foreign
+Architecture: all
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 -Nru mate-polkit-1.26.1/debian/copyright
mate-polkit-1.26.1/debian/copyright
--- mate-polkit-1.26.1/debian/copyright 2021-12-11 02:22:47.000000000 +0100
+++ mate-polkit-1.26.1/debian/copyright 2023-04-25 15:20:35.000000000 +0200
@@ -113,8 +113,8 @@
License: public-domain
Files: debian/*
-Copyright: 2011-2014 Stefano Karapetsas <stef...@karapetsas.com>
- 2014 Mike Gabriel <sunwea...@debian.org>
+Copyright: 2011-2014, Stefano Karapetsas <stef...@karapetsas.com>
+ 2014-2023, Mike Gabriel <sunwea...@debian.org>
License: LGPL-2+
License: LGPL-2+
diff -Nru mate-polkit-1.26.1/debian/mate-polkit-bin.manpages
mate-polkit-1.26.1/debian/mate-polkit-bin.manpages
--- mate-polkit-1.26.1/debian/mate-polkit-bin.manpages 1970-01-01
01:00:00.000000000 +0100
+++ mate-polkit-1.26.1/debian/mate-polkit-bin.manpages 2023-04-25
14:57:11.000000000 +0200
@@ -0,0 +1 @@
+debian/man/mate-polkit.1
diff -Nru mate-polkit-1.26.1/debian/mate-polkit.install
mate-polkit-1.26.1/debian/mate-polkit.install
--- mate-polkit-1.26.1/debian/mate-polkit.install 2014-12-11
07:06:25.000000000 +0100
+++ mate-polkit-1.26.1/debian/mate-polkit.install 2023-04-25
14:57:11.000000000 +0200
@@ -1 +1 @@
-usr/lib/*/polkit-mate/
+usr/libexec/
diff -Nru mate-polkit-1.26.1/debian/mate-polkit.manpages
mate-polkit-1.26.1/debian/mate-polkit.manpages
--- mate-polkit-1.26.1/debian/mate-polkit.manpages 2016-04-18
01:49:18.000000000 +0200
+++ mate-polkit-1.26.1/debian/mate-polkit.manpages 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/man/mate-polkit.1
diff -Nru mate-polkit-1.26.1/debian/rules mate-polkit-1.26.1/debian/rules
--- mate-polkit-1.26.1/debian/rules 2019-09-09 22:08:17.000000000 +0200
+++ mate-polkit-1.26.1/debian/rules 2023-04-25 15:12:05.000000000 +0200
@@ -17,11 +17,10 @@
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 @@
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=..
