Online Accounts: GNOME Control Center

Merge lp:~mardy/gnome-control-center-signon/multi-arch into lp:gnome-control-center-signon

  1. multi-arch
  2. Merge into trunk
Proposed by Alberto Mardegan
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 182
Merged at revision: 182
Proposed branch: lp:~mardy/gnome-control-center-signon/multi-arch
Merge into: lp:gnome-control-center-signon
Diff against target: 83 lines (+18/-4)
6 files modified
debian/changelog (+6/-0)
debian/control (+3/-0)
debian/gir1.2-accountplugin-1.0.install (+1/-1)
debian/libaccount-plugin-1.0-0.install (+1/-1)
debian/libaccount-plugin-1.0-dev.install (+2/-2)
debian/rules (+5/-0)
To merge this branch: bzr merge lp:~mardy/gnome-control-center-signon/multi-arch
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Review via email: mp+284401@code.launchpad.net

Commit message

Multiarchify the library packages

Description of the change

Multiarchify the library packages

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looks good for now, +1.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-12-08 13:59:10 +0000
3+++ debian/changelog 2016-01-29 08:30:50 +0000
4@@ -1,3 +1,9 @@
5+gnome-control-center-signon (0.1.8+16.04.20151208-0ubuntu2) xenial; urgency=medium
6+
7+ * Multiarchify the library packages.
8+
9+ -- Matthias Klose <doko@ubuntu.com> Thu, 28 Jan 2016 21:26:36 +0100
10+
11 gnome-control-center-signon (0.1.8+16.04.20151208-0ubuntu1) xenial; urgency=medium
12
13 [ Alberto Mardegan ]
14
15=== modified file 'debian/control'
16--- debian/control 2014-08-14 10:19:56 +0000
17+++ debian/control 2016-01-29 08:30:50 +0000
18@@ -48,6 +48,7 @@
19 Package: libaccount-plugin-1.0-0
20 Section: libs
21 Architecture: any
22+Multi-Arch: same
23 Pre-Depends: ${misc:Pre-Depends}
24 Depends: ${misc:Depends},
25 ${shlibs:Depends},
26@@ -59,6 +60,7 @@
27 Package: libaccount-plugin-1.0-dev
28 Section: libdevel
29 Architecture: any
30+Multi-Arch: same
31 Depends: gir1.2-accountplugin-1.0,
32 libaccount-plugin-1.0-0 (= ${binary:Version}),
33 libglib2.0-dev,
34@@ -73,6 +75,7 @@
35 Package: gir1.2-accountplugin-1.0
36 Section: introspection
37 Architecture: any
38+Multi-Arch: same
39 Depends: libaccount-plugin-1.0-0 (= ${binary:Version}),
40 ${gir:Depends},
41 ${misc:Depends},
42
43=== modified file 'debian/gir1.2-accountplugin-1.0.install'
44--- debian/gir1.2-accountplugin-1.0.install 2012-12-05 16:51:29 +0000
45+++ debian/gir1.2-accountplugin-1.0.install 2016-01-29 08:30:50 +0000
46@@ -1,1 +1,1 @@
47-usr/lib/girepository-1.0
48+usr/lib/*/girepository-1.0
49
50=== modified file 'debian/libaccount-plugin-1.0-0.install'
51--- debian/libaccount-plugin-1.0-0.install 2012-12-05 16:51:29 +0000
52+++ debian/libaccount-plugin-1.0-0.install 2016-01-29 08:30:50 +0000
53@@ -1,1 +1,1 @@
54-usr/lib/libaccount-plugin-1.0.so.*
55+usr/lib/*/libaccount-plugin-1.0.so.*
56
57=== modified file 'debian/libaccount-plugin-1.0-dev.install'
58--- debian/libaccount-plugin-1.0-dev.install 2012-12-05 16:51:29 +0000
59+++ debian/libaccount-plugin-1.0-dev.install 2016-01-29 08:30:50 +0000
60@@ -1,5 +1,5 @@
61 usr/include
62-usr/lib/libaccount-plugin-1.0.so
63-usr/lib/pkgconfig
64+usr/lib/*/libaccount-plugin-1.0.so
65+usr/lib/*/pkgconfig
66 usr/share/gir-1.0
67 usr/share/vala/vapi
68
69=== modified file 'debian/rules'
70--- debian/rules 2013-07-23 10:06:47 +0000
71+++ debian/rules 2016-01-29 08:30:50 +0000
72@@ -12,6 +12,11 @@
73 override_dh_install:
74 cd tests/autopilot && \
75 python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
76+ mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
77+ mv debian/tmp/usr/lib/lib*a debian/tmp/usr/lib/lib*.so* \
78+ debian/tmp/usr/lib/girepository-1.0 debian/tmp/usr/lib/pkgconfig \
79+ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
80+
81 dh_install --fail-missing -X.la
82
83 override_dh_autoreconf:

Subscribers

People subscribed via source and target branches