[Pkg-utopia-commits] r3814 - in /packages/unstable/hal/debian: changelog patches/51-kfreebsd-lrt-clock_gettime.patch patches/52-kfreebsd-libufs.patch

Sun Apr 10 05:08:20 UTC 2011

Author: biebl
Date: Sun Apr 10 05:08:19 2011
New Revision: 3814

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3814
Log:
Refresh all patches to apply cleanly.

Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/patches/51-kfreebsd-lrt-clock_gettime.patch
    packages/unstable/hal/debian/patches/52-kfreebsd-libufs.patch

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3814&op=diff
==============================================================================

--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Sun Apr 10 05:08:19 2011
@@ -13,6 +13,7 @@
       disabling the prober altogether, #ifdef the v4l1 parts when building on a
       newer kernel. This partially reverts 00upstream_video4linux_check.patch.
       (Closes: #621973)
+  * Refresh all patches to apply cleanly.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 10 Apr 2011 06:57:58 +0200
 

Modified: packages/unstable/hal/debian/patches/51-kfreebsd-lrt-clock_gettime.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/51-kfreebsd-lrt-clock_gettime.patch?rev=3814&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/51-kfreebsd-lrt-clock_gettime.patch (original)
+++ packages/unstable/hal/debian/patches/51-kfreebsd-lrt-clock_gettime.patch Sun Apr 10 05:08:19 2011
@@ -10,11 +10,11 @@
  configure.in |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index 8363595..2c74863 100644
---- a/configure.in
-+++ b/configure.in
-@@ -507,6 +507,7 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
+Index: hal-0.5.14/configure.in
+===================================================================
+--- hal-0.5.14.orig/configure.in	2011-04-10 06:58:38.683837727 +0200
++++ hal-0.5.14/configure.in	2011-04-10 06:58:42.603788447 +0200
+@@ -510,6 +510,7 @@
  AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
  AC_SUBST(HALD_BACKEND)
  if test "x$HALD_BACKEND" = "xfreebsd"; then
@@ -22,6 +22,3 @@
      USE_BSDLIBUSB20=no
      USE_BSDLIBUSB=no
      LIBUSB20_LIBS=""
--- 
-1.6.5.4
-

Modified: packages/unstable/hal/debian/patches/52-kfreebsd-libufs.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/52-kfreebsd-libufs.patch?rev=3814&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/52-kfreebsd-libufs.patch (original)
+++ packages/unstable/hal/debian/patches/52-kfreebsd-libufs.patch Sun Apr 10 05:08:19 2011
@@ -11,11 +11,11 @@
  hald/freebsd/probing/probe-volume.c |    4 ++++
  3 files changed, 13 insertions(+), 1 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index 2c74863..16a904b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -508,6 +508,14 @@ AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compilin
+Index: hal-0.5.14/configure.in
+===================================================================
+--- hal-0.5.14.orig/configure.in	2011-04-10 06:58:42.603788447 +0200
++++ hal-0.5.14/configure.in	2011-04-10 06:58:55.755623107 +0200
+@@ -511,6 +511,14 @@
  AC_SUBST(HALD_BACKEND)
  if test "x$HALD_BACKEND" = "xfreebsd"; then
      AC_SEARCH_LIBS([clock_gettime], [rt])
@@ -30,21 +30,21 @@
      USE_BSDLIBUSB20=no
      USE_BSDLIBUSB=no
      LIBUSB20_LIBS=""
-diff --git a/hald/freebsd/probing/Makefile.am b/hald/freebsd/probing/Makefile.am
-index 3e439b5..67b8dcf 100644
---- a/hald/freebsd/probing/Makefile.am
-+++ b/hald/freebsd/probing/Makefile.am
-@@ -67,5 +67,5 @@ hald_probe_volume_CPPFLAGS = $(AM_CPPFLAGS) @GLIB_CFLAGS@ @VOLUME_ID_CFLAGS@
+Index: hal-0.5.14/hald/freebsd/probing/Makefile.am
+===================================================================
+--- hal-0.5.14.orig/hald/freebsd/probing/Makefile.am	2009-08-24 14:42:29.000000000 +0200
++++ hal-0.5.14/hald/freebsd/probing/Makefile.am	2011-04-10 06:58:55.755623107 +0200
+@@ -67,5 +67,5 @@
  hald_probe_volume_LDADD = \
  	@GLIB_LIBS@							\
  	@VOLUME_ID_LIBS@						\
 -	-lufs								\
 +	@LIBUFS_LIBS@							\
  	$(top_builddir)/hald/freebsd/libprobe/libhald_freebsd_probe.la
-diff --git a/hald/freebsd/probing/probe-volume.c b/hald/freebsd/probing/probe-volume.c
-index c435eaf..42f3cc8 100644
---- a/hald/freebsd/probing/probe-volume.c
-+++ b/hald/freebsd/probing/probe-volume.c
+Index: hal-0.5.14/hald/freebsd/probing/probe-volume.c
+===================================================================
+--- hal-0.5.14.orig/hald/freebsd/probing/probe-volume.c	2011-04-10 06:58:39.675825255 +0200
++++ hal-0.5.14/hald/freebsd/probing/probe-volume.c	2011-04-10 06:58:55.787622704 +0200
 @@ -38,10 +38,12 @@
  #include <sys/param.h>
  #include <sys/mount.h>
@@ -58,7 +58,7 @@
  #include <isofs/cd9660/iso.h>
  #include <glib.h>
  #include <libvolume_id.h>
-@@ -563,6 +565,7 @@ main (int argc, char **argv)
+@@ -563,6 +565,7 @@
  
    libhal_device_set_property_bool(hfp_ctx, hfp_udi, "volume.ignore", has_children || is_swap, &hfp_error);
  
@@ -66,7 +66,7 @@
    if (vid && ! strcmp (vid->type, "ufs"))
      {
        struct uufsd ufsdisk;
-@@ -602,6 +605,7 @@ main (int argc, char **argv)
+@@ -602,6 +605,7 @@
  	  ufs_disk_close(&ufsdisk);
  	}
      }
@@ -74,6 +74,3 @@
  
    if (has_children)
      usage = "partitiontable";
--- 
-1.6.5.4
-


