[Pkg-utopia-commits] r3812 - in /packages/unstable/hal/debian: changelog patches/45-fix-libusb-detection.patch

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Fri Feb 25 15:28:40 2011
New Revision: 3812

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3812
Log:
45-fix-libusb-detection.patch: Unfuzz.

Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/patches/45-fix-libusb-detection.patch

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=3812&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Fri Feb 25 15:28:40 2011
@@ -3,8 +3,9 @@
   * Add 00upstream_video4linux_check.patch: Do not build
     hald-probe-video4linux if v4l1 is not available. (LP: #721399)
   * Refresh 99-autoreconf.patch for above.
-
- -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 14 Feb 2011 11:45:59 +0100
+  * 45-fix-libusb-detection.patch: Unfuzz.
+
+ -- Martin Pitt <mpitt at debian.org>  Mon, 14 Feb 2011 11:45:59 +0100
 
 hal (0.5.14-5) unstable; urgency=low
 

Modified: packages/unstable/hal/debian/patches/45-fix-libusb-detection.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/patches/45-fix-libusb-detection.patch?rev=3812&op=diff
==============================================================================
--- packages/unstable/hal/debian/patches/45-fix-libusb-detection.patch (original)
+++ packages/unstable/hal/debian/patches/45-fix-libusb-detection.patch Fri Feb 25 15:28:40 2011
@@ -11,13 +11,13 @@
  configure.in |   35 ++++++++++++++++++-----------------
  1 files changed, 18 insertions(+), 17 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index a8fda51..8363595 100644
---- a/configure.in
-+++ b/configure.in
-@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then
- fi 
- AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
+Index: hal/configure.in
+===================================================================
+--- hal.orig/configure.in	2011-02-25 16:27:13.025776431 +0100
++++ hal/configure.in	2011-02-25 16:27:18.565776433 +0100
+@@ -482,9 +482,6 @@
+ AC_CHECK_HEADERS([linux/videodev.h], [have_videodev_h=yes], [])
+ AM_CONDITIONAL(HAVE_V4L1, [test "x$have_videodev_h" = "xyes"])
  
 -USE_LIBUSB20=no
 -USE_LIBUSB=no
@@ -25,7 +25,7 @@
  AC_ARG_WITH([backend],
  	    AS_HELP_STRING([--with-backend=<name>],
  	                   [backend to use (linux/solaris/freebsd/dummy)]),
-@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
+@@ -513,21 +510,25 @@
  AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
  AC_SUBST(HALD_BACKEND)
  if test "x$HALD_BACKEND" = "xfreebsd"; then
@@ -65,6 +65,3 @@
  
  dnl DBUS API is subject to changes
  AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change])
--- 
-1.6.5.4
-