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

Proposed by Marius B. Kotsbak on 2013-03-14
Status: Merged
Merged at revision: 186
Proposed branch: lp:~mariusko/modemmanager/ubuntu
Merge into: lp:~modemmanager/modemmanager/ubuntu
Diff against target: 63 lines (+14/-14)
3 files modified
debian/patches/arduino-blacklist.patch (+4/-4)
debian/patches/linux-default-usb-id.patch (+4/-4)
debian/patches/lp700316_usb_blacklist.patch (+6/-6)
To merge this branch: bzr merge lp:~mariusko/modemmanager/ubuntu
Reviewer Review Type Date Requested Status
Modem Manager Team 2013-03-14 Pending
Review via email: mp+153480@code.launchpad.net
To post a comment you must log in.
lp:~mariusko/modemmanager/ubuntu updated on 2013-03-15
187. By Marius Kotsbak <email address hidden> on 2013-03-15

* Ensure new ppp plugin "mm-test-pppd-plugin" in included.
  - also add "ppp" package to suggests.

188. By Marius B. Kotsbak on 2013-03-15

Revert r187, "mm-test-pppd-plugin" should not be included in binary package.

It is only used for tests, and is excluded by in rules (needs to be made multiarch-aware).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/arduino-blacklist.patch'
2--- debian/patches/arduino-blacklist.patch 2013-01-17 20:38:37 +0000
3+++ debian/patches/arduino-blacklist.patch 2013-03-15 10:55:24 +0000
4@@ -2,11 +2,11 @@
5 src/77-mm-usb-device-blacklist.rules | 5 +++++
6 1 file changed, 5 insertions(+)
7
8-Index: b/src/77-mm-usb-device-blacklist.rules
9+Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
10 ===================================================================
11---- a/src/77-mm-usb-device-blacklist.rules
12-+++ b/src/77-mm-usb-device-blacklist.rules
13-@@ -89,4 +89,9 @@ ATTRS{idVendor}=="10c4", ATTRS{idProduct
14+--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:21.866210414 +0100
15++++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:21.802210413 +0100
16+@@ -88,4 +88,9 @@
17 # QinHeng Electronics HL-340
18 ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", ENV{ID_MM_DEVICE_IGNORE}="1"
19
20
21=== modified file 'debian/patches/linux-default-usb-id.patch'
22--- debian/patches/linux-default-usb-id.patch 2013-03-12 18:44:59 +0000
23+++ debian/patches/linux-default-usb-id.patch 2013-03-15 10:55:24 +0000
24@@ -2,11 +2,11 @@
25 src/77-mm-usb-device-blacklist.rules | 3 +++
26 1 file changed, 3 insertions(+)
27
28-Index: b/src/77-mm-usb-device-blacklist.rules
29+Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
30 ===================================================================
31---- a/src/77-mm-usb-device-blacklist.rules
32-+++ b/src/77-mm-usb-device-blacklist.rules
33-@@ -88,4 +88,7 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct
34+--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:34.282210727 +0100
35++++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:34.226210727 +0100
36+@@ -93,4 +93,7 @@
37 ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="204b", ENV{ID_MM_DEVICE_IGNORE}="1"
38 ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"
39
40
41=== modified file 'debian/patches/lp700316_usb_blacklist.patch'
42--- debian/patches/lp700316_usb_blacklist.patch 2013-03-12 18:57:35 +0000
43+++ debian/patches/lp700316_usb_blacklist.patch 2013-03-15 10:55:24 +0000
44@@ -2,13 +2,13 @@
45 src/77-mm-usb-device-blacklist.rules | 9 +++++++++
46 1 file changed, 9 insertions(+)
47
48-Index: b/src/77-mm-usb-device-blacklist.rules
49+Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
50 ===================================================================
51---- a/src/77-mm-usb-device-blacklist.rules
52-+++ b/src/77-mm-usb-device-blacklist.rules
53-@@ -74,4 +74,13 @@ ATTRS{idVendor}=="9e88", ATTRS{idProduct
54- # Atmel Corp at91sam SAMBA bootloader
55- ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", ENV{ID_MM_DEVICE_IGNORE}="1"
56+--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:08.834210083 +0100
57++++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:08.782210083 +0100
58+@@ -79,4 +79,13 @@
59+ ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="814b", ENV{ID_MM_DEVICE_IGNORE}="1"
60+ ATTRS{idVendor}=="2405", ATTRS{idProduct}=="0003", ENV{ID_MM_DEVICE_IGNORE}="1"
61
62 +# Prolific Technology, Inc. PL2303 Serial Port
63 +ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", ENV{ID_MM_DEVICE_IGNORE}="1"

Subscribers

People subscribed via source and target branches