Merge lp:~saviq/libhybris/ubuntu-multiarch into lp:libhybris/ubuntu

Proposed by Michał Sawicz on 2013-10-11
Status: Needs review
Proposed branch: lp:~saviq/libhybris/ubuntu-multiarch
Merge into: lp:libhybris/ubuntu
Diff against target: 91 lines (+11/-0)
1 file modified
debian/control (+11/-0)
To merge this branch: bzr merge lp:~saviq/libhybris/ubuntu-multiarch
Reviewer Review Type Date Requested Status
Steve Langasek 2013-10-11 Approve on 2013-10-11
Review via email: mp+190773@code.launchpad.net

Commit message

Add Multi-Arch: fields in debian/control where applicable.

To post a comment you must log in.
Steve Langasek (vorlon) wrote :

LGTM.

review: Approve

Unmerged revisions

90. By Steve Langasek on 2013-10-11

Add Multi-Arch: fields in debian/control where applicable.

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-09-10 19:05:33 +0000
3+++ debian/control 2013-10-11 22:49:05 +0000
4@@ -16,6 +16,7 @@
5 Package: android-platform-headers
6 Section: libdevel
7 Architecture: all
8+Multi-Arch: foreign
9 Depends: ${misc:Depends}
10 Replaces: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
11 Breaks: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
12@@ -32,6 +33,7 @@
13
14 Package: libandroid-properties1
15 Architecture: armhf i386 amd64
16+Multi-Arch: same
17 Depends: ${shlibs:Depends},
18 ${misc:Depends}
19 Description: Library to provide access to get, set and list Android properties
20@@ -42,6 +44,7 @@
21 Package: libandroid-properties-dev
22 Section: libdevel
23 Architecture: armhf i386 amd64
24+Multi-Arch: same
25 Depends: libandroid-properties1 (= ${binary:Version}),
26 ${misc:Depends}
27 Description: Development headers files for libandroid-properties
28@@ -50,6 +53,7 @@
29
30 Package: libmedia1
31 Architecture: armhf i386 amd64
32+Multi-Arch: same
33 Depends: ${shlibs:Depends},
34 ${misc:Depends}
35 Replaces: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu24)
36@@ -65,6 +69,7 @@
37 Package: libmedia-dev
38 Section: libdevel
39 Architecture: armhf i386 amd64
40+Multi-Arch: same
41 Depends: libmedia1 (= ${binary:Version}),
42 android-platform-headers (= ${source:Version}),
43 ${misc:Depends}
44@@ -79,6 +84,7 @@
45
46 Package: libhardware2
47 Architecture: armhf i386 amd64
48+Multi-Arch: same
49 Depends: ${shlibs:Depends},
50 ${misc:Depends}
51 Replaces: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
52@@ -94,6 +100,7 @@
53 Package: libhardware-dev
54 Section: libdevel
55 Architecture: armhf i386 amd64
56+Multi-Arch: same
57 Depends: libhardware2 (= ${binary:Version}),
58 android-platform-headers (= ${source:Version}),
59 ${misc:Depends}
60@@ -109,6 +116,7 @@
61
62 Package: libhybris-common1
63 Architecture: armhf i386 amd64
64+Multi-Arch: same
65 Depends: ${shlibs:Depends},
66 ${misc:Depends}
67 Replaces: libhybris (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
68@@ -123,6 +131,7 @@
69 Package: libhybris-common-dev
70 Section: libdevel
71 Architecture: armhf i386 amd64
72+Multi-Arch: same
73 Depends: libhybris-common1 (= ${binary:Version}),
74 ${misc:Depends}
75 Replaces: libhybris-dev (<< 0.1.0+git20130606+c5d897a-0ubuntu13)
76@@ -137,6 +146,7 @@
77
78 Package: libhybris
79 Architecture: armhf i386 amd64
80+Multi-Arch: same
81 Depends: libandroid-properties1 (= ${binary:Version}),
82 libhardware2,
83 libmedia1,
84@@ -149,6 +159,7 @@
85 Package: libhybris-dev
86 Section: libdevel
87 Architecture: armhf i386 amd64
88+Multi-Arch: same
89 Depends: libhybris (= ${binary:Version}),
90 android-platform-headers (= ${source:Version}),
91 libandroid-properties-dev (= ${binary:Version}),

Subscribers

People subscribed via source and target branches