← Back to branch summary

~ubuntu-branches/ubuntu/raring/hal/raring

« back to all changes in this revision

Viewing changes to debian/patches/51-kfreebsd-lrt-clock_gettime.patch

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl, Martin Pitt, Michael Biebl
  • Date: 2011-04-10 07:21:18 UTC
  • mfrom: (1.1.22 sid)
  • Revision ID: james.westby@ubuntu.com-20110410072118-ojw5p0hmiwe7i78v
Tags: 0.5.14-6
https://launchpad.net/bugs/721399
http://bugs.debian.org/621973
[ Martin Pitt ]
* Add 00upstream_video4linux_check.patch: Do not build
  hald-probe-video4linux if v4l1 is not available. (LP: #721399)
* Refresh 99-autoreconf.patch for above.
* 45-fix-libusb-detection.patch: Unfuzz.

[ Michael Biebl ]
* debian/patches/00_disable_v4l1_probing.patch
  - The hald-probe-video4linux prober supports both v4l1 and v4l2. Support
    for v4l1 has been removed from Linux kernel 2.6.38. Instead of
    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.
* Use dh-autoreconf to update the build system
  - Drop debian/patches/99-autoreconf.patch
  - Add Build-Depends on dh-autoreconf.
  - Include /usr/share/cdbs/1/rules/autoreconf.mk in debian/rules.
* Bump Standards-Version to 3.9.2. No further changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/51-kfreebsd-lrt-clock_gettime.patch
10
10
 configure.in |    1 +
11
11
 1 files changed, 1 insertions(+), 0 deletions(-)
12
12
 
13
 
diff --git a/configure.in b/configure.in
14
 
index 8363595..2c74863 100644
15
 
--- a/configure.in
16
 
+++ b/configure.in
17
 
@@ -507,6 +507,7 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin
 
13
Index: hal-0.5.14/configure.in
 
14
===================================================================
 
15
--- hal-0.5.14.orig/configure.in        2011-04-10 06:58:38.683837727 +0200
 
16
+++ hal-0.5.14/configure.in     2011-04-10 06:58:42.603788447 +0200
 
17
@@ -510,6 +510,7 @@
18
18
 AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris])
19
19
 AC_SUBST(HALD_BACKEND)
20
20
 if test "x$HALD_BACKEND" = "xfreebsd"; then
22
22
     USE_BSDLIBUSB20=no
23
23
     USE_BSDLIBUSB=no
24
24
     LIBUSB20_LIBS=""
25
 
1.6.5.4
26