[Pkg-bluetooth-commits] r791 - in /packages/bluez/trunk/debian: bluez-alsa.preinst bluez-pcmcia-support.postinst bluez-utils.override bluez-utils.postrm bluez.override bluez.postinst bluez.preinst changelog compat rules

filippo at users.alioth.debian.org filippo at users.alioth.debian.org
Wed Apr 1 10:23:56 UTC 2009 

Author: filippo
Date: Wed Apr  1 10:23:56 2009
New Revision: 791

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=791
Log:
* Fix lintian warnings:
  - add -e to remaining maintainer scripts
  - remove full path to update-rc.d in debian/bluez.postinst
  - override "bluez-utils: maintainer-script-empty postrm" for transitional
    bluez-utils postrm
* Use 7 in debian/compat
* Fix debian/bluez.preinst to use dpkg-query, thus removing the lintian
  override

Added:
    packages/bluez/trunk/debian/bluez-utils.override
    packages/bluez/trunk/debian/compat
Removed:
    packages/bluez/trunk/debian/bluez.override
Modified:
    packages/bluez/trunk/debian/bluez-alsa.preinst
    packages/bluez/trunk/debian/bluez-pcmcia-support.postinst
    packages/bluez/trunk/debian/bluez-utils.postrm
    packages/bluez/trunk/debian/bluez.postinst
    packages/bluez/trunk/debian/bluez.preinst
    packages/bluez/trunk/debian/changelog
    packages/bluez/trunk/debian/rules

Modified: packages/bluez/trunk/debian/bluez-alsa.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-alsa.preinst?rev=791&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-alsa.preinst (original)
+++ packages/bluez/trunk/debian/bluez-alsa.preinst Wed Apr  1 10:23:56 2009
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # snippet from http://wiki.debian.org/DpkgConffileHandling
 

Modified: packages/bluez/trunk/debian/bluez-pcmcia-support.postinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-pcmcia-support.postinst?rev=791&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-pcmcia-support.postinst (original)
+++ packages/bluez/trunk/debian/bluez-pcmcia-support.postinst Wed Apr  1 10:23:56 2009
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/sh -e
 
 #DEBHELPER#

Added: packages/bluez/trunk/debian/bluez-utils.override
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-utils.override?rev=791&op=file
==============================================================================
--- packages/bluez/trunk/debian/bluez-utils.override (added)
+++ packages/bluez/trunk/debian/bluez-utils.override Wed Apr  1 10:23:56 2009
@@ -1,0 +1,2 @@
+# empty transitional postrm
+bluez-utils: maintainer-script-empty postrm

Modified: packages/bluez/trunk/debian/bluez-utils.postrm
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-utils.postrm?rev=791&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez-utils.postrm (original)
+++ packages/bluez/trunk/debian/bluez-utils.postrm Wed Apr  1 10:23:56 2009
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 #Dummy transitional postrm script
 #Don't do anything.

Modified: packages/bluez/trunk/debian/bluez.postinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.postinst?rev=791&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.postinst (original)
+++ packages/bluez/trunk/debian/bluez.postinst Wed Apr  1 10:23:56 2009
@@ -17,7 +17,7 @@
 case "$1" in
     configure)
         if [ -e /etc/init.d/bluez-utils ]; then
-            /usr/sbin/update-rc.d -f bluez-utils remove
+            update-rc.d -f bluez-utils remove
             # maybe a (medium/low debconf?) notice is best suited here
         fi
 

Modified: packages/bluez/trunk/debian/bluez.preinst
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.preinst?rev=791&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.preinst (original)
+++ packages/bluez/trunk/debian/bluez.preinst Wed Apr  1 10:23:56 2009
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # snippet from http://www.dpkg.org/dpkg/ConffileHandling
 
@@ -8,7 +8,7 @@
 
     if [ -e "$CONFFILE" ]; then
         md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`"
         if [ "$md5sum" = "$old_md5sum" ]; then
             rm -f "$CONFFILE"
         fi
@@ -44,16 +44,6 @@
         rm_conffile bluez-utils "/etc/bluetooth/serial.service"
         rm_conffile bluez-utils "/etc/bluetooth/input.service"
     fi
-
-    if dpkg --compare-versions "$2" lt "4.25-0ubuntu2"; then
-	if [ -e "/etc/udev/rules.d/62-bluez-hid2hci.rules" ]; then
-		if [ "`md5sum \"/etc/udev/rules.d/62-bluez-hid2hci.rules\" | sed -e \"s/ .*//\"`" = \
-		     "`dpkg-query -W -f='${Conffiles}' bluez | sed -n -e \"\\\\' /etc/udev/rules.d/62-bluez-hid2hci.rules's/.* //p\"`" ]
-		then
-			rm -f "/etc/udev/rules.d/62-bluez-hid2hci.rules"
-		fi
-	fi
-    fi
 esac
 
 #DEBHELPER#

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=791&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Wed Apr  1 10:23:56 2009
@@ -16,8 +16,16 @@
   * Update watch file to match bluez only
   * Add #DEBHELPER# to debian/bluez-utils.postrm
   * Update to S-V 3.8.1: no changes needed
+  * Fix lintian warnings:
+    - add -e to remaining maintainer scripts
+    - remove full path to update-rc.d in debian/bluez.postinst
+    - override "bluez-utils: maintainer-script-empty postrm" for transitional
+      bluez-utils postrm
+  * Use 7 in debian/compat
+  * Fix debian/bluez.preinst to use dpkg-query, thus removing the lintian
+    override
 
- -- Filippo Giunchedi <filippo at debian.org>  Wed, 01 Apr 2009 11:11:50 +0200
+ -- Filippo Giunchedi <filippo at debian.org>  Wed, 01 Apr 2009 12:20:01 +0200
 
 bluez (4.29-0ubuntu1) jaunty; urgency=low
 

Added: packages/bluez/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/compat?rev=791&op=file
==============================================================================
--- packages/bluez/trunk/debian/compat (added)
+++ packages/bluez/trunk/debian/compat Wed Apr  1 10:23:56 2009
@@ -1,0 +1,1 @@
+7

Modified: packages/bluez/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/rules?rev=791&op=diff
==============================================================================
--- packages/bluez/trunk/debian/rules (original)
+++ packages/bluez/trunk/debian/rules Wed Apr  1 10:23:56 2009
@@ -44,7 +44,8 @@
 
 	install -D -m 0755 $(CURDIR)/test/agent $(CURDIR)/debian/bluez/usr/bin/bluetooth-agent
 
-	install -D -m 0644 $(CURDIR)/debian/bluez.override $(CURDIR)/debian/bluez/usr/share/lintian/overrides/bluez
+install/bluez-utils::
+	install -D -m 0644 $(CURDIR)/debian/bluez-utils.override $(CURDIR)/debian/bluez-utils/usr/share/lintian/overrides/bluez-utils
 
 install/bluez-alsa::
 	install -D -m 0644 $(CURDIR)/audio/asound.conf $(CURDIR)/debian/bluez-alsa/usr/share/alsa/bluetooth.conf

More information about the Pkg-bluetooth-commits mailing list