Merge lp:~osomon/libappindicator/multiarch into lp:libappindicator/16.10

[Olivier Tilloy]

Make the packages multi-arch aware.

[Olivier Tilloy (osomon)]

Please note that bug #1757204 prevents the resulting packages from installing, as libindicator itself needs to be made multi-arch aware.

[lp:~osomon/libappindicator/multiarch]

289. By Olivier Tilloy on 2018-03-22

Merge the latest changes from lp:libappindicator.

290. By Olivier Tilloy on 2018-03-22

Add a changelog entry.

Unmerged revisions

290. By Olivier Tilloy on 2018-03-22

Add a changelog entry.

289. By Olivier Tilloy on 2018-03-22

Merge the latest changes from lp:libappindicator.

288. By Olivier Tilloy on 2018-03-20

Make the packages multi-arch aware.

287. By Olivier Tilloy on 2018-03-20

Remove deprecated flag to gtkdoc-scan (--nogtkinit).

286. By Olivier Tilloy on 2018-03-20

Fix build failure on bionic [-Werror=incompatible-pointer-types].

285. By Olivier Tilloy on 2018-03-20

Update Vcs-Bzr and Vcs-Browser to point to the most recent branch.

284. By Didier Roche-Tolomelli on 2017-07-19

releasing package libappindicator version 12.10.1+17.04.20170215-0ubuntu2

283. By Didier Roche-Tolomelli on 2017-07-19

* debian/control:
  - Downgrade libappindicator* recommending the indicator-application
    service to suggests. Only some sessions wants it, while we still
    link against the lib in multiple apps.

282. By CI Train Bot Account on 2017-02-15

Releasing 12.10.1+17.04.20170215-0ubuntu1

281. By Marco Trevisan (Treviño) on 2017-02-15

app-indicator: don't append the snap prefix if the icon is saved in a well known readable path

=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
--- bindings/mono/appindicator-sharp-0.1.pc.in	2013-04-16 14:19:08 +0000
+++ bindings/mono/appindicator-sharp-0.1.pc.in	2018-03-22 14:46:22 +0000
@@ -1,6 +1,5 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
 assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
 
 Name: appindicator-sharp

=== modified file 'debian/changelog'
--- debian/changelog	2018-03-22 01:16:11 +0000
+++ debian/changelog	2018-03-22 14:46:22 +0000
@@ -1,3 +1,9 @@
+libappindicator (12.10.1+18.04.20180322.2-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Make the packages multi-arch aware (LP: #1081938)
+
+ -- Olivier Tilloy <[e-mail]>  Thu, 22 Mar 2018 15:44:31 +0100
+
 libappindicator (12.10.1+18.04.20180322.1-0ubuntu1) bionic; urgency=medium
 
   [ Unit 193 ]

=== modified file 'debian/control'
--- debian/control	2018-03-22 00:51:30 +0000
+++ debian/control	2018-03-22 14:46:22 +0000
@@ -56,7 +56,6 @@
 Package: libappindicator1
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support,
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Suggests: indicator-application (>= 0.2.93),
@@ -105,7 +104,7 @@
 Package: libappindicator3-1
 Section: libs
 Architecture: any
-Pre-Depends: multiarch-support,
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
 Suggests: indicator-application (>= 0.2.93),
@@ -118,6 +117,7 @@
 Package: libappindicator3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gir1.2-appindicator3-0.1 (= ${binary:Version}),
@@ -134,6 +134,7 @@
 Package: gir1.2-appindicator3-0.1
 Section: introspection
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
          ${gir:Depends},
 Description: Typelib files for libappindicator3-1.

=== modified file 'debian/gir1.2-appindicator-0.1.install'
--- debian/gir1.2-appindicator-0.1.install	2013-02-14 09:46:12 +0000
+++ debian/gir1.2-appindicator-0.1.install	2018-03-22 14:46:22 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib

=== modified file 'debian/gir1.2-appindicator3-0.1.install'
--- debian/gir1.2-appindicator3-0.1.install	2013-02-14 09:46:12 +0000
+++ debian/gir1.2-appindicator3-0.1.install	2018-03-22 14:46:22 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib