[Pkg-utopia-commits] r2350 - in /packages/unstable/hal/debian: changelog hal.links hal.preinst hal.udev.rules rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jul  9 01:56:03 2008
New Revision: 2350

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2350
Log:
* Remove our custom udev rules file and use the one provided by upstream.
  - debian/hal.udev.rules: Remove, no longer needed.
  - debian/rules: Remove the installation of the udev rules file.
  - debian/hal.links: No longer create the symlink
    /etc/udev/rules.d/z99_hal.rules. The upstream udev rules file is now
    directly installed as /etc/udev/rules.d/90-hal.rules.
  - debian/hal.preinst: Remove the conffile /etc/udev/hal.rules and the
    z99_hal.rules symlink on upgrades.

Removed:
    packages/unstable/hal/debian/hal.udev.rules
Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/hal.links
    packages/unstable/hal/debian/hal.preinst
    packages/unstable/hal/debian/rules

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=2350&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Wed Jul  9 01:56:03 2008
@@ -1,3 +1,16 @@
+hal (0.5.11-3) UNRELEASED; urgency=low
+
+  * Remove our custom udev rules file and use the one provided by upstream.
+    - debian/hal.udev.rules: Remove, no longer needed.
+    - debian/rules: Remove the installation of the udev rules file.
+    - debian/hal.links: No longer create the symlink
+      /etc/udev/rules.d/z99_hal.rules. The upstream udev rules file is now
+      directly installed as /etc/udev/rules.d/90-hal.rules.
+    - debian/hal.preinst: Remove the conffile /etc/udev/hal.rules and the
+      z99_hal.rules symlink on upgrades.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 09 Jul 2008 03:43:44 +0200
+
 hal (0.5.11-2) unstable; urgency=low
 
   * debian/patches/01_hal_debian_dbuspolicy.patch 

Modified: packages/unstable/hal/debian/hal.links
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.links?rev=2350&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.links (original)
+++ packages/unstable/hal/debian/hal.links Wed Jul  9 01:56:03 2008
@@ -1,2 +1,1 @@
-/etc/udev/hal.rules etc/udev/rules.d/z99_hal.rules
 /usr/sbin/umount.hal sbin/umount.hal

Modified: packages/unstable/hal/debian/hal.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.preinst?rev=2350&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.preinst (original)
+++ packages/unstable/hal/debian/hal.preinst Wed Jul  9 01:56:03 2008
@@ -44,6 +44,10 @@
       fi
       rm_conffile "/etc/dbus-1/event.d/20hal"
     fi
+    if dpkg --compare-versions "$2" le "0.5.11-3"; then
+      rm_conffile "/etc/udev/hal.rules"
+      rm /etc/hal/udev/rules.d/z99_hal.rules
+    fi
 esac
 
 #DEBHELPER#

Modified: packages/unstable/hal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/rules?rev=2350&op=diff
==============================================================================
--- packages/unstable/hal/debian/rules (original)
+++ packages/unstable/hal/debian/rules Wed Jul  9 01:56:03 2008
@@ -23,13 +23,6 @@
 
 DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 0 1 6 .
 
-common-install-impl::
-	# Remove hal's default udev rules files.. We ship our own
-	rm -rf $(DEB_DESTDIR)/etc/udev
-
-	install -m 644 -D debian/hal.udev.rules \
-		$(DEB_DESTDIR)/etc/udev/hal.rules
-
 install/hal::
 	# Remove executable bit as this is nothing that can be executed
 	chmod -x $(DEB_DESTDIR)/usr/lib/hal/scripts/hal-functions