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

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Fri Sep  3 03:15:54 2010
New Revision: 961

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=961
Log:
Update debian/bluez.bluetooth.init and debian/bluez.preinst.


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=961&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.bluetooth.init (original)
+++ packages/bluez/trunk/debian/bluez.bluetooth.init Fri Sep  3 03:15:54 2010
@@ -38,6 +38,8 @@
 SDPTOOL=/usr/bin/sdptool
 
 SSD_OPTIONS="--oknodo --quiet --exec $DAEMON"
+
+test -f /usr/sbin/bluetoothd || exit 0
 
 test -f /etc/default/bluetooth && . /etc/default/bluetooth
 test -f /etc/default/rcS && . /etc/default/rcS

Modified: packages/bluez/trunk/debian/bluez.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.preinst?rev=961&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.preinst (original)
+++ packages/bluez/trunk/debian/bluez.preinst Fri Sep  3 03:15:54 2010
@@ -48,7 +48,7 @@
     # now that modprobe whines remove this old conffile, will be
     # http://bugs.debian.org/523050
     base="/etc/modprobe.d/bluez"
-    rm_conffile "$base"
+    rm_conffile bluez "$base"
     if [ -e "$base.dpkg-bak" ]; then
         if [ -e "$base.conf" ]; then
             echo "$base.conf exists, not touching"

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=961&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Fri Sep  3 03:15:54 2010
@@ -1,3 +1,10 @@
+bluez (4.69-2) unstable; urgency=low
+
+  * Update debian/bluez.bluetooth.init (Closes: #593172).
+  * Update debian/bluez.preinst (Closes: #592982, #568301).
+
+ -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Fri, 03 Sep 2010 08:43:02 +0900
+
 bluez (4.69-1) unstable; urgency=low
 
   * New upstream release (Closes: #589727).