[arch-commits] Commit in hal/repos (3 files)

[Thomas Baechler]

    Date: Friday, September 12, 2008 @ 14:03:33
  Author: thomas
Revision: 12315

Merged revisions 12308,12313 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/hal/trunk

........
  r12308 | thomas | 2008-09-12 19:40:43 +0200 (Fr, 12 Sep 2008) | 1 line
  
  complete the hal/udev fix
........
  r12313 | thomas | 2008-09-12 20:02:36 +0200 (Fr, 12 Sep 2008) | 1 line
  
  upgpkg: hal 0.5.11-3
........

Modified:
  hal/repos/testing-x86_64/	(properties)
  hal/repos/testing-x86_64/PKGBUILD
  hal/repos/testing-x86_64/fix-udev-compatibility.patch

------------------------------+
 PKGBUILD                     |    4 ++--
 fix-udev-compatibility.patch |   30 +++++++++++++-----------------
 2 files changed, 15 insertions(+), 19 deletions(-)


Property changes on: hal/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /hal/trunk:1-12300
   + /hal/trunk:1-12314

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-09-12 18:02:58 UTC (rev 12314)
+++ testing-x86_64/PKGBUILD	2008-09-12 18:03:33 UTC (rev 12315)
@@ -4,7 +4,7 @@
 
 pkgname=hal
 pkgver=0.5.11
-pkgrel=2
+pkgrel=3
 pkgdesc="Hardware Abstraction Layer"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
@@ -26,7 +26,7 @@
          'c688a3c6574699365926f4fef7441545'
          '4d4b6801a1cedca22b8bdd9db73b16fb'
          '4242a2c78885e396f639d0cd5e33218c'
-         '000573c32080fdc5846f44dafcf515b8')
+         '1a33d73fa422df2f05b7e3483836f778')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}

Modified: testing-x86_64/fix-udev-compatibility.patch
===================================================================
--- testing-x86_64/fix-udev-compatibility.patch	2008-09-12 18:02:58 UTC (rev 12314)
+++ testing-x86_64/fix-udev-compatibility.patch	2008-09-12 18:03:33 UTC (rev 12315)
@@ -1,17 +1,7 @@
-From: Danny Kukawka <danny.kukawka at web.de>
-Date: Wed, 27 Aug 2008 19:24:33 +0000 (+0200)
-Subject: use udevadm instead of (deprecated) udevinfo
-X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=f6af40c1e7ea54e69eb2d259d91dd212065d5f6e
-
-use udevadm instead of (deprecated) udevinfo
-
-Use udevadm instead of (deprecated) udevinfo. Adapted/fixed version
-of a patch contributed by Lucas Hazel <lucas at die.net.au> via HAL ML.
----
-
---- a/hald/linux/blockdev.c
-+++ b/hald/linux/blockdev.c
-@@ -1770,7 +1770,7 @@ udev_get_device_file_for_sysfs_path (con
+diff -Nur hal-0.5.11.orig/hald/linux/blockdev.c hal-0.5.11/hald/linux/blockdev.c
+--- hal-0.5.11.orig/hald/linux/blockdev.c	2008-05-08 01:23:41.000000000 +0200
++++ hal-0.5.11/hald/linux/blockdev.c	2008-09-12 19:38:36.000000000 +0200
+@@ -1750,11 +1750,11 @@
          char *ret;
          char *u_stdout;
          int u_exit_status;
@@ -20,9 +10,15 @@
          GError *g_error;
  
          ret = NULL;
---- a/hald/linux/coldplug.c
-+++ b/hald/linux/coldplug.c
-@@ -149,8 +149,8 @@ udev_info_to_hotplug_event (const UdevIn
+-        argv[5] = sysfs_path;
++        argv[6] = sysfs_path;
+ 
+         g_error = NULL;
+ 
+diff -Nur hal-0.5.11.orig/hald/linux/coldplug.c hal-0.5.11/hald/linux/coldplug.c
+--- hal-0.5.11.orig/hald/linux/coldplug.c	2008-05-08 01:23:32.000000000 +0200
++++ hal-0.5.11/hald/linux/coldplug.c	2008-09-12 19:37:47.000000000 +0200
+@@ -149,8 +149,8 @@
  static gboolean
  hal_util_init_sysfs_to_udev_map (void)
  {