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

Fri Feb 17 21:23:20 UTC 2006

Author: sjoerd
Date: 2006-02-17 21:23:19 +0000 (Fri, 17 Feb 2006)
New Revision: 606

Added:
   packages/experimental/hal/debian/run-hald.sh
Removed:
   packages/experimental/hal/debian/hal.udev.device-removable.sh
Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/hal.postinst
   packages/experimental/hal/debian/hal.postrm
   packages/experimental/hal/debian/hal.preinst
Log:
* CVS snapshot
* debian/patches/01_hal_privsep.patch
* Sync with Ubuntu 
  + Remove unneeded build-depends (libsysfs-dev and libcap-dev)
  + force-reload dbus instead of reload
  + Remove obsolete fdi example conffile
  + Add small utility script to run hald from the debian dir.

Modified: packages/experimental/hal/debian/changelog
===================================================================

--- packages/experimental/hal/debian/changelog	2006-02-17 21:06:05 UTC (rev 605)
+++ packages/experimental/hal/debian/changelog	2006-02-17 21:23:19 UTC (rev 606)
@@ -1,7 +1,7 @@
 hal (0.5.6+cvs20060217-1) experimental; urgency=low
 
-  * CVS snapshot 
-  * debian/patches/01_hal_privsep.patch 
+  * CVS snapshot
+  * debian/patches/01_hal_privsep.patch
     + Removed. Fixed upstream
   * debian/patches/03_storage_sigio.patch
     + Removed. Fixed upstream
@@ -9,8 +9,13 @@
     + Removed. Fixed upstream
   * debian/patches/05_hald_clear_udev_buffer.patch
     + Removed. Fixed upstream
+  * Sync with Ubuntu 
+    + Remove unneeded build-depends (libsysfs-dev and libcap-dev)
+    + force-reload dbus instead of reload
+    + Remove obsolete fdi example conffile
+    + Add small utility script to run hald from the debian dir.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 17 Feb 2006 21:56:49 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 17 Feb 2006 22:06:47 +0100
 
 hal (0.5.6-4) unstable; urgency=high
 

Modified: packages/experimental/hal/debian/hal.postinst
===================================================================
--- packages/experimental/hal/debian/hal.postinst	2006-02-17 21:06:05 UTC (rev 605)
+++ packages/experimental/hal/debian/hal.postinst	2006-02-17 21:23:19 UTC (rev 606)
@@ -39,7 +39,7 @@
     fi
  
     if [ -x /etc/init.d/dbus ]; then
-      invoke-rc.d dbus reload || true
+      invoke-rc.d dbus force-reload || true
       /etc/dbus-1/event.d/20hal start || true
     fi
 

Modified: packages/experimental/hal/debian/hal.postrm
===================================================================
--- packages/experimental/hal/debian/hal.postrm	2006-02-17 21:06:05 UTC (rev 605)
+++ packages/experimental/hal/debian/hal.postrm	2006-02-17 21:23:19 UTC (rev 606)
@@ -4,7 +4,7 @@
 
 # Do not restart dbus on upgrades, only if we remove the package.
 if [ -x /etc/init.d/dbus ]; then
-  invoke-rc.d dbus reload || true
+  invoke-rc.d dbus force-reload || true
 fi
 
 #DEBHELPER#

Modified: packages/experimental/hal/debian/hal.preinst
===================================================================
--- packages/experimental/hal/debian/hal.preinst	2006-02-17 21:06:05 UTC (rev 605)
+++ packages/experimental/hal/debian/hal.preinst	2006-02-17 21:23:19 UTC (rev 606)
@@ -21,11 +21,15 @@
 case "$1" in
 install|upgrade)
     if dpkg --compare-versions "$2" le "0.5.2-1"; then
+        rm_conffile "/etc/hal/fdi/preferences.fdi"
         rm_conffile "/etc/dev.d/block/hal-unmount.dev"
     fi
     if dpkg --compare-versions "$2" le "0.5.6-2"; then
         rm_conffile "/etc/udev/scripts/device-removable.sh" 
     fi
+    if dpkg --compare-versions "$2" le "0.5.6-4"; then
+        rm_conffile "/etc/hal/fdi/preferences.fdi"
+    fi
 esac
 
 

Deleted: packages/experimental/hal/debian/hal.udev.device-removable.sh
===================================================================
--- packages/experimental/hal/debian/hal.udev.device-removable.sh	2006-02-17 21:06:05 UTC (rev 605)
+++ packages/experimental/hal/debian/hal.udev.device-removable.sh	2006-02-17 21:23:19 UTC (rev 606)
@@ -1,52 +0,0 @@
-#!/bin/sh -e
-# print "1" if device $1 is either removable or attached to a bus listed
-# in $2 (e.g. 'ieee1394 usb') and "0" otherwise.
-
-# check if the device $1 is on the bus $2
-# this is done by checking if any of the devices on the bus is a prefix
-# of the device
-on_bus() {
-  local BUSDEVP="/sys/bus/$2/devices"
-  for link in $BUSDEVP/*; do
-    [ -L "$link" ] || continue
-    if echo "$1" | grep -q "^$(readlink -f $link)/"; then
-      return 0
-    fi
-  done
-  return 1
-}
-
-# read the first line of the file $1
-read_value() {
-  local value
-  read -r value < $1 || true
-  echo $value
-}
-
-# strip the partition number, if present
-DEV="${1%[0-9]*}"
-SCAN_BUS="$2"
-
-BLOCKPATH="/sys/block/$DEV"
-
-[ -d $BLOCKPATH ] || exit 1
-
-IS_REMOVABLE=$(read_value $BLOCKPATH/removable)
-
-if [ "$IS_REMOVABLE" != 1 -a "$SCAN_BUS" ]; then
-  DEVICE="$(readlink -f "${BLOCKPATH}/device")"
-  for bus in $SCAN_BUS; do
-    if on_bus $DEVICE $bus; then
-      IS_REMOVABLE=1
-      break
-    fi
-  done
-fi
-
-if [ "$IS_REMOVABLE" = "1" ]; then
-  echo 1
-else
-  echo 0
-fi
-
-exit 0

Added: packages/experimental/hal/debian/run-hald.sh
===================================================================
--- packages/experimental/hal/debian/run-hald.sh	2006-02-17 21:06:05 UTC (rev 605)
+++ packages/experimental/hal/debian/run-hald.sh	2006-02-17 21:23:19 UTC (rev 606)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cd build-tree/hal-*/hald
+export HALD_RUNNER_PATH=linux2:linux2/probing:linux2/addons:.:../tools:../tools/linux
+export PATH=../hald-runner:$PATH
+export HAL_FDI_SOURCE_PREPROBE=../fdi/preprobe
+export HAL_FDI_SOURCE_INFORMATION=../fdi/information
+export HAL_FDI_SOURCE_POLICY=../fdi/policy
+./hald --daemon=no --verbose=yes
+


