Merge lp:~broder/ubuntu/precise/bluez/bluez-respawn into lp:ubuntu/precise/bluez

[Evan Broder]

Eliminate the /etc/default/bluetooth conffile - Upstart shouldn't be using /etc/default files just to enable/disable a job.

To smooth out the transition, if bluez has been disabled using /etc/default/bluetooth, migrate that setting to an Upstart override file.

I can upload this change myself, but I'd like a second pair of eyes to make sure I handled the fiddlier parts of the maintainer scripts correctly.

[Timo Aaltonen (tjaalton)]

looks good, though I'm used to doing the version comparison against the new version and not the 'latest broken one'

[Evan Broder (broder)]

Thanks for the feedback, Timo. I agree - it's not how I usually write those comparisons either, but it's what dpkg-maintscript-helper does, so I wanted to be consistent between my code and the autogenerated stuff.

I'll go ahead and upload this, then.

=== removed file 'debian/bluez.bluetooth.default'
--- debian/bluez.bluetooth.default	2009-06-30 20:05:13 +0000
+++ debian/bluez.bluetooth.default	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# Defaults for bluez
-
-# start bluetooth on boot?
-# compatibility note: if this variable is _not_ found bluetooth will start
-BLUETOOTH_ENABLED=1
-
-# This setting used to switch HID devices (e.g mouse/keyboad) to HCI mode, that
-# is you will have bluetooth functionality from your dongle instead of only
-# HID. This is accomplished for supported devices by udev in
-# /lib/udev/rules.d/62-bluez-hid2hci.rules by invoking hid2hci with correct
-# parameters.
-# See /usr/share/doc/bluez/NEWS.Debian.gz for further information.
-
-# Older daemons like pand dund and hidd can be found in bluez-compat package as
-# they are deprecated and provided for backward compatibility only.
-
-# Note that not every bluetooth dongle is capable of switching back to HID mode,
-# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=355497
-HID2HCI_ENABLED=0
-HID2HCI_UNDO=0

=== modified file 'debian/bluez.bluetooth.upstart'
--- debian/bluez.bluetooth.upstart	2012-01-24 11:31:04 +0000
+++ debian/bluez.bluetooth.upstart	2012-03-05 19:44:31 +0000
@@ -9,18 +9,10 @@
 env RFCOMM_CONF=/etc/bluetooth/rfcomm.conf
 
 expect fork
+respawn
 
 exec /usr/sbin/bluetoothd
 
-pre-start script
-	test -f /etc/default/bluetooth && . /etc/default/bluetooth || :
-
-	if [ "$BLUETOOTH_ENABLED" = "0" ];
-	then
-		exit 1
-	fi
-end script
-
 post-start script
 	[ "$VERBOSE" = no ] && redirect='>/dev/null 2>&1' || redirect=
 

=== added file 'debian/bluez.maintscript'
--- debian/bluez.maintscript	1970-01-01 00:00:00 +0000
+++ debian/bluez.maintscript	2012-03-05 19:44:31 +0000
@@ -0,0 +1,1 @@
+rm_conffile /etc/default/bluetooth 4.98-2ubuntu1

=== added file 'debian/bluez.postrm'
--- debian/bluez.postrm	1970-01-01 00:00:00 +0000
+++ debian/bluez.postrm	2012-03-05 19:44:31 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh
+# postrm script for bluez
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|failed-upgrade|disappear)
+    ;;
+
+    purge)
+        if [ "$(cat /etc/init/bluetooth.override)" = "$(printf "# Inserted by bluez\nmanual\n")" ]; then
+            rm -f /etc/init/bluetooth.override
+        fi
+    ;;
+
+    abort-install|abort-upgrade)
+        if dpkg --compare-versions "$2" le-nl 4.98-2ubuntu1; then
+            perl -i -0pe 's/# Inserted by bluez\nmanual\n//' /etc/init/bluetooth.override
+        fi
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== added file 'debian/bluez.preinst'
--- debian/bluez.preinst	1970-01-01 00:00:00 +0000
+++ debian/bluez.preinst	2012-03-05 19:44:31 +0000
@@ -0,0 +1,45 @@
+#!/bin/sh
+# preinst script for bluez
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+        if dpkg --compare-versions "$2" le-nl 4.98-2ubuntu1; then
+            (
+                test -f /etc/default/bluetooth && . /etc/default/bluetooth
+                if [ "$BLUETOOTH_ENABLED" = 0 ] &&
+                    (! [ -f /etc/init/bluetooth.override ] ||
+                        ! grep -q -e "start on" -e "manual" /etc/init/bluetooth.override); then
+                    printf "# Inserted by bluez\nmanual\n" >> /etc/init/bluetooth.override
+                fi
+            )
+        fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

=== modified file 'debian/changelog'
--- debian/changelog	2012-02-22 10:51:07 +0000
+++ debian/changelog	2012-03-05 19:44:31 +0000
@@ -1,3 +1,15 @@
+bluez (4.98-2ubuntu2) precise; urgency=low
+
+  [ Pali Rohár ]
+  * Respawn bluetooth daemon if crashed.
+
+  [ Evan Broder ]
+  * Eliminate the /etc/default/bluetooth conffile as it's not the Upstart
+    way. Transition the BLUETOOTH_ENABLED variable to an Upstart override
+    variable if it's been changed.
+
+ -- Evan Broder <[e-mail]>  Sat, 03 Mar 2012 18:48:55 -0800
+
 bluez (4.98-2ubuntu1) precise; urgency=low
 
   * Merge with Debian unstable. Remaining Ubuntu changes:

=== modified file 'debian/control'
--- debian/control	2012-02-22 10:51:07 +0000
+++ debian/control	2012-03-05 19:44:31 +0000
@@ -72,6 +72,7 @@
 
 Package: bluez
 Architecture: amd64 armel i386 ia64 mips mipsel powerpc s390 s390x sparc alpha armhf avr32 hppa m68k powerpcspe sh4 sparc64 ppc64
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, module-init-tools, udev (>= 170-1), lsb-base, dbus, python-gobject, python-dbus
 Replaces: bluez-input, bluez-network, bluez-serial, bluez-utils (<= 3.36-3), bluez-audio (<= 3.36-3), udev (<< 170-1)
 Conflicts: bluez-utils (<= 3.36-3), bluez-audio (<= 3.36-3)