← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hald/linux/probing/Makefile.am

  • 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:
hald/linux/probing/Makefile.am
19
19
        hald-probe-smbios               \
20
20
        hald-probe-serial               \
21
21
        hald-probe-ieee1394-unit        \
22
 
        hald-probe-net-bluetooth
23
 
 
24
 
if HAVE_V4L1
25
 
libexec_PROGRAMS += hald-probe-video4linux
26
 
endif
 
22
        hald-probe-net-bluetooth        \
 
23
        hald-probe-video4linux
27
24
endif
28
25
 
29
26
hald_probe_smbios_SOURCES = probe-smbios.c ../../logger.c