[Pkg-utopia-commits] r279 - packages/experimental/hal/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2005-08-27 15:20:12 +0000 (Sat, 27 Aug 2005)
New Revision: 279

Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/control
   packages/experimental/hal/debian/hal.preinst
   packages/experimental/hal/debian/hal.udev.rules
   packages/experimental/hal/debian/rules
Log:
* New upstream release
* Merge migration to udev RUN rules from the unstable package



Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2005-08-26 19:59:14 UTC (rev 278)
+++ packages/experimental/hal/debian/changelog	2005-08-27 15:20:12 UTC (rev 279)
@@ -1,3 +1,11 @@
+hal (0.5.4-1) experimental; urgency=low
+
+  * New upstream release 
+  * use udev RUN rules instead of the hotplug.d and dev.d script dirs
+  * Install hal-umount.sh in /usr/lib/hal instead of usr/lib/hal/hal-umount.sh
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 27 Aug 2005 17:07:50 +0200
+
 hal (0.5.2-1) experimental; urgency=low
 
   * New upstream release

Modified: packages/experimental/hal/debian/control
===================================================================
--- packages/experimental/hal/debian/control	2005-08-26 19:59:14 UTC (rev 278)
+++ packages/experimental/hal/debian/control	2005-08-27 15:20:12 UTC (rev 279)
@@ -7,7 +7,7 @@
 
 Package: hal
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev, dbus
+Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.063), dbus
 Suggests: hal-device-manager
 Description: Hardware Abstraction Layer
  HAL provides an abstract view on hardware.

Modified: packages/experimental/hal/debian/hal.preinst
===================================================================
--- packages/experimental/hal/debian/hal.preinst	2005-08-26 19:59:14 UTC (rev 278)
+++ packages/experimental/hal/debian/hal.preinst	2005-08-27 15:20:12 UTC (rev 279)
@@ -2,6 +2,27 @@
 
 set -e
 
+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
+    echo "Obsolete conffile $CONFFILE has been modified by you."
+    echo "Saving as $CONFFILE.dpkg-bak ..."
+    mv -f "$CONFFILE" "$CONFFILE".bak
+  else
+    echo "Removing obsolete conffile $CONFFILE ..."
+    rm -f "$CONFFILE"
+  fi
+fi
+
+case "$1" in
+install|upgrade)
+    if dpkg --compare-versions "$2" le "0.5.2-1"; then
+        rm_conffile "/etc/dev.d/block/hal-unmount.dev"
+    fi
+esac
+
+
 if [ "$1" = "upgrade" ]; then
   start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/hald
 fi

Modified: packages/experimental/hal/debian/hal.udev.rules
===================================================================
--- packages/experimental/hal/debian/hal.udev.rules	2005-08-26 19:59:14 UTC (rev 278)
+++ packages/experimental/hal/debian/hal.udev.rules	2005-08-27 15:20:12 UTC (rev 279)
@@ -1,3 +1,12 @@
+# hotplug.d and dev.d are obsolete, so simulate calling of the hal helpers
+ENV{SEQNUM}=="[0-9]*", ENV{UDEVD_EVENT}=="1", RUN+="/usr/lib/hal/hal.hotplug"
+
+# Only run the dev helper for real devices
+SYSFS{dev}=="*", RUN+="/usr/lib/hal/hal.dev"
+
+# unmount block devices when they are removed
+ENV{UDEVD_EVENT}=="1", SUBSYSTEM=="block",ACTION="remove", RUN+="/usr/lib/hal/hal-unmount.sh"
+
 # put removable IDE/SCSI devices into the hal group instead of 'disk'
 BUS="scsi",KERNEL="sd[a-z]*", PROGRAM="/etc/udev/scripts/device-removable.sh %k 'usb ieee1394'", RESULT="1", MODE="0640", GROUP="hal"
 # BUS="ide", KERNEL="hd[a-z]*", PROGRAM="/etc/udev/scripts/device-removable.sh  %k 'usb ieee1394'", RESULT="1", MODE="0640", GROUP="hal"

Modified: packages/experimental/hal/debian/rules
===================================================================
--- packages/experimental/hal/debian/rules	2005-08-26 19:59:14 UTC (rev 278)
+++ packages/experimental/hal/debian/rules	2005-08-27 15:20:12 UTC (rev 279)
@@ -31,3 +31,9 @@
 		$(DEB_DESTDIR)/etc/udev/scripts/device-removable.sh
 	install -m 644 -D debian/hal.udev.rules \
 		$(DEB_DESTDIR)/etc/udev/hal.rules
+	install -m 755 -D debian/hal-unmount.sh \
+		$(DEB_DESTDIR)/usr/lib/hal/hal-unmount.sh
+
+ # Don't put links in /etc/dev.d and /etc/hotplug.d
+	rm -rf $(DEB_DESTDIR)/etc/hotplug.d
+	rm -rf $(DEB_DESTDIR)/etc/dev.d