[Pkg-utopia-commits] r345 - in packages/experimental/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-10-30 22:23:09 +0000 (Sun, 30 Oct 2005)
New Revision: 345

Added:
   packages/experimental/hal/debian/patches/hdm-python2.4.patch
Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/control
   packages/experimental/hal/debian/hal.postinst
Log:
Build hal-device-manager again

Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2005-10-28 14:14:09 UTC (rev 344)
+++ packages/experimental/hal/debian/changelog	2005-10-30 22:23:09 UTC (rev 345)
@@ -6,8 +6,12 @@
     + Install hal-find-by-capability and hal-find-by-property
     + Translation updates for hal-device-manager.desktop
   * Never restart dbus in postinst or postrm . Only reload it's config.
+  * Depend on libusb-dev to build hald-addon-usb-csr (Closes: #335530)
+  * Build hal-device-manager again. 
+  * debian/patches/hdm-python2.4.patch
+    + Force hal-device-manager to use python2.4
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 28 Oct 2005 16:06:38 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 30 Oct 2005 23:22:23 +0100
 
 hal (0.5.4-2) experimental; urgency=low
 

Modified: packages/experimental/hal/debian/control
===================================================================
--- packages/experimental/hal/debian/control	2005-10-28 14:14:09 UTC (rev 344)
+++ packages/experimental/hal/debian/control	2005-10-30 22:23:09 UTC (rev 345)
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 4.2.32), cdbs, python2.4, python2.4-dbus (>= 0.34), libdbus-glib-1-dev (>= 0.34), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22) 
+Build-Depends: debhelper (>= 4.2.32), cdbs, python2.4, python2.4-dbus (>= 0.34), libdbus-glib-1-dev (>= 0.34), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22), libusb-dev
 Standards-Version: 3.6.1.0
 
 Package: hal
@@ -18,21 +18,21 @@
  It maintains a list of devices that currently exist, and can provide
  information about those upon request.
 
-#Package: hal-device-manager
-#Architecture: all
-#Depends: ${shlibs:Depends}, ${python:Depends}, python2.4-dbus (>= 0.34), python2.4-gnome2, python2.4-glade2, hal
-#Conflicts: hal (<< 0.5) 
-#Description: Hardware Abstraction Layer user interface
-# HAL provides an abstract view on hardware.
-# .
-# This abstraction layer is simply an interface that makes it possible to
-# add support for new devices and new ways of connecting devices to the
-# computer, without modifying every application that uses the device.
-# It maintains a list of devices that currently exist, and can provide
-# information about those upon request.
-# .
-# This package provides a user interface which shows the information HAL knows
-# about the devices on the system.
+Package: hal-device-manager
+Architecture: all
+Depends: ${shlibs:Depends}, ${python:Depends}, python2.4-dbus (>= 0.34), python2.4-gnome2, python2.4-glade2, hal
+Conflicts: hal (<< 0.5) 
+Description: Hardware Abstraction Layer user interface
+ HAL provides an abstract view on hardware.
+ .
+ This abstraction layer is simply an interface that makes it possible to
+ add support for new devices and new ways of connecting devices to the
+ computer, without modifying every application that uses the device.
+ It maintains a list of devices that currently exist, and can provide
+ information about those upon request.
+ .
+ This package provides a user interface which shows the information HAL knows
+ about the devices on the system.
 
 Package: hal-doc
 Architecture: all

Modified: packages/experimental/hal/debian/hal.postinst
===================================================================
--- packages/experimental/hal/debian/hal.postinst	2005-10-28 14:14:09 UTC (rev 344)
+++ packages/experimental/hal/debian/hal.postinst	2005-10-30 22:23:09 UTC (rev 345)
@@ -44,7 +44,7 @@
     if [ ! -e /var/run/hal/hald.pid ] || ! ps --no-headers -p $(< /var/run/hal/hald.pid) > /dev/null ; then
         if [ -x /etc/init.d/dbus ]; then
             invoke-rc.d dbus reload || true
-            /etc/dbus-1/even.d/20hal start || true
+            /etc/dbus-1/event.d/20hal start || true
         fi
     fi
 

Added: packages/experimental/hal/debian/patches/hdm-python2.4.patch
===================================================================
--- packages/experimental/hal/debian/patches/hdm-python2.4.patch	2005-10-28 14:14:09 UTC (rev 344)
+++ packages/experimental/hal/debian/patches/hdm-python2.4.patch	2005-10-30 22:23:09 UTC (rev 345)
@@ -0,0 +1,9 @@
+diff -ruN hal-0.5.4-old/tools/device-manager/hal-device-manager hal-0.5.4/tools/device-manager/hal-device-manager
+--- hal-0.5.4-old/tools/device-manager/hal-device-manager	2005-08-26 17:51:51.000000000 +0200
++++ hal-0.5.4/tools/device-manager/hal-device-manager	2005-10-30 18:56:39.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ 
+ """This is the main executable for DeviceManager. GTK+/Glade code is based
+ on simplepy from Shannon -jj Behrens <jjinux at yahoo.com>"""