[Pkg-utopia-maintainers] Bug#804054: ubuntu specific upstart's job no needed anymore

[Sebastien Bacher]

Package: modemmanager
Version: 1.4.12-1
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu xenial ubuntu-patch

Ubuntu uses systemd now and the upstart job has been dropped in 15.10,
it would make sense to clear that out from the Debian package too,
attached patch does that

Thanks,

-------------- next part --------------
diff -Nru modemmanager-1.4.12/debian/changelog modemmanager-1.4.12/debian/changelog
--- modemmanager-1.4.12/debian/changelog	2015-10-08 12:48:12.000000000 +0200
+++ modemmanager-1.4.12/debian/changelog	2015-11-04 13:06:05.000000000 +0100
@@ -1,3 +1,13 @@
+modemmanager (1.4.12-2) unstable; urgency=medium
+
+  * debian/rules: drop ubuntu vendor-specific changes for an upstart job.
+    Now that we use systemd there is no reason to keep special-casing to keep
+    the upstart job around, and it's confusing to have a SysV, upstart, and
+    systemd way of starting ModemManager all at the same time.
+    Thanks Mathieu Trudel-Lapierre <mathieu-tl at ubuntu.com>
+
+ -- Sebastien Bacher <seb128 at ubuntu.com>  Wed, 04 Nov 2015 13:04:26 +0100
+
 modemmanager (1.4.12-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru modemmanager-1.4.12/debian/rules modemmanager-1.4.12/debian/rules
--- modemmanager-1.4.12/debian/rules	2015-10-08 12:48:12.000000000 +0200
+++ modemmanager-1.4.12/debian/rules	2015-11-04 13:04:07.000000000 +0100
@@ -15,7 +15,6 @@
 	NOCONFIGURE=true dh_autoreconf ./autogen.sh
 
 override_dh_auto_clean:
-	rm -f $(CURDIR)/debian/modemmanager.upstart
 	rm -f gtk-doc.make m4/gtk-doc.m4
 	dh_auto_clean
 
@@ -34,10 +33,6 @@
 override_dh_install:
 	cp $(CURDIR)/debian/77-mm-qdl-device-blacklist.rules \
 		 $(CURDIR)/debian/tmp/lib/udev/rules.d
-	if dpkg-vendor --is ubuntu; then \
-		cp $(CURDIR)/debian/ubuntu/modemmanager.upstart $(CURDIR)/debian; \
-		dh_link lib/systemd/system/ModemManager.service lib/systemd/system/modemmanager.service; \
-	fi
 	find $(CURDIR)/debian/tmp/ -name \*.a -exec rm {} \;
 	find $(CURDIR)/debian/tmp/ -name \*.la -exec rm {} \;
 	rm -f $(CURDIR)/debian/tmp/usr/lib/*/pppd/*/mm-test-pppd-plugin.*
diff -Nru modemmanager-1.4.12/debian/ubuntu/modemmanager.upstart modemmanager-1.4.12/debian/ubuntu/modemmanager.upstart
--- modemmanager-1.4.12/debian/ubuntu/modemmanager.upstart	2015-10-08 12:48:12.000000000 +0200
+++ modemmanager-1.4.12/debian/ubuntu/modemmanager.upstart	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-# modemmanager - modem manager
-#
-# The ModemManager daemon manages the system's mobile broadband connections
-# for NetworkManager.
-
-description	"modem connection manager"
-
-start on starting network-manager
-stop on stopped network-manager
-
-respawn
-
-pre-start script
-    [ -x /usr/sbin/ModemManager ] || stop
-end script
-
-exec /usr/sbin/ModemManager