Merge lp:~cjwatson/libfriends/multiarch into lp:libfriends

Proposed by Colin Watson
Status: Merged
Approved by: Ken VanDine
Approved revision: 81
Merged at revision: 81
Proposed branch: lp:~cjwatson/libfriends/multiarch
Merge into: lp:libfriends
Diff against target: 35 lines (+4/-0)
1 file modified
debian/control (+4/-0)
To merge this branch: bzr merge lp:~cjwatson/libfriends/multiarch
Reviewer Review Type Date Requested Status
Ken VanDine Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+194355@code.launchpad.net

Commit message

Mark library packages as Multi-Arch: same.

Description of the change

libfriends seems to have done most of the legwork to handle multiarch, except for actually declaring the Multi-Arch: same field. Do so. (Note that gir1.2-friends-* can't currently be either Multi-Arch: same or foreign, because they put files with architecture-dependent interfaces in the same path across architectures with different contents.)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/libfriends-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libfriends-trusty-amd64-ci/3

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/libfriends-ci/6/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2013-10-25 09:40:18 +0000
3+++ debian/control 2013-11-07 14:50:45 +0000
4@@ -35,6 +35,7 @@
5 Package: libfriends-dev
6 Section: libdevel
7 Architecture: any
8+Multi-Arch: same
9 Depends: gir1.2-friends-0.1, libfriends0 (= ${binary:Version}), ${misc:Depends}
10 Description: Development files for accessing social networks
11 libfriends provides a library for accessing social networks via
12@@ -45,6 +46,7 @@
13 Package: libfriends0
14 Section: libs
15 Architecture: any
16+Multi-Arch: same
17 Pre-Depends: ${misc:Pre-Depends}
18 Depends: friends-dispatcher, ${misc:Depends}, ${shlibs:Depends}
19 Description: Provides an API for accessing social networks
20@@ -56,6 +58,7 @@
21 Package: libfriends-gtk0
22 Section: libs
23 Architecture: any
24+Multi-Arch: same
25 Pre-Depends: ${misc:Pre-Depends}
26 Depends: ${misc:Depends}, ${shlibs:Depends}
27 Description: Friends GTK Widgets
28@@ -67,6 +70,7 @@
29 Package: libfriends-gtk-dev
30 Section: libdevel
31 Architecture: any
32+Multi-Arch: same
33 Depends: gir1.2-friends-gtk-0.1 (= ${binary:Version}),
34 libfriends-dev (= ${binary:Version}),
35 libfriends-gtk0 (= ${binary:Version}),

Subscribers

People subscribed via source and target branches

to all changes: