~ubuntu-branches/ubuntu/oneiric/v4l-utils/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/remove-sysfs-dependency.diff

Committer: Bazaar Package Importer
Author(s): Martin Pitt
Date: 2011-07-22 13:58:48 UTC
mfrom: (11.1.2 sid)
Revision ID: james.westby@ubuntu.com-20110722135848-tju3x5jlpa4e9by5

Tags: 0.8.5-1ubuntu1

debian/control: Drop ia32-libs-dev build dependency; we don't have this in
Ubuntu, and ia32-libs is in universe.

files added:
contrib/em28xx/parse_em28xx_drxk.pl

debian/libv4l-0.NEWS.Debian

lib/libv4lconvert/se401.c

utils/v4l2-compliance/v4l2-test-formats.cpp

files removed:
.pc

.pc/.version

.pc/applied-patches

.pc/generate-correct-private-libs-lines-for-pkgconfig.diff

.pc/generate-correct-private-libs-lines-for-pkgconfig.diff/lib

.pc/generate-correct-private-libs-lines-for-pkgconfig.diff/lib/libv4l1

.pc/generate-correct-private-libs-lines-for-pkgconfig.diff/lib/libv4l1/Makefile

.pc/generate-correct-private-libs-lines-for-pkgconfig.diff/lib/libv4l2

.pc/generate-correct-private-libs-lines-for-pkgconfig.diff/lib/libv4l2/Makefile

.pc/generate-correct-private-libs-lines-for-pkgconfig.diff/lib/libv4lconvert

.pc/generate-correct-private-libs-lines-for-pkgconfig.diff/lib/libv4lconvert/Makefile

.pc/qv4l2-install-fixed-size-icons.diff

.pc/qv4l2-install-fixed-size-icons.diff/utils

.pc/qv4l2-install-fixed-size-icons.diff/utils/qv4l2

.pc/qv4l2-install-fixed-size-icons.diff/utils/qv4l2/Makefile.install

.pc/remove-sysfs-dependency.diff

.pc/remove-sysfs-dependency.diff/utils

.pc/remove-sysfs-dependency.diff/utils/Makefile

debian/patches/generate-correct-private-libs-lines-for-pkgconfig.diff

debian/patches/qv4l2-install-fixed-size-icons.diff

debian/patches/remove-sysfs-dependency.diff

files modified:
ChangeLog

Make.rules

contrib/test/ioctl-test.c

debian/changelog

debian/compat

debian/control

debian/copyright

debian/libv4l-0.install

debian/libv4l-dev.install

debian/patches/series

debian/rules

include/linux/videodev2.h

lib/libv4lconvert/Makefile

lib/libv4lconvert/control/libv4lcontrol.c

lib/libv4lconvert/libv4lconvert-priv.h

lib/libv4lconvert/libv4lconvert.c

lib/libv4lconvert/processing/autogain.c

utils/keytable/keytable.c

utils/keytable/rc_keymaps/lme2510

utils/keytable/rc_keymaps/pinnacle_pctv_hd

utils/keytable/rc_keymaps/rc6_mce

utils/keytable/rc_keymaps/winfast

utils/libmedia_dev/get_media_devices.c

utils/libmedia_dev/get_media_devices.h

utils/qv4l2/ctrl-tab.cpp

utils/v4l2-compliance/Makefile

utils/v4l2-compliance/fixme.txt

utils/v4l2-compliance/v4l2-compliance.cpp

utils/v4l2-compliance/v4l2-compliance.h

utils/v4l2-compliance/v4l2-test-controls.cpp

utils/v4l2-compliance/v4l2-test-debug.cpp

utils/v4l2-ctl/v4l2-ctl.cpp

Show diffs side-by-side

added added

removed removed

debian/patches/remove-sysfs-dependency.diff

Author: Gregor Jasny <gjasny@googlemail.com>

Description: Remove unnecessary dependency on libsysfs (Closes: #627652)

Forwarded: yes

--- a/utils/Makefile

+++ b/utils/Makefile

@@ -1,15 +1,10 @@

-SUBDIRS=libv4l2util libmedia_dev decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg xc3028-firmware

+SUBDIRS=libv4l2util libmedia_dev decode_tm6000 keytable rds v4l2-compliance v4l2-ctl v4l2-dbg v4l2-sysfs-path xc3028-firmware

all install:

@for i in $(SUBDIRS); do \

$(MAKE) -C $$i $@ || exit 1; \

done

- # Test if libsysfs is installed

- @-if [ -f /usr/include/sysfs/libsysfs.h ]; then \

- $(MAKE) -C v4l2-sysfs-path $@; \

- fi

# Test whether qmake is installed, and whether it is for qt4.

@if which qmake-qt4 >/dev/null 2>&1; then \

QMAKE=qmake-qt4; \

Older »