[Pkg-utopia-commits] r3055 - in /packages/unstable/hal/debian: changelog hal.install hal.preinst rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Apr  8 08:18:49 2009
New Revision: 3055

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3055
Log:
Install udev rules file into /lib/udev/rules.d

Remove the existing conffile on upgrades.

Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/hal.install
    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=3055&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Wed Apr  8 08:18:49 2009
@@ -22,6 +22,8 @@
       accessible to root.
   * debian/rules
     - Change pid file to /var/run/hald/hald.pid
+    - Remove obsolete configure switches.
+    - Install udev rules file into /lib/udev/rules.d/.
   * debian/hal.postinst
     - Change the home directory of haldaemon to /var/run/hald and update it on
       upgrades.
@@ -61,6 +63,9 @@
     - Add --direct option to hal-set-property which will be required by X to
       correctly set the keymap. (Closes: #513928)
       Thanks to Julien Cristau for the patch.
+  * debian/hal.preinst
+    - Remove obsolete conffile /etc/udev/rules.d/90-hal.rules. The rules file
+      is now installed in /lib/udev/rules.d/.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 07 Jan 2009 23:55:22 +0100
 

Modified: packages/unstable/hal/debian/hal.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.install?rev=3055&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.install (original)
+++ packages/unstable/hal/debian/hal.install Wed Apr  8 08:18:49 2009
@@ -5,5 +5,6 @@
 debian/tmp/usr/lib/hal/
 debian/tmp/usr/share/hal/fdi/
 debian/tmp/usr/share/PolicyKit/
+debian/tmp/lib/udev/rules.d/
 debian/preferences.fdi  etc/hal/fdi/policy
 debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi usr/share/hal/fdi/policy/10osvendor

Modified: packages/unstable/hal/debian/hal.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.preinst?rev=3055&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.preinst (original)
+++ packages/unstable/hal/debian/hal.preinst Wed Apr  8 08:18:49 2009
@@ -45,6 +45,9 @@
       rm_conffile "/etc/udev/hal.rules"
       rm -f /etc/udev/rules.d/z99_hal.rules
     fi
+    if dpkg --compare-versions "$2" lt "0.5.12~git20090406.46dc48-1"; then
+      rm_conffile "/etc/udev/rules.d/90-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=3055&op=diff
==============================================================================
--- packages/unstable/hal/debian/rules (original)
+++ packages/unstable/hal/debian/rules Wed Apr  8 08:18:49 2009
@@ -18,7 +18,8 @@
                              --enable-acl-management \
                              --enable-umount-helper \
                              --enable-docbook-docs \
-                             --docdir=/usr/share/doc/hal-doc
+                             --docdir=/usr/share/doc/hal-doc \
+                             --with-udev-prefix=/lib
 
 DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 1 .