[Pkg-utopia-commits] r1457 - in /packages/unstable/hal/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed May 2 09:08:49 UTC 2007 

Author: biebl
Date: Wed May  2 09:08:48 2007
New Revision: 1457

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1457
Log:
Merge the changes from the exp branch into unstable:
svn merge -r1286:1455  svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/hal

Added:
    packages/unstable/hal/debian/patches/10_repeated_property_changed_signals.patch
      - copied unchanged from r1455, packages/experimental/hal/debian/patches/10_repeated_property_changed_signals.patch
    packages/unstable/hal/debian/patches/11_fix_luks_mounting.patch
      - copied unchanged from r1455, packages/experimental/hal/debian/patches/11_fix_luks_mounting.patch
    packages/unstable/hal/debian/patches/12_powerscripts_quirks.patch
      - copied unchanged from r1455, packages/experimental/hal/debian/patches/12_powerscripts_quirks.patch
    packages/unstable/hal/debian/patches/55_nonpolkit-mount-policy.patch
      - copied unchanged from r1455, packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch
Removed:
    packages/unstable/hal/debian/hald.8
    packages/unstable/hal/debian/lshal.1
    packages/unstable/hal/debian/patches/03_macbookpro_configure.patch
    packages/unstable/hal/debian/patches/04_cd_write.patch
    packages/unstable/hal/debian/patches/05_one_formfactor_fallback.patch
    packages/unstable/hal/debian/patches/06_smbios_return.patch
    packages/unstable/hal/debian/patches/07_ppc_suspend.patch
    packages/unstable/hal/debian/patches/08_openfirmware.patch
    packages/unstable/hal/debian/patches/09_check_hashtable_initialisation.patch
    packages/unstable/hal/debian/patches/10_callout_errors.patch
    packages/unstable/hal/debian/patches/11_no_useless_runner_errors.patch
    packages/unstable/hal/debian/patches/12_pegasus_pmu_crash_fix.patch
    packages/unstable/hal/debian/patches/13_hal_callout_bashism.patch
    packages/unstable/hal/debian/patches/15_partition_probing.patch
    packages/unstable/hal/debian/patches/19_sonypi_support.patch
    packages/unstable/hal/debian/patches/24_dbus_connection_close.patch
    packages/unstable/hal/debian/patches/25_correctly_free_lists.patch
    packages/unstable/hal/debian/patches/26_fix_hald_not_running_coredump.patch
    packages/unstable/hal/debian/patches/27_hal_fix_dbus_error_is_set.patch
    packages/unstable/hal/debian/patches/29_handle_non_hal_mounts.patch
    packages/unstable/hal/debian/patches/30_cdrom_bogus_tocinfo.patch
Modified:
    packages/unstable/hal/debian/   (props changed)
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/control
    packages/unstable/hal/debian/hal-doc.install
    packages/unstable/hal/debian/hal-doc.links
    packages/unstable/hal/debian/hal.dirs
    packages/unstable/hal/debian/hal.install
    packages/unstable/hal/debian/hal.manpages
    packages/unstable/hal/debian/libhal-dev.install
    packages/unstable/hal/debian/libhal-storage-dev.install
    packages/unstable/hal/debian/patches/02_powerscripts.patch
    packages/unstable/hal/debian/rules

Propchange: packages/unstable/hal/debian/
------------------------------------------------------------------------------
    svn-bp:tagsUrl = svn+ssh://svn.debian.org/svn/pkg-utopia/tags/hal

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Wed May  2 09:08:48 2007
@@ -1,3 +1,64 @@
+hal (0.5.9-1) experimental; urgency=low
+
+  * New upstream release.
+    - Fixes detection of wireless devices with dscape stack. (Closes: #399507)
+    - Adds support for fuse mounts. (Closes: #418570)
+    - Adds support for new sysfs layout of kernels > 2.6.20. (Closes: #410868)
+  * Patches removed as they were applied or fixed upstream:
+    - debian/patches/03_macbookpro_configure.patch
+    - debian/patches/04_cd_write.patch
+    - debian/patches/05_one_formfactor_fallback.patch
+    - debian/patches/06_smbios_return.patch
+    - debian/patches/07_ppc_suspend.patch
+    - debian/patches/08_openfirmware.patch
+    - debian/patches/09_check_hashtable_initialisation.patch
+    - debian/patches/10_callout_errors.patch
+    - debian/patches/11_no_useless_runner_errors.patch
+    - debian/patches/12_pegasus_pmu_crash_fix.patch
+    - debian/patches/13_hal_callout_bashism.patch
+    - debian/patches/15_partition_probing.patch
+    - debian/patches/24_dbus_connection_close.patch
+    - debian/patches/25_correctly_free_lists.patch
+    - debian/patches/26_fix_hald_not_running_coredump.patch
+    - debian/patches/27_hal_fix_dbus_error_is_set.patch
+    - debian/patches/29_handle_non_hal_mounts.patch
+    - debian/patches/30_cdrom_bogus_tocinfo.patch
+  * Revised patches:
+    - debian/patches/02_powerscripts.patch
+    - debian/patches/55_nonpolkit-mount-policy.patch
+    - debian/patches/14_power_suspend_linux_pmu_fix.patch
+  * debian/patches/19_sonypi_support.patch
+    - Removed. Instead of relying on the external spicctrl tool, /dev/sonypi
+      is used directly now by the hal-system-sonypic addon.
+  * Patches taken from upstream:
+    - debian/patches/10_repeated_property_changed_signals.patch
+      + Do not trigger the "device_property_changed" signal twice.
+    - debian/patches/11_fix_luks_mounting.patch
+      + Fix the lock checking for LUKS setup/teardown.
+    - debian/patches/12_powerscripts_quirks.patch
+      + Pass the correct quirks to pm-supend and pm-hibernate.
+  * debian/control
+    - Add Depends: hal-info (>= 20070402) to hal package.
+    - Change the Build-Depends: docbook-utils to xmlto which is now used for
+      building the API documentation.
+  * debian/libhal(-storage)-dev.install
+    - Do not install libtool *.la files anymore.
+  * debian/rules
+    - Remove cdbs tarball.mk rules file.
+    - Cleanup obsolete rm commands from common-install-impl.
+  * debian/hal.install
+    - Install the binaries hal-disable-polling, hal-is-caller-locked-out and
+      hal-lock.
+  * debian/hal.dirs
+    - Create the directories /var/cache/hald (fdi files cache) and
+      /var/lib/hal (dev acl management list). 
+  * debian/hald.8, debian/lshal.1
+    - Removed. Shipped upstream. 
+  * debian/hal.manpages
+    - Install upstream manpages. (Closes: #277399)
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 03 Apr 2007 09:31:47 +0200
+
 hal (0.5.8.1-9) unstable; urgency=low
 
   * debian/no-cd-media-check.fdi

Modified: packages/unstable/hal/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/control?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/control (original)
+++ packages/unstable/hal/debian/control Wed May  2 09:08:48 2007
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Sjoerd Simons <sjoerd at debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs, python-support (>= 0.5.3), python-dbus, libdbus-glib-1-dev (>= 0.60), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22), libusb-dev, libvolume-id-dev, linux-kernel-headers (>= 2.6.17), python, docbook-utils, docbook-xml, libxml2-utils
+Build-Depends: debhelper (>= 5.0.37.2), cdbs, python-support (>= 0.5.3), python-dbus, libdbus-glib-1-dev (>= 0.60), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22), libusb-dev, libvolume-id-dev, linux-kernel-headers (>= 2.6.17), python, xmlto, libxml2-utils
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/hal
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal
 
 Package: hal
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.065), dbus (>= 0.60-1), lsb-base
+Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.065), dbus (>= 0.60-1), lsb-base, hal-info (>= 20070402)
 Recommends: eject
 Suggests: hal-device-manager
 Description: Hardware Abstraction Layer

Modified: packages/unstable/hal/debian/hal-doc.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal-doc.install?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal-doc.install (original)
+++ packages/unstable/hal/debian/hal-doc.install Wed May  2 09:08:48 2007
@@ -1,2 +1,3 @@
-debian/tmp/usr/share/doc/hal-*/* usr/share/doc/hal-doc
-debian/tmp/usr/share/gtk-doc/html/hal/* usr/share/doc/hal-doc/api
+debian/tmp/usr/share/doc/hal-doc
+debian/tmp/usr/share/gtk-doc/html/libhal usr/share/doc/hal-doc/api
+debian/tmp/usr/share/gtk-doc/html/libhal-storage usr/share/doc/hal-doc/api

Modified: packages/unstable/hal/debian/hal-doc.links
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal-doc.links?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal-doc.links (original)
+++ packages/unstable/hal/debian/hal-doc.links Wed May  2 09:08:48 2007
@@ -1,1 +1,2 @@
-usr/share/doc/hal-doc/api usr/share/gtk-doc/html/hal
+usr/share/doc/hal-doc/api/libhal usr/share/gtk-doc/html/libhal
+usr/share/doc/hal-doc/api/libhal-storage usr/share/gtk-doc/html/libhal-storage

Modified: packages/unstable/hal/debian/hal.dirs
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.dirs?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.dirs (original)
+++ packages/unstable/hal/debian/hal.dirs Wed May  2 09:08:48 2007
@@ -1,1 +1,2 @@
-/etc/hal/fdi
+/var/cache/hald
+/var/lib/hal

Modified: packages/unstable/hal/debian/hal.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.install?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.install (original)
+++ packages/unstable/hal/debian/hal.install Wed May  2 09:08:48 2007
@@ -5,6 +5,9 @@
 debian/tmp/usr/bin/hal-set-property
 debian/tmp/usr/bin/hal-find-by-capability
 debian/tmp/usr/bin/hal-find-by-property
+debian/tmp/usr/bin/hal-disable-polling
+debian/tmp/usr/bin/hal-is-caller-locked-out
+debian/tmp/usr/bin/hal-lock
 debian/tmp/usr/sbin/
 debian/tmp/usr/lib/hal/
 debian/tmp/usr/share/hal/fdi

Modified: packages/unstable/hal/debian/hal.manpages
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.manpages?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.manpages (original)
+++ packages/unstable/hal/debian/hal.manpages Wed May  2 09:08:48 2007
@@ -1,2 +1,9 @@
-debian/hald.8
-debian/lshal.1
+debian/tmp/usr/share/man/man8/hald.8
+debian/tmp/usr/share/man/man1/hal-disable-polling.1
+debian/tmp/usr/share/man/man1/hal-find-by-capability.1
+debian/tmp/usr/share/man/man1/hal-find-by-property.1
+debian/tmp/usr/share/man/man1/hal-get-property.1
+debian/tmp/usr/share/man/man1/hal-is-caller-locked-out.1
+debian/tmp/usr/share/man/man1/hal-lock.1
+debian/tmp/usr/share/man/man1/hal-set-property.1
+debian/tmp/usr/share/man/man1/lshal.1

Modified: packages/unstable/hal/debian/libhal-dev.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/libhal-dev.install?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/libhal-dev.install (original)
+++ packages/unstable/hal/debian/libhal-dev.install Wed May  2 09:08:48 2007
@@ -1,5 +1,4 @@
 debian/tmp/usr/include/hal/libhal.h
 debian/tmp/usr/lib/pkgconfig/hal.pc
 debian/tmp/usr/lib/libhal.so
-debian/tmp/usr/lib/libhal.la
 debian/tmp/usr/lib/libhal.a

Modified: packages/unstable/hal/debian/libhal-storage-dev.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/libhal-storage-dev.install?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/libhal-storage-dev.install (original)
+++ packages/unstable/hal/debian/libhal-storage-dev.install Wed May  2 09:08:48 2007
@@ -1,5 +1,4 @@
 debian/tmp/usr/include/hal/libhal-storage.h
 debian/tmp/usr/lib/pkgconfig/hal-storage.pc
 debian/tmp/usr/lib/libhal-storage.so
-debian/tmp/usr/lib/libhal-storage.la
 debian/tmp/usr/lib/libhal-storage.a

Modified: packages/unstable/hal/debian/patches/02_powerscripts.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/02_powerscripts.patch?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/02_powerscripts.patch (original)
+++ packages/unstable/hal/debian/patches/02_powerscripts.patch Wed May  2 09:08:48 2007
@@ -1,13 +1,14 @@
-diff -u hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux build-tree/hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux
---- hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux	2006-09-19 22:23:25.000000000 +0200
-+++ build-tree/hal-0.5.8.1/tools/linux/hal-system-power-hibernate-linux	2007-03-06 02:02:12.000000000 +0100
-@@ -39,19 +39,27 @@
+diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
+index 250e191..1adf908 100755
+--- a/tools/linux/hal-system-power-hibernate-linux
++++ b/tools/linux/hal-system-power-hibernate-linux
+@@ -54,27 +54,35 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/fedora-release ] \
  
  #Other distros just need to have *any* tools installed
  else
 -	if [ -x "/usr/bin/powersave" ] ; then
 +	if [ -x "/usr/sbin/pm-hibernate" ] ; then
-+		/usr/sbin/pm-hibernate
++		/usr/sbin/pm-hibernate $QUIRKS
 +		RET=$?
 +	elif [ -x "/usr/bin/powersave" ] ; then
  	        $POWERSAVED_SUSPEND2DISK
@@ -16,51 +17,83 @@
  		/usr/sbin/pmi action hibernate force
  		RET=$?
 -	elif [ -x "/usr/sbin/pm-hibernate" ] ; then
--		/usr/sbin/pm-hibernate
+-		/usr/sbin/pm-hibernate $QUIRKS
 -		RET=$?
  	elif [ -x "/usr/sbin/hibernate" ] ; then
  		# Suspend2 tools installed
  		/usr/sbin/hibernate --force
  		RET=$?
++	elif [ -x "/etc/acpi/hibernate.sh" ] ; then
++		# acpi-support installed
++		/etc/acpi/hibernate.sh force
++		RET=$?
 +	elif [ -x "/usr/sbin/s2disk" ] ; then
 +		# uswsusp tools installed
 +		/usr/sbin/s2disk
 +		RET=$?
-+	elif [ -x "/etc/acpi/hibernate.sh" ] ; then
-+		# acpi-support installed
-+		/etc/acpi/hibernate.sh force
-+		RET=$?
  	elif [ -w "/sys/power/state" ] ; then
  		# Use the raw kernel sysfs interface
  		echo "disk" > /sys/power/state
-diff -u hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux build-tree/hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux
---- hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux	2006-09-19 22:23:25.000000000 +0200
-+++ build-tree/hal-0.5.8.1/tools/linux/hal-system-power-suspend-linux	2007-03-06 02:02:01.000000000 +0100
-@@ -80,12 +80,26 @@
+ 		RET=$?
+ 	else
+ 		unsupported
+-		fi
+ 	fi
++fi
+ 
+ #Refresh devices as a resume can do funny things
+ for type in button battery ac_adapter
+diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
+index 8139842..2b2bdfb 100755
+--- a/tools/linux/hal-system-power-suspend-linux
++++ b/tools/linux/hal-system-power-suspend-linux
+@@ -86,24 +86,36 @@ elif [ -f "/etc/redhat-release" ] || [ -f "/etc/fedora-release" ] \
  
  #Other distros just need to have *any* tools installed
  else
 -	if [ -x "/usr/bin/powersave" ] ; then
+-	    $POWERSAVED_SUSPEND2RAM
+-	    RET=$?
+-	elif [ -x "/usr/sbin/pmi" ] ; then
+-	    /usr/sbin/pmi action suspend force
+-	    RET=$?
+-	elif [ -x "/usr/sbin/pm-suspend" ] ; then
 +	if [ -x "/usr/sbin/pm-suspend" ] ; then
-+		/usr/sbin/pm-suspend
+ 		/usr/sbin/pm-suspend $QUIRKS
+ 		RET=$?
++	elif [ -x "/usr/bin/powersave" ] ; then
++		$POWERSAVED_SUSPEND2RAM
 +		RET=$?
-+	elif [ -x "/usr/bin/powersave" ] ; then
- 	    $POWERSAVED_SUSPEND2RAM
- 	    RET=$?
- 	elif [ -x "/usr/sbin/pmi" ] ; then
- 	    /usr/sbin/pmi action suspend force
- 	    RET=$?
++	elif [ -x "/usr/sbin/pmi" ] ; then
++		/usr/sbin/pmi action suspend force
++		RET=$?
 +	elif [ -x "/usr/sbin/hibernate" ] ; then
-+	    # Use hibernate configured for suspend-to-ram
-+	    /usr/sbin/hibernate -F/etc/hibernate/ram.conf
-+	    RET=$?
++		# Use hibernate configured for suspend-to-ram
++		/usr/sbin/hibernate -F/etc/hibernate/ram.conf
++		RET=$?
++	elif [ -x "/etc/acpi/sleep.sh" ] ; then
++		# Use acpi-support for suspend to ram 
++		/etc/acpi/sleep.sh force
++		RET=$?
 +	elif [ -x "/usr/sbin/s2ram" ] ; then
-+	    /usr/sbin/s2ram
-+	   RET=$?
-+	elif [ -x "/etc/acpi/sleep.sh" ] ; then
-+	    # Use acpi-support for suspend to ram 
-+	    /etc/acpi/sleep.sh force
-+	    RET=$?
++		# uswsusp tools installed
++		/usr/sbin/s2ram
++		RET=$?
  	elif [ -w "/sys/power/state" ] ; then
- 	    # Use the raw kernel sysfs interface
- 	    echo "mem" > /sys/power/state
+-	    # Use the raw kernel sysfs interface
+-	    echo "mem" > /sys/power/state
+-	    RET=$?
++		# Use the raw kernel sysfs interface
++		echo "mem" > /sys/power/state
++		RET=$?
+ 	else
+-	    # TODO: add other scripts support
+-	    unsupported
+-	    fi
++		# TODO: add other scripts support
++		unsupported
+ 	fi
++fi
+ 
+ #Refresh devices as a resume can do funny things
+ for type in button battery ac_adapter

Modified: packages/unstable/hal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/rules?rev=1457&op=diff
==============================================================================
--- packages/unstable/hal/debian/rules (original)
+++ packages/unstable/hal/debian/rules Wed May  2 09:08:48 2007
@@ -1,8 +1,5 @@
 #!/usr/bin/make -f
 
-DEB_TAR_SRCDIR=hal-0.5.8.1
-
-include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -14,16 +11,14 @@
                              --with-hwdata=/usr/share/misc \
                              --without-macbookpro \
                              --disable-policy-kit \
-                             --enable-docbook-docs
+                             --disable-console-kit \
+                             --enable-docbook-docs \
+                             --docdir=/usr/share/doc/hal-doc
 
 binary-install/hal-device-manager::
 	dh_pysupport -phal-device-manager /usr/share/hal/device-manager/
 
 common-install-impl::
-	# 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
-	rm -rf $(DEB_DESTDIR)/usr/lib/hal/hal.hotplug
 	# Remove hal's default udev rules files.. We ship our own
 	rm -rf $(DEB_DESTDIR)/etc/udev

More information about the Pkg-utopia-commits mailing list