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
=== modified file 'debian/patches/arduino-blacklist.patch'
--- debian/patches/arduino-blacklist.patch 2013-01-17 20:38:37 +0000
+++ debian/patches/arduino-blacklist.patch 2013-03-15 10:55:24 +0000
@@ -2,11 +2,11 @@
2 src/77-mm-usb-device-blacklist.rules | 5 +++++2 src/77-mm-usb-device-blacklist.rules | 5 +++++
3 1 file changed, 5 insertions(+)3 1 file changed, 5 insertions(+)
44
5Index: b/src/77-mm-usb-device-blacklist.rules5Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
6===================================================================6===================================================================
7--- a/src/77-mm-usb-device-blacklist.rules7--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:21.866210414 +0100
8+++ b/src/77-mm-usb-device-blacklist.rules8+++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:21.802210413 +0100
9@@ -89,4 +89,9 @@ ATTRS{idVendor}=="10c4", ATTRS{idProduct9@@ -88,4 +88,9 @@
10 # QinHeng Electronics HL-34010 # QinHeng Electronics HL-340
11 ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", ENV{ID_MM_DEVICE_IGNORE}="1"11 ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", ENV{ID_MM_DEVICE_IGNORE}="1"
12 12
1313
=== modified file 'debian/patches/linux-default-usb-id.patch'
--- debian/patches/linux-default-usb-id.patch 2013-03-12 18:44:59 +0000
+++ debian/patches/linux-default-usb-id.patch 2013-03-15 10:55:24 +0000
@@ -2,11 +2,11 @@
2 src/77-mm-usb-device-blacklist.rules | 3 +++2 src/77-mm-usb-device-blacklist.rules | 3 +++
3 1 file changed, 3 insertions(+)3 1 file changed, 3 insertions(+)
44
5Index: b/src/77-mm-usb-device-blacklist.rules5Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
6===================================================================6===================================================================
7--- a/src/77-mm-usb-device-blacklist.rules7--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:34.282210727 +0100
8+++ b/src/77-mm-usb-device-blacklist.rules8+++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:34.226210727 +0100
9@@ -88,4 +88,7 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct9@@ -93,4 +93,7 @@
10 ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="204b", ENV{ID_MM_DEVICE_IGNORE}="1"10 ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="204b", ENV{ID_MM_DEVICE_IGNORE}="1"
11 ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"11 ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1"
12 12
1313
=== modified file 'debian/patches/lp700316_usb_blacklist.patch'
--- debian/patches/lp700316_usb_blacklist.patch 2013-03-12 18:57:35 +0000
+++ debian/patches/lp700316_usb_blacklist.patch 2013-03-15 10:55:24 +0000
@@ -2,13 +2,13 @@
2 src/77-mm-usb-device-blacklist.rules | 9 +++++++++2 src/77-mm-usb-device-blacklist.rules | 9 +++++++++
3 1 file changed, 9 insertions(+)3 1 file changed, 9 insertions(+)
44
5Index: b/src/77-mm-usb-device-blacklist.rules5Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules
6===================================================================6===================================================================
7--- a/src/77-mm-usb-device-blacklist.rules7--- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:08.834210083 +0100
8+++ b/src/77-mm-usb-device-blacklist.rules8+++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:08.782210083 +0100
9@@ -74,4 +74,13 @@ ATTRS{idVendor}=="9e88", ATTRS{idProduct9@@ -79,4 +79,13 @@
10 # Atmel Corp at91sam SAMBA bootloader10 ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="814b", ENV{ID_MM_DEVICE_IGNORE}="1"
11 ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", ENV{ID_MM_DEVICE_IGNORE}="1"11 ATTRS{idVendor}=="2405", ATTRS{idProduct}=="0003", ENV{ID_MM_DEVICE_IGNORE}="1"
12 12
13+# Prolific Technology, Inc. PL2303 Serial Port13+# Prolific Technology, Inc. PL2303 Serial Port
14+ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", ENV{ID_MM_DEVICE_IGNORE}="1"14+ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", ENV{ID_MM_DEVICE_IGNORE}="1"

Subscribers

People subscribed via source and target branches