[Pkg-utopia-commits] r159 - packages/hal/trunk/debian/patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-01-04 17:44:32 +0100 (Tue, 04 Jan 2005)
New Revision: 159

Modified:
   packages/hal/trunk/debian/patches/hal-fdi.patch
   packages/hal/trunk/debian/patches/hal-hotplug-map.patch
   packages/hal/trunk/debian/patches/ids-search.patch
   packages/hal/trunk/debian/patches/netdev-recovery.patch
Log:
* Adept patches to work with dbs-edit-patch -p 1


Modified: packages/hal/trunk/debian/patches/hal-fdi.patch
===================================================================
--- packages/hal/trunk/debian/patches/hal-fdi.patch	2005-01-04 16:30:15 UTC (rev 158)
+++ packages/hal/trunk/debian/patches/hal-fdi.patch	2005-01-04 16:44:32 UTC (rev 159)
@@ -3,8 +3,8 @@
 RCS file: /cvs/hal/hal/hald/device_info.c,v
 retrieving revision 1.16
 diff -u -r1.16 device_info.c
---- hald/device_info.c	14 Oct 2004 18:37:28 -0000	1.16
-+++ hald/device_info.c	28 Oct 2004 18:57:31 -0000
+--- hal/hald/device_info.c	14 Oct 2004 18:37:28 -0000	1.16
++++ hal/hald/device_info.c	28 Oct 2004 18:57:31 -0000
 @@ -1176,7 +1176,10 @@
  di_search_and_merge (HalDevice *d)
  {

Modified: packages/hal/trunk/debian/patches/hal-hotplug-map.patch
===================================================================
--- packages/hal/trunk/debian/patches/hal-hotplug-map.patch	2005-01-04 16:30:15 UTC (rev 158)
+++ packages/hal/trunk/debian/patches/hal-hotplug-map.patch	2005-01-04 16:44:32 UTC (rev 159)
@@ -3,8 +3,8 @@
 RCS file: /cvs/hal/hal/tools/linux/hal_hotplug_map.c,v
 retrieving revision 1.3
 diff -u -r1.3 hal_hotplug_map.c
---- tools/linux/hal_hotplug_map.c	27 Sep 2004 14:52:11 -0000	1.3
-+++ tools/linux/hal_hotplug_map.c	6 Nov 2004 18:48:59 -0000
+--- hal/tools/linux/hal_hotplug_map.c	27 Sep 2004 14:52:11 -0000	1.3
++++ hal/tools/linux/hal_hotplug_map.c	6 Nov 2004 18:48:59 -0000
 @@ -3,6 +3,9 @@
  #include <stdlib.h>
  #include <string.h>

Modified: packages/hal/trunk/debian/patches/ids-search.patch
===================================================================
--- packages/hal/trunk/debian/patches/ids-search.patch	2005-01-04 16:30:15 UTC (rev 158)
+++ packages/hal/trunk/debian/patches/ids-search.patch	2005-01-04 16:44:32 UTC (rev 159)
@@ -3,8 +3,8 @@
 RCS file: /cvs/hal/hal/configure.in,v
 retrieving revision 1.57
 diff -u -r1.57 configure.in
---- configure.in	1 Nov 2004 23:19:04 -0000	1.57
-+++ configure.in	7 Dec 2004 15:17:08 -0000
+--- hal/configure.in	1 Nov 2004 23:19:04 -0000	1.57
++++ hal/configure.in	7 Dec 2004 15:17:08 -0000
 @@ -18,20 +18,6 @@
  
  AC_ARG_WITH(init-scripts,       [  --with-init-scripts=<os> Style of init scripts to install (redhat)])
@@ -31,8 +31,8 @@
 RCS file: /cvs/hal/hal/hald/linux/pci_bus_device.c,v
 retrieving revision 1.9
 diff -u -r1.9 pci_bus_device.c
---- hald/linux/pci_bus_device.c	14 Oct 2004 19:21:41 -0000	1.9
-+++ hald/linux/pci_bus_device.c	7 Dec 2004 15:17:09 -0000
+--- hal/hald/linux/pci_bus_device.c	14 Oct 2004 19:21:41 -0000	1.9
++++ hal/hald/linux/pci_bus_device.c	7 Dec 2004 15:17:09 -0000
 @@ -283,7 +283,6 @@
  
  	fp = fopen (path, "r");
@@ -72,8 +72,8 @@
 RCS file: /cvs/hal/hal/hald/linux/usb_bus_device.c,v
 retrieving revision 1.15
 diff -u -r1.15 usb_bus_device.c
---- hald/linux/usb_bus_device.c	14 Oct 2004 18:51:12 -0000	1.15
-+++ hald/linux/usb_bus_device.c	7 Dec 2004 15:17:09 -0000
+--- hal/hald/linux/usb_bus_device.c	14 Oct 2004 18:51:12 -0000	1.15
++++ hal/hald/linux/usb_bus_device.c	7 Dec 2004 15:17:09 -0000
 @@ -549,15 +549,26 @@
  static void
  usb_device_init ()

Modified: packages/hal/trunk/debian/patches/netdev-recovery.patch
===================================================================
--- packages/hal/trunk/debian/patches/netdev-recovery.patch	2005-01-04 16:30:15 UTC (rev 158)
+++ packages/hal/trunk/debian/patches/netdev-recovery.patch	2005-01-04 16:44:32 UTC (rev 159)
@@ -3,8 +3,8 @@
 RCS file: /cvs/hal/hal/hald/linux/osspec.c,v
 retrieving revision 1.52.2.2
 diff -u -r1.52.2.2 osspec.c
---- hald/linux/osspec.c	1 Dec 2004 04:28:58 -0000	1.52.2.2
-+++ hald/linux/osspec.c	2 Jan 2005 16:33:44 -0000
+--- hal/hald/linux/osspec.c	1 Dec 2004 04:28:58 -0000	1.52.2.2
++++ hal/hald/linux/osspec.c	2 Jan 2005 16:33:44 -0000
 @@ -1037,8 +1037,10 @@
  						} else {
  							HAL_INFO (("%s worked!", sysfs_path));