[Pkg-utopia-commits] r3176 - in /packages/experimental/hal/debian: changelog control hal.init hal.install patches/series rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Jul 28 02:49:44 2009
New Revision: 3176

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3176
Log:
Add support for GNU/kFreeBSD. (Closes: #528383)

Modified:
    packages/experimental/hal/debian/changelog
    packages/experimental/hal/debian/control
    packages/experimental/hal/debian/hal.init
    packages/experimental/hal/debian/hal.install
    packages/experimental/hal/debian/patches/series
    packages/experimental/hal/debian/rules

Modified: packages/experimental/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/changelog?rev=3176&op=diff
==============================================================================
--- packages/experimental/hal/debian/changelog (original)
+++ packages/experimental/hal/debian/changelog Tue Jul 28 02:49:44 2009
@@ -18,6 +18,7 @@
     - Removed, merged upstream.
   * debian/patches/23_addon_acpi.patch
     - Removed, merged upstream.
+  * Add support for GNU/kFreeBSD. (Closes: #528383)
 
  -- Michael Biebl <biebl at debian.org>  Tue, 28 Jul 2009 04:34:16 +0200
 

Modified: packages/experimental/hal/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/control?rev=3176&op=diff
==============================================================================
--- packages/experimental/hal/debian/control (original)
+++ packages/experimental/hal/debian/control Tue Jul 28 02:49:44 2009
@@ -32,7 +32,7 @@
 
 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
+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), pm-utils [!kfreebsd-amd64 !kfreebsd-i386], mount (>= 2.13) [!kfreebsd-amd64 !kfreebsd-i386], freebsd-utils [kfreebsd-amd64 kfreebsd-i386], policykit (>= 0.7), consolekit (>= 0.3), acl
 Recommends: eject, libsmbios-bin [amd64 i386 lpia]
 Suggests: gnome-device-manager
 Description: Hardware Abstraction Layer

Modified: packages/experimental/hal/debian/hal.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/hal.init?rev=3176&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.init (original)
+++ packages/experimental/hal/debian/hal.init Tue Jul 28 02:49:44 2009
@@ -48,7 +48,7 @@
 
 case "$1" in
   start)
-	if [ ! -d /proc/sys/fs/inotify ]; then
+	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 +57,7 @@
 		exit 0
 	fi
 	
-	if [ ! -d /sys/kernel ]; then
+	if [ ! -d /sys/kernel ] && [ `uname` = "Linux" ]; then
 		log_failure_msg "Can't start $DESC - sysfs not mounted on /sys"
 		exit 0
 	fi

Modified: packages/experimental/hal/debian/hal.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/hal.install?rev=3176&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.install (original)
+++ packages/experimental/hal/debian/hal.install Tue Jul 28 02:49:44 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/experimental/hal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/patches/series?rev=3176&op=diff
==============================================================================
--- packages/experimental/hal/debian/patches/series (original)
+++ packages/experimental/hal/debian/patches/series Tue Jul 28 02:49:44 2009
@@ -1,2 +1,3 @@
 10-no-polkit-policy-file-validate-check.patch
 40_readme_remove_hacking.patch
+50_kfreebsd.patch

Modified: packages/experimental/hal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/rules?rev=3176&op=diff
==============================================================================
--- packages/experimental/hal/debian/rules (original)
+++ packages/experimental/hal/debian/rules Tue Jul 28 02:49:44 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