Revert "Split-out mate-polkit-bin as separate bin:pkg. Resolves architecture mismatch when executing the polkit agent executable. (Closes: #1006996)."

This reverts commit 080b10c772.

debian/control

@@ -23,10 +23,10 @@ Vcs-Browser: https://salsa.debian.org/debian-mate-team/mate-polkit
 Vcs-Git: https://salsa.debian.org/debian-mate-team/mate-polkit.git
 
 Package: mate-polkit-bin
-Architecture: any
-Depends: mate-polkit (= ${binary:Version}),
+Architecture: all
+Depends: mate-polkit (>= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+Breaks: mate-polkit (<< 1.12.0-3~),
 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,8 +40,9 @@ Description: MATE authentication agent for PolicyKit-1 (executable wrapper scrip
 
 Package: mate-polkit
 Architecture: any
+Multi-Arch: same
 Depends: accountsservice,
-         mate-polkit-common (>= ${source:Version}),
+         mate-polkit-common (= ${binary:Version}),
          policykit-1,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -53,9 +54,10 @@ Description: MATE authentication agent for PolicyKit-1
  This package contains the MATE policy kit authentication agent.
 
 Package: mate-polkit-common
-Architecture: all
+Architecture: any
 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

debian/mate-polkit-common.install

@@ -1 +1,2 @@
+etc/
 usr/share/locale/

debian/mate-polkit.install

@@ -1,2 +1 @@
-etc/
 usr/lib/*/polkit-mate/