tags 621954 + patch thanks Dear maintainer,
I've prepared an NMU for unicap (versioned as 0.9.5-1.1). The diff is attached to this message. Regards. -- Alessio Treglia | www.alessiotreglia.com Debian Developer | ales...@debian.org Ubuntu Core Developer | quadris...@ubuntu.com 0FEC 59A5 E18E E04F 6D40 593B 45D4 8C7C DCFC 3FD0
diff -u unicap-0.9.5/debian/rules unicap-0.9.5/debian/rules --- unicap-0.9.5/debian/rules +++ unicap-0.9.5/debian/rules @@ -149,7 +149,7 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libgtk2.0-dev (>= 2.9.0), libglib2.0-dev (>= 2.11.0) CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libavcodec-dev, libavformat-dev, libtheora-dev, libvorbis-dev CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libasound2-dev, libpng12-dev -CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libxv-dev +CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libxv-dev, libv4l-dev CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libraw1394-dev (>= 1.1.0) # Needed for our packaging diff -u unicap-0.9.5/debian/control unicap-0.9.5/debian/control --- unicap-0.9.5/debian/control +++ unicap-0.9.5/debian/control @@ -2,7 +2,30 @@ Section: libs Priority: optional Maintainer: Jonas Smedegaard <d...@jones.dk> -Build-Depends: cdbs (>= 0.4.39), autotools-dev, gnulib (>= 0.0.20041014-2), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 6), intltool, gtk-doc-tools (>= 1.4), libgtk2.0-dev (>= 2.9.0), libglib2.0-dev (>= 2.11.0), libavcodec-dev, libavformat-dev, libtheora-dev, libvorbis-dev, libasound2-dev, libpng12-dev, libxv-dev, libraw1394-dev (>= 1.1.0), pkg-config, d-shlibs (>= 0.32) +Build-Depends: cdbs (>= 0.4.39), + autotools-dev, + gnulib, + cdbs (>= 0.4.72~), + devscripts (>= 2.10.7), + quilt, + patchutils (>= 0.2.25), + debhelper (>= 6), + dh-buildinfo, + intltool, + gtk-doc-tools (>= 1.4), + libgtk2.0-dev (>= 2.9.0), + libglib2.0-dev (>= 2.11.0), + libavcodec-dev, + libavformat-dev, + libtheora-dev, + libvorbis-dev, + libasound2-dev, + libpng12-dev, + libxv-dev, + libv4l-dev, + libraw1394-dev (>= 1.1.0), + pkg-config, + d-shlibs (>= 0.32) Standards-Version: 3.8.1 Vcs-Git: git://git.debian.org/git/collab-maint/unicap.git Vcs-Browser: http://git.debian.org/?p=collab-maint/unicap.git;a=summary diff -u unicap-0.9.5/debian/changelog unicap-0.9.5/debian/changelog --- unicap-0.9.5/debian/changelog +++ unicap-0.9.5/debian/changelog @@ -1,3 +1,14 @@ +unicap (0.9.5-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Point #include statements to the new location of the V4L1 headers as + they are no longer provided by the kernel, fix FTBFS (Closes: #621954): + - Add 1009_v4l1.patch + - Add build-dependency on libv4l-dev + - Regenerate debian/control + + -- Alessio Treglia <ales...@debian.org> Sat, 06 Aug 2011 10:09:07 +0200 + unicap (0.9.5-1) unstable; urgency=low * New upstream release: diff -u unicap-0.9.5/debian/patches/series unicap-0.9.5/debian/patches/series --- unicap-0.9.5/debian/patches/series +++ unicap-0.9.5/debian/patches/series @@ -8,2 +8,3 @@ 1008_gspca.patch +1009_v4l1.patch 2001_ignore_patched_gettextized_file.patch only in patch2: unchanged: --- unicap-0.9.5.orig/debian/patches/1009_v4l1.patch +++ unicap-0.9.5/debian/patches/1009_v4l1.patch @@ -0,0 +1,32 @@ +Description: Point #include statements to the new location of the V4L1 headers + as they are no longer provided by the kernel. +Author: Alessio Treglia <ales...@debian.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621954 +Forwarded: no +--- + cpi/v4l/v4l.c | 2 +- + cpi/v4l2cpi/uvcvideo.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- unicap-0.9.5.orig/cpi/v4l2cpi/uvcvideo.h ++++ unicap-0.9.5/cpi/v4l2cpi/uvcvideo.h +@@ -2,7 +2,7 @@ + #define _USB_VIDEO_H_ + + #include <linux/kernel.h> +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "uvc_compat.h" + +--- unicap-0.9.5.orig/cpi/v4l/v4l.c ++++ unicap-0.9.5/cpi/v4l/v4l.c +@@ -49,7 +49,7 @@ + #endif + #include <debug.h> + +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <linux/videodev2.h> // for v4l2 checks + + #include "v4l.h"
