[Pkg-utopia-commits] r53 - packages/hal/trunk/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2004-10-28 15:23:59 -0600 (Thu, 28 Oct 2004)
New Revision: 53

Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/hal.postinst
   packages/hal/trunk/debian/rules
Log:
Merge the fixes from 0.2.98-6

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-10-28 20:21:34 UTC (rev 52)
+++ packages/hal/trunk/debian/changelog	2004-10-28 21:23:59 UTC (rev 53)
@@ -1,6 +1,10 @@
-hal (0.4.0-2) UNRELEASED; urgency=low
+hal (0.4.0-2) experimental; urgency=low
 
   * debian/hald.8: Fixed typos
+  * debian/rules: Correctly generate the python dependencies for
+                  hal-device-manager
+  * debian/hal.postinst: Don't fail when the dbus-1 init script isn't 
+                         available yet
 
  -- Sjoerd Simons <sjoerd@debian.org>  Tue, 19 Oct 2004 16:59:21 +0200
 

Modified: packages/hal/trunk/debian/hal.postinst
===================================================================
--- packages/hal/trunk/debian/hal.postinst	2004-10-28 20:21:34 UTC (rev 52)
+++ packages/hal/trunk/debian/hal.postinst	2004-10-28 21:23:59 UTC (rev 53)
@@ -38,7 +38,9 @@
 		mv /etc/init.d/hal /etc/dbus-1/event.d/
 		update-rc.d hal remove
 	fi
-	invoke-rc.d dbus-1 restart
+  if [ -x /etc/init.d/dbus-1 ]; then
+   	invoke-rc.d dbus-1 restart || true
+  fi
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
 

Modified: packages/hal/trunk/debian/rules
===================================================================
--- packages/hal/trunk/debian/rules	2004-10-28 20:21:34 UTC (rev 52)
+++ packages/hal/trunk/debian/rules	2004-10-28 21:23:59 UTC (rev 53)
@@ -11,7 +11,7 @@
                              --enable-hotplug-map  \
                              --with-pid-file=/var/run/hal/hald.pid
 
-binary-predeb/hal::
+binary-predeb/hal-device-manager::
 	dh_python -phal-device-manager
 
 common-install-impl::