diff options
author | Guido Günther <agx@sigxcpu.org> | 2014-02-03 09:54:32 +0100 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2014-02-05 08:41:55 +0100 |
commit | f78951de10b33eccf1d5c43a7dceb032c9751640 (patch) | |
tree | c9c6d506a6d01985bae5a2533c66892c904406cf | |
parent | 90cb280d4f78f0d9bd34392bebe2967dd7a3be1e (diff) |
Update patches
Applied upstream:
ericsson_h5321gw_usbids.patch
glib_fixes.patch
-rw-r--r-- | debian/patches/arduino-blacklist.patch | 16 | ||||
-rw-r--r-- | debian/patches/ericsson_h5321gw_usbids.patch | 20 | ||||
-rw-r--r-- | debian/patches/glib_fixes.patch | 20 | ||||
-rw-r--r-- | debian/patches/linux-default-usb-id.patch | 16 | ||||
-rw-r--r-- | debian/patches/lp1229748_bluegiga_blacklist.patch | 16 | ||||
-rw-r--r-- | debian/patches/lp700316_usb_blacklist.patch | 16 | ||||
-rw-r--r-- | debian/patches/series | 2 |
7 files changed, 40 insertions, 66 deletions
diff --git a/debian/patches/arduino-blacklist.patch b/debian/patches/arduino-blacklist.patch index 5b40aa7..8b8fad9 100644 --- a/debian/patches/arduino-blacklist.patch +++ b/debian/patches/arduino-blacklist.patch @@ -1,12 +1,16 @@ +From: Alexander Sack <asac@ubuntu.com> +Date: Mon, 3 Feb 2014 09:50:59 +0100 +Subject: arduino-blacklist + --- - src/77-mm-usb-device-blacklist.rules | 5 +++++ + src/77-mm-usb-device-blacklist.rules | 5 +++++ 1 file changed, 5 insertions(+) -Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules -=================================================================== ---- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:21.866210414 +0100 -+++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:21.802210413 +0100 -@@ -88,4 +88,9 @@ +diff --git a/src/77-mm-usb-device-blacklist.rules b/src/77-mm-usb-device-blacklist.rules +index 24187d1..108fef1 100644 +--- a/src/77-mm-usb-device-blacklist.rules ++++ b/src/77-mm-usb-device-blacklist.rules +@@ -122,4 +122,9 @@ ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", ENV{ID_MM_DEVICE_IGNORE}="1" # QinHeng Electronics HL-340 ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", ENV{ID_MM_DEVICE_IGNORE}="1" diff --git a/debian/patches/ericsson_h5321gw_usbids.patch b/debian/patches/ericsson_h5321gw_usbids.patch deleted file mode 100644 index e00e604..0000000 --- a/debian/patches/ericsson_h5321gw_usbids.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Ari Sovijarvi <ari@sovijarvi.fi> -Subject: Add another known USB ID for the Ericsson H5321gw. -Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/modemmanager/+bug/1057956 - ---- - plugins/77-mm-ericsson-mbm.rules | 1 + - 1 file changed, 1 insertion(+) - -Index: b/plugins/77-mm-ericsson-mbm.rules -=================================================================== ---- a/plugins/77-mm-ericsson-mbm.rules -+++ b/plugins/77-mm-ericsson-mbm.rules -@@ -32,6 +32,7 @@ ATTRS{idVendor}=="0bdb", ATTRS{idProduct - - # Ericsson H5321gw - ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1919", ENV{ID_MM_ERICSSON_MBM}="1" -+ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="1926", ENV{ID_MM_ERICSSON_MBM}="1" - - # Ericsson H5321w - ATTRS{idVendor}=="0bdb", ATTRS{idProduct}=="191d", ENV{ID_MM_ERICSSON_MBM}="1" diff --git a/debian/patches/glib_fixes.patch b/debian/patches/glib_fixes.patch deleted file mode 100644 index 7b6b96e..0000000 --- a/debian/patches/glib_fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Mathieu Trudel-Lapierre <mathieu.tl@gmail.com> -Subject: Link against glib for huawei modem helper tests. - ---- - plugins/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/plugins/Makefile.am -=================================================================== ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -127,7 +127,7 @@ test_modem_helpers_huawei_SOURCES = \ - test_modem_helpers_huawei_CPPFLAGS = \ - -I$(top_srcdir)/plugins/huawei \ - $(PLUGIN_COMMON_COMPILER_FLAGS) --test_modem_helpers_huawei_LDFLAGS = $(top_builddir)/libmm-glib/libmm-glib.la -+test_modem_helpers_huawei_LDFLAGS = $(MM_LIBS) $(top_builddir)/libmm-glib/libmm-glib.la - - - # MBM diff --git a/debian/patches/linux-default-usb-id.patch b/debian/patches/linux-default-usb-id.patch index 82adcb5..f77c906 100644 --- a/debian/patches/linux-default-usb-id.patch +++ b/debian/patches/linux-default-usb-id.patch @@ -1,12 +1,16 @@ +From: Alexander Sack <asac@ubuntu.com> +Date: Mon, 3 Feb 2014 09:50:59 +0100 +Subject: linux-default-usb-id + --- - src/77-mm-usb-device-blacklist.rules | 3 +++ + src/77-mm-usb-device-blacklist.rules | 3 +++ 1 file changed, 3 insertions(+) -Index: modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules -=================================================================== ---- modemmanager-0.7.990.orig/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:34.282210727 +0100 -+++ modemmanager-0.7.990/src/77-mm-usb-device-blacklist.rules 2013-03-14 23:37:34.226210727 +0100 -@@ -93,4 +93,7 @@ +diff --git a/src/77-mm-usb-device-blacklist.rules b/src/77-mm-usb-device-blacklist.rules +index 108fef1..cdd0bd1 100644 +--- a/src/77-mm-usb-device-blacklist.rules ++++ b/src/77-mm-usb-device-blacklist.rules +@@ -127,4 +127,7 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", ENV{ID_MM_DEVICE_IGNORE}="1" ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="204b", ENV{ID_MM_DEVICE_IGNORE}="1" ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1" diff --git a/debian/patches/lp1229748_bluegiga_blacklist.patch b/debian/patches/lp1229748_bluegiga_blacklist.patch index 9e0480a..441c3d0 100644 --- a/debian/patches/lp1229748_bluegiga_blacklist.patch +++ b/debian/patches/lp1229748_bluegiga_blacklist.patch @@ -1,16 +1,20 @@ +From: Alexander Sack <asac@ubuntu.com> +Date: Mon, 3 Feb 2014 09:50:59 +0100 +Subject: lp1229748_bluegiga_blacklist + ## Description: add Bluegiga BLE112B ## Origin/Author: Aleksander Morgado <aleksander@lanedo.com> ## Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/modemmanager/+bug/1229748 ## Source: http://cgit.freedesktop.org/ModemManager/ModemManager/commit/?id=0dd93549a175f05cd5290ca8b3a3fd78e59863b5 --- -# src/77-mm-usb-device-blacklist.rules | 3 +++ -# 1 file changed, 3 insertions(+) -# -Index: b/src/77-mm-usb-device-blacklist.rules -=================================================================== + src/77-mm-usb-device-blacklist.rules | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/77-mm-usb-device-blacklist.rules b/src/77-mm-usb-device-blacklist.rules +index cdd0bd1..8e60d1c 100644 --- a/src/77-mm-usb-device-blacklist.rules +++ b/src/77-mm-usb-device-blacklist.rules -@@ -104,4 +104,7 @@ ATTRS{idVendor}=="2341", ENV{ID_MM_DEVIC +@@ -130,4 +130,7 @@ ATTRS{idVendor}=="2341", ENV{ID_MM_DEVICE_IGNORE}="1" # Netchip Technology, Inc. Linux-USB Serial Gadget (CDC ACM mode) ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a7", ENV{ID_MM_DEVICE_IGNORE}="1" diff --git a/debian/patches/lp700316_usb_blacklist.patch b/debian/patches/lp700316_usb_blacklist.patch index ed263de..4690b7a 100644 --- a/debian/patches/lp700316_usb_blacklist.patch +++ b/debian/patches/lp700316_usb_blacklist.patch @@ -1,14 +1,18 @@ +From: Alexander Sack <asac@ubuntu.com> +Date: Mon, 3 Feb 2014 09:50:59 +0100 +Subject: lp700316_usb_blacklist + --- - src/77-mm-usb-device-blacklist.rules | 9 +++++++++ + src/77-mm-usb-device-blacklist.rules | 9 +++++++++ 1 file changed, 9 insertions(+) -Index: b/src/77-mm-usb-device-blacklist.rules -=================================================================== +diff --git a/src/77-mm-usb-device-blacklist.rules b/src/77-mm-usb-device-blacklist.rules +index 044d80f..24187d1 100644 --- a/src/77-mm-usb-device-blacklist.rules +++ b/src/77-mm-usb-device-blacklist.rules -@@ -87,4 +87,13 @@ ATTRS{idVendor}=="1b4f", ATTRS{idProduct - # Altair U-Boot device - ATTRS{idVendor}=="0216", ATTRS{idProduct}=="0051" ENV{ID_MM_DEVICE_IGNORE}="1" +@@ -113,4 +113,13 @@ DRIVERS=="cypress_m8", ENV{ID_MM_DEVICE_IGNORE}="1" + # All devices in the Openmoko vendor ID + ATTRS{idVendor}=="1d50", ENV{ID_MM_DEVICE_IGNORE}="1" +# Prolific Technology, Inc. PL2303 Serial Port +ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", ENV{ID_MM_DEVICE_IGNORE}="1" diff --git a/debian/patches/series b/debian/patches/series index 543dbb3..68ac067 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,4 @@ -# patches for modemmanager lp700316_usb_blacklist.patch arduino-blacklist.patch linux-default-usb-id.patch -glib_fixes.patch lp1229748_bluegiga_blacklist.patch |