Merge lp:~osomon/libindicator/multi-arch into lp:libindicator

[Olivier Tilloy]

Make the packages multi-arch aware.

Unmerged revisions

540. By Olivier Tilloy on 2018-03-22

Make the packages multi-arch aware.

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-21 17:40:06 +0000
+++ debian/changelog	2018-03-22 14:40:22 +0000
@@ -1,3 +1,9 @@
+libindicator (16.10.0+18.04.20180322-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Make the packages multi-arch aware (LP: #1757204)
+
+ -- Olivier Tilloy <[e-mail]>  Thu, 22 Mar 2018 15:36:14 +0100
+
 libindicator (16.10.0+18.04.20180321.1-0ubuntu1) bionic; urgency=medium
 
   [ Olivier Tilloy ]
 
=== modified file 'debian/control'
--- debian/control	2017-12-05 05:56:26 +0000
+++ debian/control	2018-03-22 14:40:22 +0000
@@ -27,6 +27,7 @@
 Package: libindicator7
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Description: panel indicator applet - shared library
@@ -38,6 +39,7 @@
 Package: libindicator-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtk2.0-dev (>= 2.12.0),
@@ -51,7 +53,7 @@
 Package: libindicator3-7
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Description: panel indicator applet - shared library
@@ -63,6 +65,7 @@
 Package: libindicator3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtk-3-dev (>= 2.91.3),
@@ -76,6 +79,7 @@
 Package: libindicator3-tools
 Section: devel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libindicator3-7 (= ${binary:Version}),