Imported Debian patch 0.5-1debian/0.5-1

7 files changed, 100 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 577a4bb..9061232 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+modemmanager (0.5-1) unstable; urgency=low
+
+  * debian/rules: override dh_autoreconf in a nicer way so we don't have to
+    clean up manually afterwards.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 07 Aug 2011 01:47:27 +0200
+
+modemmanager (0.5-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release 0.5.
+    - gsm: send init command twice to make the N900 happy (LP: #765516)
+    - fix sierra modems' sleep mode command (LP: #459052, #738005)
+  * debian/patches/lp700316_usb_blacklist.patch: add extra devices to blacklist
+    of USB devices known to usually be serial dongles or other things MM should
+    not touch. (LP: #700316)
+  * debian/control, debian/rules: add a -dbg package for modemmanager, and
+    override dh_strip accordingly. (LP: #415394)
+  * debian/rules: fix .la/.a file removal to not fail if there is nothing to
+    remove.
+  * debian/modemmanager.install: install files to the modemmanager package
+    explicitly now that it's not the only binary package.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Fri, 05 Aug 2011 12:46:32 -0400
+
+modemmanager (0.4.997-1ubuntu1) oneiric; urgency=low
+
+  * debian/modemmanager.upstart: add an upstart config file so ModemManager
+    gets started just before NM, and stopped along with it. (LP: #806082)
+  * debian/rules: install upstart file only for Ubuntu.
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Fri, 08 Jul 2011 15:32:13 -0400
+
 modemmanager (0.4.997-1) unstable; urgency=low
 
   * debian/watch: Switch to .bz2 tarballs.
diff --git a/debian/control b/debian/control
index bed079e..ee13168 100644
--- a/debian/control
+++ b/debian/control
@@ -28,3 +28,18 @@ Description: D-Bus service for managing modems
  .
  Git Repository: http://cgit.freedesktop.org/ModemManager/ModemManager/
 
+Package: modemmanager-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: modemmanager (= ${binary:Version}),
+	${misc:Depends}
+Description: D-Bus service for managing modems - debugging symbols
+ Provides a D-Bus interface to communicate with mobile broadband (GSM, CDMA,
+ UMTS, ...) cards. Implements a loadable plugin interface to add work-arounds
+ for non standard devices. Also provides patches to use networkmanager (and
+ the applet) with modem manager.
+ .
+ Git Repository: http://cgit.freedesktop.org/ModemManager/ModemManager/
+ .
+ This package contains debugging symbols for ModemManager.
diff --git a/debian/modemmanager.install b/debian/modemmanager.install
new file mode 100644
index 0000000..9c13e90
--- /dev/null
+++ b/debian/modemmanager.install
@@ -0,0 +1,3 @@
+debian/tmp/etc
+debian/tmp/lib
+debian/tmp/usr
diff --git a/debian/patches/lp700316_usb_blacklist.patch b/debian/patches/lp700316_usb_blacklist.patch
new file mode 100644
index 0000000..0deb577
--- /dev/null
+++ b/debian/patches/lp700316_usb_blacklist.patch
@@ -0,0 +1,19 @@
+Index: modemmanager-0.5/src/77-mm-usb-device-blacklist.rules
+===================================================================
+--- modemmanager-0.5.orig/src/77-mm-usb-device-blacklist.rules	2011-08-05 11:37:37.535618352 -0400
++++ modemmanager-0.5/src/77-mm-usb-device-blacklist.rules	2011-08-05 11:39:06.565883158 -0400
+@@ -68,5 +68,14 @@
+ # ATEN Intl UC-232A (Prolific)
+ ATTRS{idVendor}=="0557", ATTRS{idProduct}=="2008", 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 235bfb9..808f502 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 # patches for modemmanager
 qdl-blacklist.patch
+lp700316_usb_blacklist.patch
diff --git a/debian/rules b/debian/rules
index d61f645..e906b96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,16 @@ DH_ALWAYS_EXCLUDE=.svn:.git:.bzr
 %:
 	dh $@ --with autoreconf
 
+autoreconf:
+	intltoolize -f
+	autoreconf -f -i
+
 override_dh_autoreconf:
-	intltoolize --force
-	dh_autoreconf
+	dh_autoreconf debian/rules -- autoreconf
 
-override_dh_autoreconf_clean:
-	dh_autoreconf_clean
-	rm -f intltool-*.in po/Makefile.in.in m4/intltool.m4 || true
+override_dh_auto_clean:
+	rm -f $(CURDIR)/debian/modemmanager.upstart
+	dh_auto_clean
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -24,9 +27,15 @@ override_dh_auto_configure:
 override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/ModemManager/ -X/usr/lib/pppd/
 
+override_dh_strip:
+	dh_strip --dbg-package=modemmanager-dbg
+
 override_dh_install:
-	find $(CURDIR)/debian/modemmanager/ -name \*.a | xargs rm
-	find $(CURDIR)/debian/modemmanager/ -name \*.la | xargs rm
+	if dpkg-vendor --is ubuntu; then \
+		cp $(CURDIR)/debian/ubuntu/modemmanager.upstart $(CURDIR)/debian; \
+	fi
+	find $(CURDIR)/debian/tmp/ -name \*.a -exec rm {} \;
+	find $(CURDIR)/debian/tmp/ -name \*.la -exec rm {} \;
 	dh_install
 
 override_dh_installdocs:
diff --git a/debian/ubuntu/modemmanager.upstart b/debian/ubuntu/modemmanager.upstart
new file mode 100644
index 0000000..a7b1642
--- /dev/null
+++ b/debian/ubuntu/modemmanager.upstart
@@ -0,0 +1,14 @@
+# modemmanager - modem manager
+#
+# The Network Manager daemon manages the system's network connections,
+# automatically switching between the best available.
+
+description	"modem connection manager"
+
+start on starting network-manager
+stop on stopping network-manager
+
+expect fork
+respawn
+
+exec /usr/sbin/modem-manager &