[Pkg-bluetooth-commits] r707 - in /packages/bluez-utils/trunk/debian: bluez-utils.postinst bluez-utils.preinst changelog

[filippo at users.alioth.debian.org]

Author: filippo
Date: Thu Apr 17 17:05:39 2008
New Revision: 707

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=707
Log:
3.30-3 uploaded to archive, update accordingly

Modified:
    packages/bluez-utils/trunk/debian/bluez-utils.postinst
    packages/bluez-utils/trunk/debian/bluez-utils.preinst
    packages/bluez-utils/trunk/debian/changelog

Modified: packages/bluez-utils/trunk/debian/bluez-utils.postinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.postinst?rev=707&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.postinst (original)
+++ packages/bluez-utils/trunk/debian/bluez-utils.postinst Thu Apr 17 17:05:39 2008
@@ -1,4 +1,5 @@
 #!/bin/sh
+# snippet from http://www.dpkg.org/dpkg/ConffileHandling
 
 # Move a conffile without triggering a dpkg question
 mv_conffile() {
@@ -19,9 +20,14 @@
             /usr/sbin/update-rc.d -f bluez-utils remove
             # maybe a (medium/low debconf?) notice is best suited here
         fi
-        mv_conffile "/etc/init.d/bluez-utils" "/etc/init.d/bluetooth"
-        mv_conffile "/etc/default/bluez-utils" "/etc/default/bluetooth"
-        mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf" "/etc/dbus-1/system.d/bluetooth.conf"
+        #if dpkg --compare-versions "$2" le "2.19-1"; then
+        #   mv_conffile "/etc/init.d/bluez-utils" "/etc/init.d/bluetooth"
+        #   mv_conffile "/etc/default/bluez-utils" "/etc/default/bluetooth"
+        #fi
+
+        if dpkg --compare-versions "$2" le "3.7-1"; then
+            mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf" "/etc/dbus-1/system.d/bluetooth.conf"
+        fi
 
         # update modules.conf
         /sbin/update-modules >/dev/null 2>&1
@@ -36,10 +42,6 @@
             invoke-rc.d dbus force-reload || true
         fi
 
-#        if [ -r /etc/bluetooth/pin ]; then
-#            echo "Converting default outgoing PIN to default passkey:"
-#            cp -v /etc/bluetooth/pin /etc/bluetooth/passkeys/default
-#        fi
         ;;
 
     *)

Modified: packages/bluez-utils/trunk/debian/bluez-utils.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/bluez-utils.preinst?rev=707&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/bluez-utils.preinst (original)
+++ packages/bluez-utils/trunk/debian/bluez-utils.preinst Thu Apr 17 17:05:39 2008
@@ -1,30 +1,30 @@
 #!/bin/sh
 
-# snippet from http://www.dpkg.org/ConffileHandling
+# snippet from http://www.dpkg.org/dpkg/ConffileHandling
 
 # Prepare to move a conffile without triggering a dpkg question
 prep_mv_conffile() {
-	CONFFILE="$1"
+    CONFFILE="$1"
 
-	if [ -e "$CONFFILE" ]; then
-		md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-		old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
-		if [ "$md5sum" = "$old_md5sum" ]; then
-			rm -f "$CONFFILE"
-		fi
-	fi
+    if [ -e "$CONFFILE" ]; then
+        md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+        if [ "$md5sum" = "$old_md5sum" ]; then
+            rm -f "$CONFFILE"
+        fi
+    fi
 }
 
 case "$1" in
 install|upgrade)
-	if dpkg --compare-versions "$2" le "2.19-1"; then
-		prep_mv_conffile "/etc/init.d/bluez-utils"
-		prep_mv_conffile "/etc/default/bluez-utils"
-	fi
-	
-	if dpkg --compare-versions "$2" le "3.7-1"; then
-		prep_mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf"
-	fi
+    #if dpkg --compare-versions "$2" le "2.19-1"; then
+    #   prep_mv_conffile "/etc/init.d/bluez-utils"
+    #   prep_mv_conffile "/etc/default/bluez-utils"
+    #fi
+
+    if dpkg --compare-versions "$2" le "3.7-1"; then
+        prep_mv_conffile "/etc/dbus-1/system.d/bluez-hcid.conf"
+    fi
 esac
-        
+
 #DEBHELPER#

Modified: packages/bluez-utils/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez-utils/trunk/debian/changelog?rev=707&op=diff
==============================================================================
--- packages/bluez-utils/trunk/debian/changelog (original)
+++ packages/bluez-utils/trunk/debian/changelog Thu Apr 17 17:05:39 2008
@@ -1,13 +1,20 @@
-bluez-utils (3.30-2exp1) experimental; urgency=low
+bluez-utils (3.30-3exp1) experimental; urgency=low
 
   [ Filippo Giunchedi ]
   * New upstream release
-    + fix audio recording (Closes: #464501)
   * Enable services inside hcid, replacing old racy daemons and change init
     script accordingly (Closes: #454727)
-  * Add watch file
 
  -- Filippo Giunchedi <filippo at debian.org>  Tue, 15 Apr 2008 17:33:47 +0200
+
+bluez-utils (3.30-3) unstable; urgency=low
+
+  * Add watch file 
+  * Properly guard in bluez-utils.postinst before moving a conffile 
+    (Closes: #415480)
+  * Comment conffile renaming for versions <= 2.19
+
+ -- Filippo Giunchedi <filippo at debian.org>  Thu, 17 Apr 2008 18:33:47 +0200
 
 bluez-utils (3.30-2) unstable; urgency=low