Bug#1006996: mate-polkit: On arm64 architecture mate-polkit tries to open an amd64 file and fails

[Thomas Uhle <thomas.uhle@mailbox.tu-dresden.de>]

On Fri, 18 Nov 2022, Mike Gabriel wrote:

> Hi Thomas, dear DD colleagues (et al.),
>
> [...]
>
> The change-over of the XDG autostart file from common:pkg mate-polkit-common 
> to bin:pkg mate-polkit is not as simple as it seems.
>
> [...]


Hello Mike,

you are absolutely right.  I had forgotten to add appropriate Breaks and 
Replaces to debian/control as well as mate-polkit-common.maintscript with 
a corresponding rm_conffile line.  I have updated the patch accordingly 
and assumed that the next version would be '1.26.1-2'.

Cheers,

Thomas

diff --git a/debian/control b/debian/control
index e1ccb8c..59566ae 100644
--- a/debian/control
+++ b/debian/control
@@ -23,10 +23,12 @@
 Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-polkit.git
 
 Package: mate-polkit-bin
-Architecture: all
-Depends: mate-polkit (>= ${source:Version}),
+Architecture: any
+Depends: mate-polkit (= ${binary:Version}),
          ${misc:Depends},
+         ${shlibs: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,13 +42,14 @@
 
 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},
 Provides: polkit-1-auth-agent,
+Breaks: mate-polkit-common (<< 1.26.1-2~),
+Replaces: mate-polkit-common (<< 1.26.1-2~),
 Description: MATE authentication agent for PolicyKit-1
  The mate-polkit package provides a D-Bus session bus service that is used to
  bring up authentication dialogs used for obtaining privileges.
@@ -54,10 +57,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-common.install b/debian/mate-polkit-common.install
index 7034e54..2568e1f 100644
--- a/debian/mate-polkit-common.install
+++ b/debian/mate-polkit-common.install
@@ -1,2 +1 @@
-etc/
 usr/share/locale/
diff --git a/debian/mate-polkit-common.maintscript b/debian/mate-polkit-common.maintscript
new file mode 100644
index 0000000..e43ea94
--- /dev/null
+++ b/debian/mate-polkit-common.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/polkit-mate-authentication-agent-1.desktop 1.26.1-2~
diff --git a/debian/mate-polkit.install b/debian/mate-polkit.install
index b0bfa1a..3d97aa9 100644
--- a/debian/mate-polkit.install
+++ b/debian/mate-polkit.install
@@ -1 +1,2 @@
+etc/
 usr/lib/*/polkit-mate/
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