tag 731851 +patch
On Tue, Dec 10, 2013 at 03:07:12PM +0100, Bjørn Mork wrote:
> Package: modemmanager
> Version: 1.1.990-0+git
> Severity: wishlist
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> The version in sid is starting to get ridiculously outdated. Upstream
> has been through several major releases, adding features *required* to
> support modern 3G and LTE modems. Some of these just don't support
> traditional PPP over serial anymore. It is time we get the chance to
> test and use QMI and MBIM modems in Debian.
>
> Please, please, please prepare an update, preferably based on the
> recent 1.2-rc1 or newer.
1.2.0 is out now. I was able to build a package with the attached two
minor patches. I can try to find the time to NMU to experimental.
Cheers,
-- Guido
>From 66c69b9d696d7a2c71ca6a399141fb9e771803d3 Mon Sep 17 00:00:00 2001
Message-Id: <66c69b9d696d7a2c71ca6a399141fb9e771803d3.1391507008.git....@sigxcpu.org>
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <a...@sigxcpu.org>
Date: Tue, 4 Feb 2014 10:32:20 +0100
Subject: [PATCH] Install locale files
---
debian/modemmanager.install | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/modemmanager.install b/debian/modemmanager.install
index aa1f47c..7d10516 100644
--- a/debian/modemmanager.install
+++ b/debian/modemmanager.install
@@ -5,4 +5,5 @@ usr/sbin
usr/share/dbus-1
usr/share/icons
usr/share/man
+usr/share/locale
usr/lib/*/ModemManager
--
1.9.rc1
>From afb7a787840caa32a1b40ba28cf6177016a371f8 Mon Sep 17 00:00:00 2001
Message-Id: <afb7a787840caa32a1b40ba28cf6177016a371f8.1391507024.git....@sigxcpu.org>
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <a...@sigxcpu.org>
Date: Mon, 3 Feb 2014 09:54:32 +0100
Subject: [PATCH] Rediff patches
Applied upstream:
arduino-blacklist.patch
ericsson_h5321gw_usbids.patch
glib_fixes.patch
linux-default-usb-id.patch
lp1229748_bluegiga_blacklist.patch
lp700316_usb_blacklist.patch
---
debian/patches/0001-lp700316_usb_blacklist.patch | 26 ++++++++++++++++++++++
debian/patches/0002-arduino-blacklist.patch | 22 ++++++++++++++++++
debian/patches/0003-linux-default-usb-id.patch | 20 +++++++++++++++++
.../0004-lp1229748_bluegiga_blacklist.patch | 24 ++++++++++++++++++++
debian/patches/arduino-blacklist.patch | 18 ---------------
debian/patches/ericsson_h5321gw_usbids.patch | 20 -----------------
debian/patches/glib_fixes.patch | 20 -----------------
debian/patches/linux-default-usb-id.patch | 16 -------------
debian/patches/lp1229748_bluegiga_blacklist.patch | 20 -----------------
debian/patches/lp700316_usb_blacklist.patch | 22 ------------------
debian/patches/series | 10 ++++-----
11 files changed, 96 insertions(+), 122 deletions(-)
create mode 100644 debian/patches/0001-lp700316_usb_blacklist.patch
create mode 100644 debian/patches/0002-arduino-blacklist.patch
create mode 100644 debian/patches/0003-linux-default-usb-id.patch
create mode 100644 debian/patches/0004-lp1229748_bluegiga_blacklist.patch
delete mode 100644 debian/patches/arduino-blacklist.patch
delete mode 100644 debian/patches/ericsson_h5321gw_usbids.patch
delete mode 100644 debian/patches/glib_fixes.patch
delete mode 100644 debian/patches/linux-default-usb-id.patch
delete mode 100644 debian/patches/lp1229748_bluegiga_blacklist.patch
delete mode 100644 debian/patches/lp700316_usb_blacklist.patch
diff --git a/debian/patches/0001-lp700316_usb_blacklist.patch b/debian/patches/0001-lp700316_usb_blacklist.patch
new file mode 100644
index 0000000..4690b7a
--- /dev/null
+++ b/debian/patches/0001-lp700316_usb_blacklist.patch
@@ -0,0 +1,26 @@
+From: Alexander Sack <a...@ubuntu.com>
+Date: Mon, 3 Feb 2014 09:50:59 +0100
+Subject: lp700316_usb_blacklist
+
+---
+ src/77-mm-usb-device-blacklist.rules | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+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
+@@ -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"
++
++# Cygnal Integrated Products, Inc. CP210x
++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"
++
+ LABEL="mm_usb_device_blacklist_end"
diff --git a/debian/patches/0002-arduino-blacklist.patch b/debian/patches/0002-arduino-blacklist.patch
new file mode 100644
index 0000000..8b8fad9
--- /dev/null
+++ b/debian/patches/0002-arduino-blacklist.patch
@@ -0,0 +1,22 @@
+From: Alexander Sack <a...@ubuntu.com>
+Date: Mon, 3 Feb 2014 09:50:59 +0100
+Subject: arduino-blacklist
+
+---
+ src/77-mm-usb-device-blacklist.rules | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+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"
+
++# Arduino devices, FT-232-based series and Atmega8U2 (Uno)
++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"
++
+ LABEL="mm_usb_device_blacklist_end"
diff --git a/debian/patches/0003-linux-default-usb-id.patch b/debian/patches/0003-linux-default-usb-id.patch
new file mode 100644
index 0000000..f77c906
--- /dev/null
+++ b/debian/patches/0003-linux-default-usb-id.patch
@@ -0,0 +1,20 @@
+From: Alexander Sack <a...@ubuntu.com>
+Date: Mon, 3 Feb 2014 09:50:59 +0100
+Subject: linux-default-usb-id
+
+---
+ 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 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"
+
++# Netchip Technology, Inc. Linux-USB Serial Gadget (CDC ACM mode)
++ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a7", ENV{ID_MM_DEVICE_IGNORE}="1"
++
+ LABEL="mm_usb_device_blacklist_end"
diff --git a/debian/patches/0004-lp1229748_bluegiga_blacklist.patch b/debian/patches/0004-lp1229748_bluegiga_blacklist.patch
new file mode 100644
index 0000000..441c3d0
--- /dev/null
+++ b/debian/patches/0004-lp1229748_bluegiga_blacklist.patch
@@ -0,0 +1,24 @@
+From: Alexander Sack <a...@ubuntu.com>
+Date: Mon, 3 Feb 2014 09:50:59 +0100
+Subject: lp1229748_bluegiga_blacklist
+
+## Description: add Bluegiga BLE112B
+## Origin/Author: Aleksander Morgado <aleksan...@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(+)
+
+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
+@@ -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"
+
++# Bluegiga Bluetooth Smart device (BLED112B)
++ATTRS{idVendor}=="2458", ATTRS{idProduct}=="0001", ENV{ID_MM_DEVICE_IGNORE}="1"
++
+ LABEL="mm_usb_device_blacklist_end"
diff --git a/debian/patches/arduino-blacklist.patch b/debian/patches/arduino-blacklist.patch
deleted file mode 100644
index 5b40aa7..0000000
--- a/debian/patches/arduino-blacklist.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- 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 @@
- # QinHeng Electronics HL-340
- ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", ENV{ID_MM_DEVICE_IGNORE}="1"
-
-+# Arduino devices, FT-232-based series and Atmega8U2 (Uno)
-+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"
-+
- LABEL="mm_usb_device_blacklist_end"
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 <a...@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...@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
deleted file mode 100644
index 82adcb5..0000000
--- a/debian/patches/linux-default-usb-id.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- 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 @@
- ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="204b", ENV{ID_MM_DEVICE_IGNORE}="1"
- 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"
-+
- LABEL="mm_usb_device_blacklist_end"
diff --git a/debian/patches/lp1229748_bluegiga_blacklist.patch b/debian/patches/lp1229748_bluegiga_blacklist.patch
deleted file mode 100644
index 9e0480a..0000000
--- a/debian/patches/lp1229748_bluegiga_blacklist.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-## Description: add Bluegiga BLE112B
-## Origin/Author: Aleksander Morgado <aleksan...@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
-===================================================================
---- 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
- # Netchip Technology, Inc. Linux-USB Serial Gadget (CDC ACM mode)
- ATTRS{idVendor}=="0525", ATTRS{idProduct}=="a4a7", ENV{ID_MM_DEVICE_IGNORE}="1"
-
-+# Bluegiga Bluetooth Smart device (BLED112B)
-+ATTRS{idVendor}=="2458", ATTRS{idProduct}=="0001", ENV{ID_MM_DEVICE_IGNORE}="1"
-+
- LABEL="mm_usb_device_blacklist_end"
diff --git a/debian/patches/lp700316_usb_blacklist.patch b/debian/patches/lp700316_usb_blacklist.patch
deleted file mode 100644
index ed263de..0000000
--- a/debian/patches/lp700316_usb_blacklist.patch
+++ /dev/null
@@ -1,22 +0,0 @@
----
- src/77-mm-usb-device-blacklist.rules | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-Index: b/src/77-mm-usb-device-blacklist.rules
-===================================================================
---- 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"
-
-+# Prolific Technology, Inc. PL2303 Serial Port
-+ATTRS{idVendor}=="067b", ATTRS{idProduct}=="2303", ENV{ID_MM_DEVICE_IGNORE}="1"
-+
-+# Cygnal Integrated Products, Inc. CP210x
-+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"
-+
- LABEL="mm_usb_device_blacklist_end"
diff --git a/debian/patches/series b/debian/patches/series
index 543dbb3..1c3ad28 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
+0001-lp700316_usb_blacklist.patch
+0002-arduino-blacklist.patch
+0003-linux-default-usb-id.patch
+0004-lp1229748_bluegiga_blacklist.patch
--
1.9.rc1
