libappindicator

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

  1. multiarch
  2. Merge into trunk.16.10
Proposed by Olivier Tilloy
Status: Needs review
Proposed branch: lp:~osomon/libappindicator/multiarch
Merge into: lp:libappindicator/16.10
Prerequisite: lp:~osomon/libappindicator/bionic-ftbfs-fix
Diff against target: 75 lines (+11/-5)
5 files modified
bindings/mono/appindicator-sharp-0.1.pc.in (+0/-1)
debian/changelog (+6/-0)
debian/control (+3/-2)
debian/gir1.2-appindicator-0.1.install (+1/-1)
debian/gir1.2-appindicator3-0.1.install (+1/-1)
To merge this branch: bzr merge lp:~osomon/libappindicator/multiarch
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+341750@code.launchpad.net

Commit message

Make the packages multi-arch aware.

To post a comment you must log in.
Revision history for this message
Olivier Tilloy (osomon) wrote :

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

Reply
lp:~osomon/libappindicator/multiarch updated
289. By Olivier Tilloy

Merge the latest changes from lp:libappindicator.

290. By Olivier Tilloy

Add a changelog entry.

Unmerged revisions

290. By Olivier Tilloy

Add a changelog entry.

289. By Olivier Tilloy

Merge the latest changes from lp:libappindicator.

288. By Olivier Tilloy

Make the packages multi-arch aware.

287. By Olivier Tilloy

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

286. By Olivier Tilloy

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

285. By Olivier Tilloy

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

284. By Didier Roche-Tolomelli

releasing package libappindicator version 12.10.1+17.04.20170215-0ubuntu2

283. By Didier Roche-Tolomelli

* 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

Releasing 12.10.1+17.04.20170215-0ubuntu1

281. By Marco Trevisan (Treviño)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1prefix=@prefix@1prefix=@prefix@
2exec_prefix=@exec_prefix@2exec_prefix=@exec_prefix@
3libdir=@libdir@
4assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.13assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
54
6Name: appindicator-sharp5Name: appindicator-sharp
76
=== 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 @@
1libappindicator (12.10.1+18.04.20180322.2-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Make the packages multi-arch aware (LP: #1081938)
4
5 -- Olivier Tilloy <olivier.tilloy@canonical.com> Thu, 22 Mar 2018 15:44:31 +0100
6
1libappindicator (12.10.1+18.04.20180322.1-0ubuntu1) bionic; urgency=medium7libappindicator (12.10.1+18.04.20180322.1-0ubuntu1) bionic; urgency=medium
28
3 [ Unit 193 ]9 [ Unit 193 ]
410
=== 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 @@
56Package: libappindicator156Package: libappindicator1
57Section: libs57Section: libs
58Architecture: any58Architecture: any
59Pre-Depends: multiarch-support,
60Depends: ${shlibs:Depends},59Depends: ${shlibs:Depends},
61 ${misc:Depends},60 ${misc:Depends},
62Suggests: indicator-application (>= 0.2.93),61Suggests: indicator-application (>= 0.2.93),
@@ -105,7 +104,7 @@
105Package: libappindicator3-1104Package: libappindicator3-1
106Section: libs105Section: libs
107Architecture: any106Architecture: any
108Pre-Depends: multiarch-support,107Multi-Arch: same
109Depends: ${shlibs:Depends},108Depends: ${shlibs:Depends},
110 ${misc:Depends},109 ${misc:Depends},
111Suggests: indicator-application (>= 0.2.93),110Suggests: indicator-application (>= 0.2.93),
@@ -118,6 +117,7 @@
118Package: libappindicator3-dev117Package: libappindicator3-dev
119Section: libdevel118Section: libdevel
120Architecture: any119Architecture: any
120Multi-Arch: same
121Depends: ${shlibs:Depends},121Depends: ${shlibs:Depends},
122 ${misc:Depends},122 ${misc:Depends},
123 gir1.2-appindicator3-0.1 (= ${binary:Version}),123 gir1.2-appindicator3-0.1 (= ${binary:Version}),
@@ -134,6 +134,7 @@
134Package: gir1.2-appindicator3-0.1134Package: gir1.2-appindicator3-0.1
135Section: introspection135Section: introspection
136Architecture: any136Architecture: any
137Multi-Arch: same
137Depends: ${misc:Depends},138Depends: ${misc:Depends},
138 ${gir:Depends},139 ${gir:Depends},
139Description: Typelib files for libappindicator3-1.140Description: Typelib files for libappindicator3-1.
140141
=== 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 @@
1usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib usr/lib/girepository-1.01usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib
22
=== 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 @@
1usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib usr/lib/girepository-1.01usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib

Subscribers

People subscribed via source and target branches