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

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Thu Aug 6 01:03:56 UTC 2009 

Author: biebl
Date: Thu Aug  6 01:03:56 2009
New Revision: 3198

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3198
Log:
Merged revisions 3174-3187,3194-3196 via svnmerge from 
svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/experimental/hal

........
  r3174 | biebl | 2009-07-28 04:43:12 +0200 (Di, 28 Jul 2009) | 14 lines
  
  * New upstream release.
    - Fix crash when assembling certain MD devices. (Closes: #522136)
    - Fixes for GNU/kFreeBSD.
    - Set default udev_prefix to ${exec_prefix}/lib in configure.in.
    - Define new (sub-)namespace(s) and policy for smart card readers.
    - Ignore ADD events if there is already a device with same sysfs_path.
    - probe-volume: remove needless check for empty fstype.
    - Use $libexecdir not $libdir/hal to define private hal directory.
    - Various startup speedups.
    - Add hal-set-property --direct.
    - addon-acpi.c: Support acpid.
    - 10-x11-input.fdi: Add tablets.
    - Add input.keys capability to input buttons.
    - Add support for devices on the SSB and ibme bus.
........
  r3175 | biebl | 2009-07-28 04:45:55 +0200 (Di, 28 Jul 2009) | 4 lines
  
  * debian/patches/11-direct-hal-set-propery.patch
    - Removed, merged upstream.
  * debian/patches/23_addon_acpi.patch
    - Removed, merged upstream.
........
  r3176 | biebl | 2009-07-28 04:49:44 +0200 (Di, 28 Jul 2009) | 1 line
  
  Add support for GNU/kFreeBSD. (Closes: #528383)
........
  r3177 | biebl | 2009-07-28 04:51:10 +0200 (Di, 28 Jul 2009) | 2 lines
  
  * debian/control
    - Change Build-Depends from libvolume-id-dev to libblkid-dev (>= 1.43).
........
  r3178 | biebl | 2009-07-28 04:54:28 +0200 (Di, 28 Jul 2009) | 3 lines
  
  - Forgot to add 50_kfreebsd.patch in r3176, so doing it now
  - Refresh 10-no-polkit-policy-file-validate-check.patch
........
  r3179 | biebl | 2009-07-28 05:06:30 +0200 (Di, 28 Jul 2009) | 1 line
  
  Bump Standards-Version to 3.8.2. No further changes.
........
  r3180 | biebl | 2009-07-28 05:10:55 +0200 (Di, 28 Jul 2009) | 1 line
  
  Wrap hal dependencies.
........
  r3181 | biebl | 2009-07-28 05:35:23 +0200 (Di, 28 Jul 2009) | 3 lines
  
  * debian/hal.init
    - Refactor safety checks into a separate function and make sure they are
      also run on restart. (Closes: #537251)
........
  r3182 | biebl | 2009-07-28 05:40:23 +0200 (Di, 28 Jul 2009) | 2 lines
  
  Use s-s-d's --retry option on stop which allows us to safely remove the
  ugly "sleep 1" between start and stop within restart.
........
  r3183 | biebl | 2009-07-28 05:49:14 +0200 (Di, 28 Jul 2009) | 3 lines
  
  * debian/patches/20_cpufreq_warning_message_fix.patch
    - Fix a misleading warning message in ondemand_set_consider_nice().
      (Closes: #532999)
........
  r3184 | biebl | 2009-07-28 05:54:43 +0200 (Di, 28 Jul 2009) | 2 lines
  
  Demote pm-utils to Recommends now that pm-utils is in the laptop and
  desktop task and Recommends are installed by default. (Closes: #477913)
........
  r3185 | biebl | 2009-07-28 05:57:44 +0200 (Di, 28 Jul 2009) | 1 line
  
  Give aurel and kibi credit for the kbsd patches
........
  r3186 | biebl | 2009-07-28 06:00:47 +0200 (Di, 28 Jul 2009) | 2 lines
  
  Forgot to actually add 20_cpufreq_warning_message_fix.patch
........
  r3187 | biebl | 2009-07-29 01:52:37 +0200 (Mi, 29 Jul 2009) | 1 line
  
  Upload to experimental
........
  r3194 | mpitt | 2009-07-29 09:09:11 +0200 (Mi, 29 Jul 2009) | 3 lines
  
  debian/control: Drop libsmbios-dev from build depends.  Kernel 2.6.30
  provides dell_laptop kernel module which exports these interfaces into
  standard "generic" ones. Drop recommends for libsmbios-bin.
........
  r3195 | mpitt | 2009-07-29 09:11:02 +0200 (Mi, 29 Jul 2009) | 3 lines
  
  debian/control: Bump libblkid-dev build dep to >= 2.15  as done by
  upstream recently; 1.43 was a synthetic version number before the
  util-linux release number was determined.
........
  r3196 | mpitt | 2009-07-29 09:30:01 +0200 (Mi, 29 Jul 2009) | 2 lines
  
  debian/hal.init: Check for /sys/devices, not /sys/kernel. The latter
  doesn't exist in OpenVZ. (LP: #399629)
........

Added:
    packages/unstable/hal/debian/patches/20_cpufreq_warning_message_fix.patch
      - copied unchanged from r3196, packages/experimental/hal/debian/patches/20_cpufreq_warning_message_fix.patch
    packages/unstable/hal/debian/patches/50_kfreebsd.patch
      - copied unchanged from r3196, packages/experimental/hal/debian/patches/50_kfreebsd.patch
Removed:
    packages/unstable/hal/debian/patches/11-direct-hal-set-propery.patch
    packages/unstable/hal/debian/patches/23_addon_acpi.patch
Modified:
    packages/unstable/hal/   (props changed)
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/control
    packages/unstable/hal/debian/hal.init
    packages/unstable/hal/debian/hal.install
    packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch
    packages/unstable/hal/debian/patches/series
    packages/unstable/hal/debian/rules

Propchange: packages/unstable/hal/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug  6 01:03:56 2009
@@ -1,1 +1,1 @@
-/packages/experimental/hal:1-3173
+/packages/experimental/hal:1-3197

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3198&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Thu Aug  6 01:03:56 2009
@@ -1,3 +1,56 @@
+hal (0.5.13-2) UNRELEASED; urgency=low
+
+  [ Martin Pitt ]
+  * debian/control: Drop libsmbios-dev from build depends.  Kernel 2.6.30
+    provides dell_laptop kernel module which exports these interfaces into
+    standard "generic" ones. Drop recommends for libsmbios-bin.
+  * debian/control: Bump libblkid-dev build dep to >= 2.15  as done by
+    upstream recently; 1.43 was a synthetic version number before the
+    util-linux release number was determined.
+  * debian/hal.init: Check for /sys/devices, not /sys/kernel. The latter
+    doesn't exist in OpenVZ. (LP: #399629)
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 29 Jul 2009 09:08:39 +0200
+
+hal (0.5.13-1) experimental; urgency=low
+
+  * New upstream release.
+    - Fix crash when assembling certain MD devices. (Closes: #522136)
+    - Fixes for GNU/kFreeBSD.
+    - Set default udev_prefix to ${exec_prefix}/lib in configure.in.
+    - Define new (sub-)namespace(s) and policy for smart card readers.
+    - Ignore ADD events if there is already a device with same sysfs_path.
+    - probe-volume: remove needless check for empty fstype.
+    - Use $libexecdir not $libdir/hal to define private hal directory.
+    - Various startup speedups.
+    - Add hal-set-property --direct.
+    - addon-acpi.c: Support acpid.
+    - 10-x11-input.fdi: Add tablets.
+    - Add input.keys capability to input buttons.
+    - Add support for devices on the SSB and ibme bus.
+  * debian/patches/11-direct-hal-set-propery.patch
+    - Removed, merged upstream.
+  * debian/patches/23_addon_acpi.patch
+    - Removed, merged upstream.
+  * Add support for GNU/kFreeBSD. (Closes: #528383)
+    Thanks to Aurelien Jarno and Cyril Brulebois for the patch(es).
+  * debian/control
+    - Change Build-Depends from libvolume-id-dev to libblkid-dev (>= 1.43).
+    - Bump Standards-Version to 3.8.2. No further changes.
+    - Wrap hal dependencies.
+    - Demote pm-utils to Recommends now that pm-utils is in the laptop and
+      desktop task and Recommends are installed by default. (Closes: #477913)
+  * debian/hal.init
+    - Refactor safety checks into a separate function and make sure they are
+      also run on restart. (Closes: #537251)
+    - Use s-s-d's --retry option on stop which allows us to safely remove the
+      ugly "sleep 1" between start and stop within restart.
+  * debian/patches/20_cpufreq_warning_message_fix.patch
+    - Fix a misleading warning message in ondemand_set_consider_nice().
+      (Closes: #532999)
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 28 Jul 2009 06:03:06 +0200
+
 hal (0.5.12~git20090406.46dc48-2) unstable; urgency=low
 
   * debian/hal.postinst 

Modified: packages/unstable/hal/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/control?rev=3198&op=diff
==============================================================================
--- packages/unstable/hal/debian/control (original)
+++ packages/unstable/hal/debian/control Thu Aug  6 01:03:56 2009
@@ -16,24 +16,36 @@
  doxygen,
  intltool (>= 0.22),
  libusb-dev [!hurd-i386],
- libvolume-id-dev,
+ libblkid-dev (>= 2.15),
  xmlto,
  libxml2-utils,
  gtk-doc-tools,
- libsmbios-dev (>= 2.0.3) [amd64 i386 lpia],
  gperf,
  quilt,
  libpolkit-dev (>= 0.7),
  libck-connector-dev (>= 0.3)
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/hal
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal
 Homepage: http://hal.freedesktop.org/
 
 Package: hal
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, pciutils, usbutils, udev (>= 0.125), dbus (>= 0.61), lsb-base (>= 3.2-14), hal-info (>= 20070402), pm-utils, mount (>= 2.13), policykit (>= 0.7), consolekit (>= 0.3), acl
-Recommends: eject, libsmbios-bin [amd64 i386 lpia]
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ adduser,
+ pciutils,
+ usbutils,
+ udev (>= 0.125) [!kfreebsd-amd64 !kfreebsd-i386],
+ dbus (>= 0.61),
+ lsb-base (>= 3.2-14),
+ hal-info (>= 20070402),
+ mount (>= 2.13) [!kfreebsd-amd64 !kfreebsd-i386],
+ freebsd-utils [kfreebsd-amd64 kfreebsd-i386],
+ policykit (>= 0.7),
+ consolekit (>= 0.3),
+ acl
+Recommends: eject,
+ pm-utils [!kfreebsd-amd64 !kfreebsd-i386]
 Suggests: gnome-device-manager
 Description: Hardware Abstraction Layer
  HAL provides an abstract view on hardware.

Modified: packages/unstable/hal/debian/hal.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.init?rev=3198&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.init (original)
+++ packages/unstable/hal/debian/hal.init Thu Aug  6 01:03:56 2009
@@ -42,13 +42,12 @@
 }
 
 do_stop() {
-	start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \
-		--exec $DAEMON 
+	start-stop-daemon --stop --retry 5 --oknodo --quiet --pidfile $PIDFILE \
+		--exec $DAEMON
 }
 
-case "$1" in
-  start)
-	if [ ! -d /proc/sys/fs/inotify ]; then
+check_prerequisites() {
+	if [ ! -d /proc/sys/fs/inotify ] && [ `uname` = "Linux" ]; then
 		log_failure_msg "Can't start $DESC - enable inotify support in your kernel"
 		exit 0
 	fi
@@ -57,7 +56,7 @@
 		exit 0
 	fi
 	
-	if [ ! -d /sys/kernel ]; then
+	if [ ! -d /sys/devices ] && [ `uname` = "Linux" ]; then
 		log_failure_msg "Can't start $DESC - sysfs not mounted on /sys"
 		exit 0
 	fi
@@ -66,7 +65,11 @@
 		log_failure_msg "Can't start $DESC - detected chrooted session"
 		exit 0
 	fi
-	
+}
+
+case "$1" in
+  start)
+	check_prerequisites
 	log_daemon_msg "Starting $DESC" "$NAME"
 	do_start
 	log_end_msg $?
@@ -77,9 +80,9 @@
 	log_end_msg $?
 	;;
   restart|force-reload)
+	check_prerequisites
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	do_stop
-	sleep 1
 	do_start
 	log_end_msg $?
 	;;

Modified: packages/unstable/hal/debian/hal.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.install?rev=3198&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.install (original)
+++ packages/unstable/hal/debian/hal.install Thu Aug  6 01:03:56 2009
@@ -5,6 +5,7 @@
 debian/tmp/usr/lib/hal/
 debian/tmp/usr/share/hal/fdi/
 debian/tmp/usr/share/PolicyKit/
-debian/tmp/lib/udev/rules.d/
+# Now conditionally installed from debian/rules:
+# debian/tmp/lib/udev/rules.d/
 debian/preferences.fdi  etc/hal/fdi/policy
 debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi usr/share/hal/fdi/policy/10osvendor

Modified: packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch?rev=3198&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch (original)
+++ packages/unstable/hal/debian/patches/10-no-polkit-policy-file-validate-check.patch Thu Aug  6 01:03:56 2009
@@ -1,8 +1,8 @@
-Index: hal-0.5.12/configure.in
+Index: hal-0.5.13/configure.in
 ===================================================================
---- hal-0.5.12.orig/configure.in	2009-03-16 04:22:46.000000000 +0100
-+++ hal-0.5.12/configure.in	2009-03-16 04:23:02.000000000 +0100
-@@ -589,7 +589,7 @@
+--- hal-0.5.13.orig/configure.in	2009-07-15 08:52:51.000000000 +0200
++++ hal-0.5.13/configure.in	2009-07-17 01:40:33.000000000 +0200
+@@ -590,7 +590,7 @@
     AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
  		 [polkit-policy-file-validate], [polkit-policy-file-validate])
     if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
@@ -11,11 +11,11 @@
     fi
  fi
  
-Index: hal-0.5.12/configure
+Index: hal-0.5.13/configure
 ===================================================================
---- hal-0.5.12.orig/configure	2009-03-16 04:22:46.000000000 +0100
-+++ hal-0.5.12/configure	2009-03-16 04:23:12.000000000 +0100
-@@ -19507,9 +19507,8 @@
+--- hal-0.5.13.orig/configure	2009-07-15 09:03:05.000000000 +0200
++++ hal-0.5.13/configure	2009-07-17 01:40:33.000000000 +0200
+@@ -19511,9 +19511,8 @@
  
  
     if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then

Modified: packages/unstable/hal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/series?rev=3198&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/series (original)
+++ packages/unstable/hal/debian/patches/series Thu Aug  6 01:03:56 2009
@@ -1,4 +1,4 @@
 10-no-polkit-policy-file-validate-check.patch
-23_addon_acpi.patch
+20_cpufreq_warning_message_fix.patch
 40_readme_remove_hacking.patch
-11-direct-hal-set-propery.patch
+50_kfreebsd.patch

Modified: packages/unstable/hal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/rules?rev=3198&op=diff
==============================================================================
--- packages/unstable/hal/debian/rules (original)
+++ packages/unstable/hal/debian/rules Thu Aug  6 01:03:56 2009
@@ -30,3 +30,9 @@
 	# properly support non-US keyboard layouts (see also: #442316). 
 	rm -f $(DEB_DESTDIR)/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
 
+binary-install/hal::
+	# Only install udev rules on Linux architectures. The
+	# directory doesn't even exist on e.g. GNU/kFreeBSD
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+	dh_install -phal debian/tmp/lib/udev/rules.d/
+endif

More information about the Pkg-utopia-commits mailing list