diff options
author | Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> | 2014-01-14 10:02:26 -0500 |
---|---|---|
committer | Guido Günther <agx@sigxcpu.org> | 2014-02-05 08:38:49 +0100 |
commit | 7a730eee89835b645b74b332b2171722e938db00 (patch) | |
tree | e829e3b7fd5264f4087b44ddbc3f267bae0044da | |
parent | 728e8593184b050a9f32bf98a3fce7c2aa321bef (diff) |
Imported Debian patch 1.0.0-2debian/1.0.0-2
-rw-r--r-- | debian/changelog | 59 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/libmm-glib0.symbols | 41 | ||||
-rw-r--r-- | debian/patches/lp1229748_bluegiga_blacklist.patch | 20 | ||||
-rw-r--r-- | debian/patches/series | 1 |
5 files changed, 80 insertions, 43 deletions
diff --git a/debian/changelog b/debian/changelog index cfbae0f..e5c7ef7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +modemmanager (1.0.0-2) experimental; urgency=medium + + * Sync more changes from Ubuntu: + - changelog for 0.6.0.0.really-0ubuntu4 (all changes dropped, they are + patches included in the current upstream version). + - changelog for 0.6.0.0.really-0ubuntu5 (all changes dropped, they are + patches included in the current upstream version). + - changelog for 0.6.0.0.really-0ubuntu6. + - Build-Depend on automake1.11. + - changelog for 0.6.0.0.really-0ubuntu7. + - lp1229748_bluegiga_blacklist.patch: don't reset BLED112B. + + -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Tue, 14 Jan 2014 10:02:26 -0500 + modemmanager (1.0.0-1) experimental; urgency=low * New upstream release. (Closes: #728214, #728215) @@ -9,7 +23,9 @@ modemmanager (1.0.0-1) experimental; urgency=low * debian/rules: clean up after gtk-doc files left around. * debian/patches/glib_fixes.patch: link against glib explicitly for the huawei modem helper tests. - * debian/libmm-glib0.symbols: updated symbols. + * debian/libmm-glib0.symbols: updated symbols: Contacts interface that was + in 0.7.990 got dropped; it's not actually implemented, so upstream avoids + exposing it. * debian/watch: update watch file for new location of upstream source. -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Fri, 20 Dec 2013 15:35:26 -0500 @@ -78,6 +94,47 @@ modemmanager (0.7.991-1) experimental; urgency=low -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Tue, 11 Jun 2013 10:35:42 -0400 +modemmanager (0.6.0.0.really-0ubuntu7) saucy; urgency=low + + * debian/patches/lp1229748_bluegiga_blacklist.patch: don't reset BLED112B. + (LP: #1229748) + + -- Alan Bell <alanbell@ubuntu.com> Tue, 24 Sep 2013 15:39:47 +0100 + +modemmanager (0.6.0.0.really-0ubuntu6) saucy; urgency=low + + * Build-depend on automake1.11. + + -- Matthias Klose <doko@ubuntu.com> Tue, 24 Sep 2013 14:57:53 +0200 + +modemmanager (0.6.0.0.really-0ubuntu5) raring; urgency=low + + * debian/patches/lp1164023_try_csq_if_cind_fails_5d854a3.patch: fallback to + trying AT+CSQ if AT+CIND fails. (LP: #1164023) + * debian/patches/git_udev_match_both_vid_pid_e322ccf.patch: match both VID + and PID when matching devices: If the rules to tag specific USB interface + numbers only apply on the PID, we'll end up seeing that if the port has a + parent with another PID, and that other PID also has a rule, port will get + tagged multiple times. + * debian/patches/git_mbm_remove_check_poll_when_conn_1652019.patch: mbm: + remove connection attempt check poll explicitly when connected: Completing + a MMCallbackInfo is done asynchronously (in an idle), which means that we + may get the poll timeout called in between... + + -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Wed, 10 Apr 2013 21:20:53 -0400 + +modemmanager (0.6.0.0.really-0ubuntu4) raring; urgency=low + + * debian/patches/git_cdma_double_free_05a4226.patch: cdma: avoid double free + of GError (LP: #1083659) + * debian/patches/git_ignore_arduino_aa84ce9.patch: properly ignore more + arduino devices. (LP: #1153632) + * debian/patches/git_ignore_west_mountain_radios_e608b17.patch: ignore West + Mountain amateur radio systems. (LP: #1154654) + * debian/patches/lp700316_usb_blacklist.patch: refreshed. + + -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Mon, 01 Apr 2013 11:07:37 -0400 + modemmanager (0.6.0.0.really-0ubuntu3) raring; urgency=low * debian/patches/linux-default-usb-id.patch: blacklist the USB-Gadget default diff --git a/debian/control b/debian/control index 4cb3439..44ca49a 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Alexander Sack <asac@ubuntu.com> Uploaders: Alexander Sack <asac@debian.org>, Michael Biebl <biebl@debian.org>, Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Build-Depends: debhelper (>= 9), dh-autoreconf, - automake, + automake1.11, libtool, intltool, gtk-doc-tools, diff --git a/debian/libmm-glib0.symbols b/debian/libmm-glib0.symbols index 1012d47..7a173b5 100644 --- a/debian/libmm-glib0.symbols +++ b/debian/libmm-glib0.symbols @@ -313,44 +313,6 @@ libmm-glib.so.0 libmm-glib0 #MINVER# mm_gdbus_modem_complete_set_current_capabilities@Base 0.7.991 mm_gdbus_modem_complete_set_current_modes@Base 0.7.991 mm_gdbus_modem_complete_set_power_state@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_add@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_add_finish@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_add_sync@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_delete@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_delete_finish@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_delete_sync@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_find@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_find_finish@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_find_sync@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_get@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_get_count@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_get_count_finish@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_get_count_sync@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_get_finish@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_get_sync@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_list@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_list_finish@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_call_list_sync@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_complete_add@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_complete_delete@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_complete_find@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_complete_get@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_complete_get_count@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_complete_list@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_emit_added@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_emit_deleted@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_get_type@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_interface_info@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_override_properties@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_proxy_get_type@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_proxy_new@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_proxy_new_finish@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_proxy_new_for_bus@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_proxy_new_for_bus_finish@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_proxy_new_for_bus_sync@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_proxy_new_sync@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_skeleton_get_type@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_modem_contacts_skeleton_new@Base 0.7.991 mm_gdbus_modem_dup_current_bands@Base 0.7.991 mm_gdbus_modem_dup_current_modes@Base 0.7.991 mm_gdbus_modem_dup_device@Base 0.7.991 @@ -567,7 +529,6 @@ libmm-glib.so.0 libmm-glib0 #MINVER# mm_gdbus_object_get_modem3gpp_ussd@Base 0.7.991 mm_gdbus_object_get_modem@Base 0.7.991 mm_gdbus_object_get_modem_cdma@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_object_get_modem_contacts@Base 0.7.991 mm_gdbus_object_get_modem_firmware@Base 0.7.991 mm_gdbus_object_get_modem_location@Base 0.7.991 mm_gdbus_object_get_modem_messaging@Base 0.7.991 @@ -586,7 +547,6 @@ libmm-glib.so.0 libmm-glib0 #MINVER# mm_gdbus_object_peek_modem3gpp_ussd@Base 0.7.991 mm_gdbus_object_peek_modem@Base 0.7.991 mm_gdbus_object_peek_modem_cdma@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_object_peek_modem_contacts@Base 0.7.991 mm_gdbus_object_peek_modem_firmware@Base 0.7.991 mm_gdbus_object_peek_modem_location@Base 0.7.991 mm_gdbus_object_peek_modem_messaging@Base 0.7.991 @@ -600,7 +560,6 @@ libmm-glib.so.0 libmm-glib0 #MINVER# mm_gdbus_object_skeleton_set_modem3gpp_ussd@Base 0.7.991 mm_gdbus_object_skeleton_set_modem@Base 0.7.991 mm_gdbus_object_skeleton_set_modem_cdma@Base 0.7.991 -#MISSING: 1.0.0# mm_gdbus_object_skeleton_set_modem_contacts@Base 0.7.991 mm_gdbus_object_skeleton_set_modem_firmware@Base 0.7.991 mm_gdbus_object_skeleton_set_modem_location@Base 0.7.991 mm_gdbus_object_skeleton_set_modem_messaging@Base 0.7.991 diff --git a/debian/patches/lp1229748_bluegiga_blacklist.patch b/debian/patches/lp1229748_bluegiga_blacklist.patch new file mode 100644 index 0000000..9e0480a --- /dev/null +++ b/debian/patches/lp1229748_bluegiga_blacklist.patch @@ -0,0 +1,20 @@ +## 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 +=================================================================== +--- 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/series b/debian/patches/series index a25ed0e..543dbb3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ lp700316_usb_blacklist.patch arduino-blacklist.patch linux-default-usb-id.patch glib_fixes.patch +lp1229748_bluegiga_blacklist.patch |