[Pkg-utopia-commits] r162 - in packages/hal/trunk/debian: . patches

Sjoerd Simons sjoerd@costa.debian.org
Fri, 07 Jan 2005 11:32:58 +0100


Author: sjoerd
Date: 2005-01-07 11:32:55 +0100 (Fri, 07 Jan 2005)
New Revision: 162

Removed:
   packages/hal/trunk/debian/patches/netdev-recovery.patch
Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/rules
Log:
Packaged New upstream release

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2005-01-04 18:31:05 UTC (rev 161)
+++ packages/hal/trunk/debian/changelog	2005-01-07 10:32:55 UTC (rev 162)
@@ -1,3 +1,11 @@
+hal (0.4.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Removed patched that were merged/fixed upstream:
+    + debian/patches/netdev-recovery.patch
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri,  7 Jan 2005 11:29:56 +0100
+
 hal (0.4.3-1) unstable; urgency=low
 
   * New upstream release

Deleted: packages/hal/trunk/debian/patches/netdev-recovery.patch
===================================================================
--- packages/hal/trunk/debian/patches/netdev-recovery.patch	2005-01-04 18:31:05 UTC (rev 161)
+++ packages/hal/trunk/debian/patches/netdev-recovery.patch	2005-01-07 10:32:55 UTC (rev 162)
@@ -1,19 +0,0 @@
-Index: hald/linux/osspec.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux/osspec.c,v
-retrieving revision 1.52.2.2
-diff -u -r1.52.2.2 osspec.c
---- 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));
- 						}
-+					} else {
-+						HAL_INFO (("Recovery failed!"));
-+						return NULL;
- 					}
--
- 				} else {
- 					HAL_WARNING (("Coulnd't get sysfs class device object at path %s", sysfs_path));
- 					return NULL;

Modified: packages/hal/trunk/debian/rules
===================================================================
--- packages/hal/trunk/debian/rules	2005-01-04 18:31:05 UTC (rev 161)
+++ packages/hal/trunk/debian/rules	2005-01-07 10:32:55 UTC (rev 162)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_TAR_SRCDIR=hal-0.4.3
+DEB_TAR_SRCDIR=hal-0.4.4
 
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk