From fa9d0d1b05fda00b8babe5d190db94f4ca75a64c Mon Sep 17 00:00:00 2001
From: Thomas Uhle <thomas.uhle@mailbox.tu-dresden.de>
Date: Tue, 25 Apr 2023 14:54:32 +0200
Subject: [PATCH] debian/: Move polkit-agent executable to /usr/libexec
 directory. Move man page into mate-polkit-bin bin:pkg. (Closes: #1006996).

---
 debian/bin/mate-polkit                                 |  3 +++
 debian/bin/mate-polkit.in                              |  3 ---
 debian/control                                         | 10 ++++------
 .../{mate-polkit.manpages => mate-polkit-bin.manpages} |  0
 debian/mate-polkit.install                             |  2 +-
 debian/rules                                           |  4 ++--
 6 files changed, 10 insertions(+), 12 deletions(-)
 create mode 100755 debian/bin/mate-polkit
 delete mode 100755 debian/bin/mate-polkit.in
 rename debian/{mate-polkit.manpages => mate-polkit-bin.manpages} (100%)

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..1ac55c0 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Package: mate-polkit-bin
 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,9 +41,8 @@ Description: MATE authentication agent for PolicyKit-1 (executable wrapper scrip
 
 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 +54,8 @@ Description: MATE authentication agent for PolicyKit-1
  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 --git a/debian/mate-polkit.manpages b/debian/mate-polkit-bin.manpages
similarity index 100%
rename from debian/mate-polkit.manpages
rename to debian/mate-polkit-bin.manpages
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/rules b/debian/rules
index bceb5d7..ec24d59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --disable-silent-rules \
                              --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 +35,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=..