Imported Debian patch 0.5.2.0-1debian/0.5.2.0-1

7 files changed, 112 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 9061232..e5b9fb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,78 @@
+modemmanager (0.5.2.0-1) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/watch: Track .xz tarballs.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 24 Mar 2012 01:24:48 +0100
+
+modemmanager (0.5.2.0-0ubuntu1) precise; urgency=low
+
+  * New upstream bugfix release (stable release 0.5.2).
+    - hso: disable echo removal (LP: #953294)
+    - gsm: retry sending SMS in PDU mode if text fails and PDU is supported
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 14 Mar 2012 12:19:08 -0400
+
+modemmanager (0.5.1.97-0ubuntu1) precise; urgency=low
+
+  * New upstream bugfix release.
+    - release: update NEWS
+    - cdma: fix crash on NULL error (bgo #670145)
+    - Revert "huawei: rework probing and detection" (LP: #868034)
+    - core: fix loop limits in echo removal
+    - at-serial-port: implement built-in echo/garbage removal (LP: #916038)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 07 Mar 2012 16:22:00 -0500
+
+modemmanager (0.5.1.96+git201202081807.635fce1-0ubuntu3) precise; urgency=low
+
+  * debian/ubuntu/modemmanager.upstart: Remove unnecessary expect fork as
+    this does the same thing as just exec'ing. Also check for existence of
+    modemmanager in case it has been removed but not purged. (LP: #942908)
+
+ -- Clint Byrum <clint@ubuntu.com>  Tue, 28 Feb 2012 14:35:15 -0800
+
+modemmanager (0.5.1.96+git201202081807.635fce1-0ubuntu2) precise; urgency=low
+
+  * debian/ubuntu/modemmanager.upstart: fix stop condition to make sure we stop
+    only when NetworkManager is stopped as much as possible, to avoid being
+    respawned by it via DBus. (LP: #869635, #919071)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Thu, 16 Feb 2012 10:43:54 -0500
+
+modemmanager (0.5.1.96+git201202081807.635fce1-0ubuntu1) precise; urgency=low
+
+  * upstream snapshot 2012-02-08 18:07:13 (GMT)
+    + 635fce193ff3a1dbbdee2abab9aa3ab121df25f0
+  * debian/rules: as for NetworkManager, drop a few characters from the version
+    number for git snapshots.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 08 Feb 2012 15:47:24 -0500
+
+modemmanager (0.5+git.20111231t174444.1e332ab-0ubuntu1) precise; urgency=low
+
+  [ Mathieu Trudel-Lapierre ]
+  * upstream snapshot 2011-12-31 17:44:44 (GMT)
+    + 1e332abc957d7eea4521c95d1e28b097de5427e5
+
+  [ Artem Popov ]
+  * debian/patches/arduino-blacklist.patch: add Arduino devices to blacklist
+    to prevent managing Arduino devices. (LP: #910736)
+    - [0403:6001] FT232 USB-Serial (UART) IC.
+    - [03eb:204b] Atmel Corp. LUFA USB to Serial Adapter Project.
+    - Anything with the Arduino VID (2341).
+
+ -- Artem Popov <artfwo@ubuntu.com>  Mon, 02 Jan 2012 13:32:18 +0700
+
+modemmanager (0.5-1ubuntu1) oneiric; urgency=low
+
+  * debian/patches/qdl-blacklist.patch: add more devices to the blacklist of
+    Gobi QDL devices. (LP: #842702, #807889)
+    - [1410:a014] Novatel Gobi found in the Google CR-48.
+    - [03f0:241d] HP un2420 Gobi found in the HP Mini 5102 and Mini 5103.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Tue, 06 Sep 2011 10:09:17 -0400
+
 modemmanager (0.5-1) unstable; urgency=low
 
   * debian/rules: override dh_autoreconf in a nicer way so we don't have to
diff --git a/debian/patches/arduino-blacklist.patch b/debian/patches/arduino-blacklist.patch
new file mode 100644
index 0000000..b7bdbe9
--- /dev/null
+++ b/debian/patches/arduino-blacklist.patch
@@ -0,0 +1,15 @@
+Index: modemmanager.fix-910736/src/77-mm-usb-device-blacklist.rules
+===================================================================
+--- modemmanager.fix-910736.orig/src/77-mm-usb-device-blacklist.rules	2012-01-02 13:52:27.976866000 +0700
++++ modemmanager.fix-910736/src/77-mm-usb-device-blacklist.rules	2012-01-02 13:55:27.610373581 +0700
+@@ -77,5 +77,10 @@
+ # 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/qdl-blacklist.patch b/debian/patches/qdl-blacklist.patch
index 6f64d82..48d851e 100644
--- a/debian/patches/qdl-blacklist.patch
+++ b/debian/patches/qdl-blacklist.patch
@@ -12,11 +12,11 @@ initialize them in ModemManager, it just fails.
 Thanks to Jochen Gruse for the work to generate this list. See LP bug 686418
 for the details.
 
-Index: modemmanager-0.4+git.20110124t203624.00b6cce/src/77-mm-qdl-device-blacklist.rules
+Index: modemmanager-0.5/src/77-mm-qdl-device-blacklist.rules
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ modemmanager-0.4+git.20110124t203624.00b6cce/src/77-mm-qdl-device-blacklist.rules	2011-01-26 20:18:45.000000000 -0500
-@@ -0,0 +1,80 @@
++++ modemmanager-0.5/src/77-mm-qdl-device-blacklist.rules	2011-09-06 09:52:00.166780994 -0400
+@@ -0,0 +1,84 @@
 +# do not edit this file, it will be overwritten on update
 +
 +ACTION!="add|change", GOTO="mm_qdl_device_blacklist_end"
@@ -27,6 +27,9 @@ Index: modemmanager-0.4+git.20110124t203624.00b6cce/src/77-mm-qdl-device-blackli
 +# HP un2400 Gobi QDL Device
 +ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="201d", ENV{ID_MM_DEVICE_IGNORE}="1"
 +
++# HP un2420 Gobi QDL Device
++ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="241d", ENV{ID_MM_DEVICE_IGNORE}="1"
++
 +# Panasonic Gobi QDL device
 +ATTRS{idVendor}=="04da", ATTRS{idProduct}=="250c", ENV{ID_MM_DEVICE_IGNORE}="1"
 +
@@ -35,6 +38,7 @@ Index: modemmanager-0.4+git.20110124t203624.00b6cce/src/77-mm-qdl-device-blackli
 +
 +# Novatel Gobi QDL device
 +ATTRS{idVendor}=="1410", ATTRS{idProduct}=="a008", ENV{ID_MM_DEVICE_IGNORE}="1"
++ATTRS{idVendor}=="1410", ATTRS{idProduct}=="a014", ENV{ID_MM_DEVICE_IGNORE}="1"
 +
 +# Asus Gobi QDL device
 +ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1774", ENV{ID_MM_DEVICE_IGNORE}="1"
@@ -97,10 +101,10 @@ Index: modemmanager-0.4+git.20110124t203624.00b6cce/src/77-mm-qdl-device-blackli
 +ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9204", ENV{ID_MM_DEVICE_IGNORE}="1"
 +
 +LABEL="mm_qdl_device_blacklist_end"
-Index: modemmanager-0.4+git.20110124t203624.00b6cce/src/Makefile.am
+Index: modemmanager-0.5/src/Makefile.am
 ===================================================================
---- modemmanager-0.4+git.20110124t203624.00b6cce.orig/src/Makefile.am	2011-01-26 20:19:16.259452829 -0500
-+++ modemmanager-0.4+git.20110124t203624.00b6cce/src/Makefile.am	2011-01-26 20:19:59.871751441 -0500
+--- modemmanager-0.5.orig/src/Makefile.am	2011-07-29 17:56:35.000000000 -0400
++++ modemmanager-0.5/src/Makefile.am	2011-09-06 09:51:15.116780910 -0400
 @@ -3,6 +3,7 @@
  udevrulesdir = $(UDEV_BASE_DIR)/rules.d
  udevrules_DATA = \
diff --git a/debian/patches/series b/debian/patches/series
index 808f502..aee824d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 # patches for modemmanager
 qdl-blacklist.patch
 lp700316_usb_blacklist.patch
+arduino-blacklist.patch
diff --git a/debian/rules b/debian/rules
index e906b96..1311cb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,10 +64,10 @@ GET_SOURCE = \
 		echo "getting specific upstream revision/tag: $(1)"; \
 		cd `ls | head -n 1`; git checkout -b orig $(1); \
 		commit_id=`git log -n1 --abbrev-commit | grep '^commit ' | sed -e 's/commit //'`; \
-		raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y%m%dt%H%M%S"`; \
+		raw=`date --utc --date="$$(git log --pretty=fuller -n1 --date=rfc | grep CommitDate: | sed -e 's/CommitDate:[^0-9]*//')" "+%Y%m%d%H%M"`; \
 		if echo $(1) | grep -c "orig" > /dev/null || echo $(DEB_VERSION) | grep -c "git" > /dev/null; \
 		then \
-			upstream_version=$(DEB_MAJOR_VERSION)git.$$raw.$$commit_id; \
+			upstream_version=$(DEB_MAJOR_VERSION)git$$raw.$$commit_id; \
 		else \
 			upstream_version=$(DEB_UPSTREAM_VERSION); \
 		fi; \
diff --git a/debian/ubuntu/modemmanager.upstart b/debian/ubuntu/modemmanager.upstart
index a7b1642..b23fdc4 100644
--- a/debian/ubuntu/modemmanager.upstart
+++ b/debian/ubuntu/modemmanager.upstart
@@ -1,14 +1,17 @@
 # modemmanager - modem manager
 #
-# The Network Manager daemon manages the system's network connections,
-# automatically switching between the best available.
+# The ModemManager daemon manages the system's mobile broadband connections
+# for NetworkManager.
 
 description	"modem connection manager"
 
 start on starting network-manager
-stop on stopping network-manager
+stop on stopped network-manager
 
-expect fork
 respawn
 
-exec /usr/sbin/modem-manager &
+pre-start script
+    [ -x /usr/sbin/modem-manager ] || stop
+end script
+
+exec /usr/sbin/modem-manager
diff --git a/debian/watch b/debian/watch
index b586c1a..1dd4f4d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://ftp.gnome.org/pub/gnome/sources/ModemManager/([\d\.]+)/ModemManager-(.*)\.tar\.bz2
+http://ftp.gnome.org/pub/gnome/sources/ModemManager/([\d\.]+)/ModemManager-(.*)\.tar\.xz