Merge lp:~mariusko/modemmanager/ubuntu-0.7 into lp:~modemmanager/modemmanager/ubuntu

Proposed by Marius B. Kotsbak
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 191
Merged at revision: 186
Proposed branch: lp:~mariusko/modemmanager/ubuntu-0.7
Merge into: lp:~modemmanager/modemmanager/ubuntu
Diff against target: 245 lines (+95/-23)
10 files modified
debian/changelog (+13/-0)
debian/control (+58/-4)
debian/libmm-glib-doc.install (+1/-0)
debian/modemmanager-dev.install (+2/-0)
debian/modemmanager-doc.install (+1/-0)
debian/modemmanager.install (+4/-3)
debian/patches/arduino-blacklist.patch (+4/-4)
debian/patches/linux-default-usb-id.patch (+4/-4)
debian/patches/lp700316_usb_blacklist.patch (+6/-6)
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~mariusko/modemmanager/ubuntu-0.7
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+153481@code.launchpad.net
To post a comment you must log in.
lp:~mariusko/modemmanager/ubuntu-0.7 updated
191. By Marius B. Kotsbak

Merge ubuntu branch.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve, I'm merging this now.

review: Approve
Revision history for this message
Marius B. Kotsbak (mariusko) wrote :

Dia build dependency is removed upstream now, just not yet in any releases.

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 2013-03-12 20:52:52 +0000
3+++ debian/changelog 2013-03-15 11:19:23 +0000
4@@ -1,5 +1,7 @@
5+
6 modemmanager (0.7.990-0ubuntu1) UNRELEASED; urgency=low
7
8+ [ Mathieu Trudel-Lapierre ]
9 * New upstream release.
10 * debian/patches/handle_data07_capabilities_probing.patch,
11 debian/patches/git_skip_add_utf8_check_219424a.patch,
12@@ -35,6 +37,17 @@
13 * debian/ubuntu/modemmanager.upstart: fix the name for the ModemManager
14 binary, since it was changed upstream.
15
16+ [ Marius B. Kotsbak ]
17+ * Added binary packages modemmanager-doc and libmm-glib-doc for gtk-docs.
18+ * Split out modemmanager-dev package containing header files and .pc file.
19+ - add dependency on modemmanager-dev from libmm-glib-dev
20+ as stated in "mm-glib.pc"
21+ - add proper replaces/breaks for modemmanager-dev because of moved files
22+ * Build-depends: added "dia" added for generating gtk-doc,
23+ and "libglib2.0-doc" for the cross references in the doc to work.
24+ * debian/rules: make dh_makeshlibs override multiarch aware.
25+ * Update standards version to current 3.9.4.
26+
27 -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 17 Jan 2013 15:20:23 -0500
28
29 modemmanager (0.6.0.0.really-0ubuntu3) raring; urgency=low
30
31=== modified file 'debian/control'
32--- debian/control 2013-01-17 21:33:03 +0000
33+++ debian/control 2013-03-15 11:19:23 +0000
34@@ -12,7 +12,9 @@
35 libglib2.0-dev (>= 2.30.2),
36 libgudev-1.0-dev (>= 147),
37 libqmi-glib-dev,
38-Standards-Version: 3.9.2
39+ dia,
40+ libglib2.0-doc
41+Standards-Version: 3.9.4
42 Vcs-Bzr: https://code.launchpad.net/~modemmanager/modemmanager/ubuntu
43
44 Package: modemmanager
45@@ -44,13 +46,48 @@
46 .
47 This package contains debugging symbols for ModemManager.
48
49+Package: modemmanager-dev
50+Section: libdevel
51+Architecture: any
52+Priority: extra
53+Depends: ${misc:Depends}
54+Replaces: modemmanager (<< 0.7.990)
55+Breaks: modemmanager (<< 0.7.990)
56+Suggests: modemmanager-doc
57+Description: D-Bus service for managing modems - development files
58+ Provides a D-Bus interface to communicate with mobile broadband (GSM, CDMA,
59+ UMTS, ...) cards. Implements a loadable plugin interface to add work-arounds
60+ for non standard devices. Also provides patches to use networkmanager (and
61+ the applet) with modem manager.
62+ .
63+ Git Repository: http://cgit.freedesktop.org/ModemManager/ModemManager/
64+ .
65+ This package contains header files for ModemManager.
66+
67+Package: modemmanager-doc
68+Section: doc
69+Architecture: all
70+Priority: extra
71+Depends: ${misc:Depends}
72+Suggests: devhelp
73+Description: D-Bus service for managing modems - development files
74+ Provides a D-Bus interface to communicate with mobile broadband (GSM, CDMA,
75+ UMTS, ...) cards. Implements a loadable plugin interface to add work-arounds
76+ for non standard devices. Also provides patches to use networkmanager (and
77+ the applet) with modem manager.
78+ .
79+ Git Repository: http://cgit.freedesktop.org/ModemManager/ModemManager/
80+ .
81+ This package contains documenation of the d-bus protocol to interface
82+ ModemManager.
83+
84 Package: libmm-glib0
85 Architecture: any
86 Section: libs
87 Pre-Depends: multiarch-support
88-Depends: modemmanager,
89- ${shlibs:Depends},
90+Depends: ${shlibs:Depends},
91 ${misc:Depends}
92+Recommends: modemmanager (>= ${binary:Version})
93 Description: D-Bus service for managing modems - shared libraries
94 Provides a D-Bus interface to communicate with mobile broadband (GSM, CDMA,
95 UMTS, ...) cards. Implements a loadable plugin interface to add work-arounds
96@@ -65,9 +102,10 @@
97 Package: libmm-glib-dev
98 Architecture: any
99 Section: libdevel
100-Depends: libmm-glib0 (= ${binary:Version}),
101+Depends: libmm-glib0 (= ${binary:Version}), modemmanager-dev
102 ${shlibs:Depends},
103 ${misc:Depends}
104+Suggests: libmm-glib-doc
105 Description: D-Bus service for managing modems - development files
106 Provides a D-Bus interface to communicate with mobile broadband (GSM, CDMA,
107 UMTS, ...) cards. Implements a loadable plugin interface to add work-arounds
108@@ -78,3 +116,19 @@
109 .
110 This package contains development files to use when writing applications that
111 interface with ModemManager.
112+
113+Package: libmm-glib-doc
114+Architecture: all
115+Section: doc
116+Depends: ${misc:Depends}
117+Suggests: devhelp
118+Description: D-Bus service for managing modems - development files
119+ Provides a D-Bus interface to communicate with mobile broadband (GSM, CDMA,
120+ UMTS, ...) cards. Implements a loadable plugin interface to add work-arounds
121+ for non standard devices. Also provides patches to use networkmanager (and
122+ the applet) with modem manager.
123+ .
124+ Git Repository: http://cgit.freedesktop.org/ModemManager/ModemManager/
125+ .
126+ This package contains documentation of libmm-glib to use when writing
127+ applications that interface with ModemManager.
128
129=== added file 'debian/libmm-glib-doc.install'
130--- debian/libmm-glib-doc.install 1970-01-01 00:00:00 +0000
131+++ debian/libmm-glib-doc.install 2013-03-15 11:19:23 +0000
132@@ -0,0 +1,1 @@
133+usr/share/gtk-doc/html/libmm-glib
134\ No newline at end of file
135
136=== added file 'debian/modemmanager-dev.install'
137--- debian/modemmanager-dev.install 1970-01-01 00:00:00 +0000
138+++ debian/modemmanager-dev.install 2013-03-15 11:19:23 +0000
139@@ -0,0 +1,2 @@
140+usr/include/ModemManager
141+usr/lib/*/pkgconfig/ModemManager.pc
142\ No newline at end of file
143
144=== added file 'debian/modemmanager-doc.install'
145--- debian/modemmanager-doc.install 1970-01-01 00:00:00 +0000
146+++ debian/modemmanager-doc.install 2013-03-15 11:19:23 +0000
147@@ -0,0 +1,1 @@
148+usr/share/gtk-doc/html/ModemManager
149
150=== modified file 'debian/modemmanager.install'
151--- debian/modemmanager.install 2013-03-12 19:39:41 +0000
152+++ debian/modemmanager.install 2013-03-15 11:19:23 +0000
153@@ -2,7 +2,8 @@
154 lib
155 usr/bin
156 usr/sbin
157-usr/share
158+usr/bin
159+usr/share/dbus-1
160+usr/share/icons
161+usr/share/man
162 usr/lib/*/ModemManager
163-usr/lib/*/pkgconfig/ModemManager.pc
164-usr/include/ModemManager
165
166=== modified file 'debian/patches/arduino-blacklist.patch'
167--- debian/patches/arduino-blacklist.patch 2013-01-17 20:38:37 +0000
168+++ debian/patches/arduino-blacklist.patch 2013-03-15 11:19:23 +0000
169@@ -2,11 +2,11 @@
170 src/77-mm-usb-device-blacklist.rules | 5 +++++
171 1 file changed, 5 insertions(+)
172
173-Index: b/src/77-mm-usb-device-blacklist.rules
174+Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
175 ===================================================================
176---- a/src/77-mm-usb-device-blacklist.rules
177-+++ b/src/77-mm-usb-device-blacklist.rules
178-@@ -89,4 +89,9 @@ ATTRS{idVendor}=="10c4", ATTRS{idProduct
179+--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:21.866210414 +0100
180++++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:21.802210413 +0100
181+@@ -88,4 +88,9 @@
182 # QinHeng Electronics HL-340
183 ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", ENV{ID_MM_DEVICE_IGNORE}="1"
184
185
186=== modified file 'debian/patches/linux-default-usb-id.patch'
187--- debian/patches/linux-default-usb-id.patch 2013-03-12 18:44:59 +0000
188+++ debian/patches/linux-default-usb-id.patch 2013-03-15 11:19:23 +0000
189@@ -2,11 +2,11 @@
190 src/77-mm-usb-device-blacklist.rules | 3 +++
191 1 file changed, 3 insertions(+)
192
193-Index: b/src/77-mm-usb-device-blacklist.rules
194+Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
195 ===================================================================
196---- a/src/77-mm-usb-device-blacklist.rules
197-+++ b/src/77-mm-usb-device-blacklist.rules
198-@@ -88,4 +88,7 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct
199+--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:34.282210727 +0100
200++++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:34.226210727 +0100
201+@@ -93,4 +93,7 @@
202 ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="204b", ENV{ID_MM_DEVICE_IGNORE}="1"
203 ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"
204
205
206=== modified file 'debian/patches/lp700316_usb_blacklist.patch'
207--- debian/patches/lp700316_usb_blacklist.patch 2013-03-12 18:57:35 +0000
208+++ debian/patches/lp700316_usb_blacklist.patch 2013-03-15 11:19:23 +0000
209@@ -2,13 +2,13 @@
210 src/77-mm-usb-device-blacklist.rules | 9 +++++++++
211 1 file changed, 9 insertions(+)
212
213-Index: b/src/77-mm-usb-device-blacklist.rules
214+Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
215 ===================================================================
216---- a/src/77-mm-usb-device-blacklist.rules
217-+++ b/src/77-mm-usb-device-blacklist.rules
218-@@ -74,4 +74,13 @@ ATTRS{idVendor}=="9e88", ATTRS{idProduct
219- # Atmel Corp at91sam SAMBA bootloader
220- ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", ENV{ID_MM_DEVICE_IGNORE}="1"
221+--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:08.834210083 +0100
222++++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:08.782210083 +0100
223+@@ -79,4 +79,13 @@
224+ ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="814b", ENV{ID_MM_DEVICE_IGNORE}="1"
225+ ATTRS{idVendor}=="2405", ATTRS{idProduct}=="0003", ENV{ID_MM_DEVICE_IGNORE}="1"
226
227 +# Prolific Technology, Inc. PL2303 Serial Port
228 +ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", ENV{ID_MM_DEVICE_IGNORE}="1"
229
230=== modified file 'debian/rules'
231--- debian/rules 2013-03-12 19:40:42 +0000
232+++ debian/rules 2013-03-15 11:19:23 +0000
233@@ -24,10 +24,10 @@
234
235 override_dh_auto_configure:
236 dh_auto_configure -- \
237- --with-tests
238+ --with-tests --with-docs
239
240 override_dh_makeshlibs:
241- dh_makeshlibs -X/usr/lib/ModemManager/ -X/usr/lib/pppd/
242+ dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/ModemManager/ -X/usr/lib/$(DEB_HOST_MULTIARCH)/pppd/
243
244 override_dh_strip:
245 dh_strip --dbg-package=modemmanager-dbg

Subscribers

People subscribed via source and target branches