[Pkg-bluetooth-commits] r862 - in /packages/bluez/trunk/debian: bluez.bluetooth.init bluez.preinst changelog

[filippo at users.alioth.debian.org]

Author: filippo
Date: Thu Jun 25 16:16:37 2009
New Revision: 862

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=862
Log:
* Fix "Bashisms in init script" (Closes: #534511)
* Handle upgrade of old /etc/modprobe.d/bluez (Closes: #523050)

Modified:
    packages/bluez/trunk/debian/bluez.bluetooth.init
    packages/bluez/trunk/debian/bluez.preinst
    packages/bluez/trunk/debian/changelog

Modified: packages/bluez/trunk/debian/bluez.bluetooth.init
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.bluetooth.init?rev=862&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.bluetooth.init (original)
+++ packages/bluez/trunk/debian/bluez.bluetooth.init Thu Jun 25 16:16:37 2009
@@ -156,9 +156,9 @@
 	fi
 	start_rfcomm || true
 
-	if [ "$HIDD_ENABLED" == "1" ] ||
-			[ "$PAND_ENABLED" == "1" ] ||
-			[ "$DUND_ENABLED" == "1" ]; then
+	if test "$HIDD_ENABLED" = "1" ||
+			test "$PAND_ENABLED" = "1" ||
+			test "$DUND_ENABLED" = "1"; then
 		log_progress_msg "compatibily daemons not started, see bluez-compat package"
 	fi
 

Modified: packages/bluez/trunk/debian/bluez.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.preinst?rev=862&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.preinst (original)
+++ packages/bluez/trunk/debian/bluez.preinst Thu Jun 25 16:16:37 2009
@@ -44,6 +44,19 @@
         rm_conffile bluez-utils "/etc/bluetooth/serial.service"
         rm_conffile bluez-utils "/etc/bluetooth/input.service"
     fi
+    
+    # now that modprobe whines remove this old conffile, will be
+    # http://bugs.debian.org/523050
+    base="/etc/modprobe.d/bluez"
+    rm_conffile "$base"
+    if [ -e "$base.dpkg-bak" ]; then
+        if [ -e "$base.conf" ]; then
+            echo "$base.conf exists, not touching"
+        else
+            echo "Moving $base.dpkg-bak to $base.conf"
+            mv -f "$base.dpkg-bak" "$base.conf"
+        fi
+    fi
 esac
 
 #DEBHELPER#

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=862&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Thu Jun 25 16:16:37 2009
@@ -1,3 +1,10 @@
+bluez (4.42-2) UNRELEASED; urgency=low
+
+  * Fix "Bashisms in init script" (Closes: #534511)
+  * Handle upgrade of old /etc/modprobe.d/bluez (Closes: #523050)
+
+ -- Filippo Giunchedi <filippo at debian.org>  Thu, 25 Jun 2009 18:08:42 +0200
+
 bluez (4.42-1) unstable; urgency=low
 
   * New upstream release