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

Proposed by Olivier Tilloy on 2018-03-22
Status: Needs review
Proposed branch: lp:~osomon/libindicator/multi-arch
Merge into: lp:libindicator
Diff against target: 58 lines (+11/-1)
2 files modified
debian/changelog (+6/-0)
debian/control (+5/-1)
To merge this branch: bzr merge lp:~osomon/libindicator/multi-arch
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2018-03-22 Pending
Review via email: mp+341908@code.launchpad.net

Commit message

Make the packages multi-arch aware.

To post a comment you must log in.

Unmerged revisions

540. By Olivier Tilloy on 2018-03-22

Make the packages multi-arch aware.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1libindicator (16.10.0+18.04.20180322-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Make the packages multi-arch aware (LP: #1757204)
4
5 -- Olivier Tilloy <olivier.tilloy@canonical.com> Thu, 22 Mar 2018 15:36:14 +0100
6
1libindicator (16.10.0+18.04.20180321.1-0ubuntu1) bionic; urgency=medium7libindicator (16.10.0+18.04.20180321.1-0ubuntu1) bionic; urgency=medium
28
3 [ Olivier Tilloy ]9 [ Olivier Tilloy ]
410
=== 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 @@
27Package: libindicator727Package: libindicator7
28Section: libs28Section: libs
29Architecture: any29Architecture: any
30Multi-Arch: same
30Depends: ${shlibs:Depends},31Depends: ${shlibs:Depends},
31 ${misc:Depends},32 ${misc:Depends},
32Description: panel indicator applet - shared library33Description: panel indicator applet - shared library
@@ -38,6 +39,7 @@
38Package: libindicator-dev39Package: libindicator-dev
39Section: libdevel40Section: libdevel
40Architecture: any41Architecture: any
42Multi-Arch: same
41Depends: ${shlibs:Depends},43Depends: ${shlibs:Depends},
42 ${misc:Depends},44 ${misc:Depends},
43 libgtk2.0-dev (>= 2.12.0),45 libgtk2.0-dev (>= 2.12.0),
@@ -51,7 +53,7 @@
51Package: libindicator3-753Package: libindicator3-7
52Section: libs54Section: libs
53Architecture: any55Architecture: any
54Pre-Depends: multiarch-support56Multi-Arch: same
55Depends: ${shlibs:Depends},57Depends: ${shlibs:Depends},
56 ${misc:Depends},58 ${misc:Depends},
57Description: panel indicator applet - shared library59Description: panel indicator applet - shared library
@@ -63,6 +65,7 @@
63Package: libindicator3-dev65Package: libindicator3-dev
64Section: libdevel66Section: libdevel
65Architecture: any67Architecture: any
68Multi-Arch: same
66Depends: ${shlibs:Depends},69Depends: ${shlibs:Depends},
67 ${misc:Depends},70 ${misc:Depends},
68 libgtk-3-dev (>= 2.91.3),71 libgtk-3-dev (>= 2.91.3),
@@ -76,6 +79,7 @@
76Package: libindicator3-tools79Package: libindicator3-tools
77Section: devel80Section: devel
78Architecture: any81Architecture: any
82Multi-Arch: same
79Depends: ${shlibs:Depends},83Depends: ${shlibs:Depends},
80 ${misc:Depends},84 ${misc:Depends},
81 libindicator3-7 (= ${binary:Version}),85 libindicator3-7 (= ${binary:Version}),

Subscribers

People subscribed via source and target branches