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

Proposed by Olivier Tilloy on 2018-03-20
Status: Needs review
Proposed branch: lp:~osomon/libappindicator/multiarch
Merge into: lp:libappindicator
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 2018-03-20 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.
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.

lp:~osomon/libappindicator/multiarch updated on 2018-03-22
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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
2--- bindings/mono/appindicator-sharp-0.1.pc.in 2013-04-16 14:19:08 +0000
3+++ bindings/mono/appindicator-sharp-0.1.pc.in 2018-03-22 14:46:22 +0000
4@@ -1,6 +1,5 @@
5 prefix=@prefix@
6 exec_prefix=@exec_prefix@
7-libdir=@libdir@
8 assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
9
10 Name: appindicator-sharp
11
12=== modified file 'debian/changelog'
13--- debian/changelog 2018-03-22 01:16:11 +0000
14+++ debian/changelog 2018-03-22 14:46:22 +0000
15@@ -1,3 +1,9 @@
16+libappindicator (12.10.1+18.04.20180322.2-0ubuntu1) UNRELEASED; urgency=medium
17+
18+ * Make the packages multi-arch aware (LP: #1081938)
19+
20+ -- Olivier Tilloy <olivier.tilloy@canonical.com> Thu, 22 Mar 2018 15:44:31 +0100
21+
22 libappindicator (12.10.1+18.04.20180322.1-0ubuntu1) bionic; urgency=medium
23
24 [ Unit 193 ]
25
26=== modified file 'debian/control'
27--- debian/control 2018-03-22 00:51:30 +0000
28+++ debian/control 2018-03-22 14:46:22 +0000
29@@ -56,7 +56,6 @@
30 Package: libappindicator1
31 Section: libs
32 Architecture: any
33-Pre-Depends: multiarch-support,
34 Depends: ${shlibs:Depends},
35 ${misc:Depends},
36 Suggests: indicator-application (>= 0.2.93),
37@@ -105,7 +104,7 @@
38 Package: libappindicator3-1
39 Section: libs
40 Architecture: any
41-Pre-Depends: multiarch-support,
42+Multi-Arch: same
43 Depends: ${shlibs:Depends},
44 ${misc:Depends},
45 Suggests: indicator-application (>= 0.2.93),
46@@ -118,6 +117,7 @@
47 Package: libappindicator3-dev
48 Section: libdevel
49 Architecture: any
50+Multi-Arch: same
51 Depends: ${shlibs:Depends},
52 ${misc:Depends},
53 gir1.2-appindicator3-0.1 (= ${binary:Version}),
54@@ -134,6 +134,7 @@
55 Package: gir1.2-appindicator3-0.1
56 Section: introspection
57 Architecture: any
58+Multi-Arch: same
59 Depends: ${misc:Depends},
60 ${gir:Depends},
61 Description: Typelib files for libappindicator3-1.
62
63=== modified file 'debian/gir1.2-appindicator-0.1.install'
64--- debian/gir1.2-appindicator-0.1.install 2013-02-14 09:46:12 +0000
65+++ debian/gir1.2-appindicator-0.1.install 2018-03-22 14:46:22 +0000
66@@ -1,1 +1,1 @@
67-usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib usr/lib/girepository-1.0
68+usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib
69
70=== modified file 'debian/gir1.2-appindicator3-0.1.install'
71--- debian/gir1.2-appindicator3-0.1.install 2013-02-14 09:46:12 +0000
72+++ debian/gir1.2-appindicator3-0.1.install 2018-03-22 14:46:22 +0000
73@@ -1,1 +1,1 @@
74-usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib usr/lib/girepository-1.0
75+usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib

Subscribers

People subscribed via source and target branches