Package: kino Version: 1.3.4-1.1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for kino (versioned as 1.3.4-1.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Cheers Luk
reverted: --- kino-1.3.4/confdefs.h +++ kino-1.3.4.orig/confdefs.h @@ -1,21 +0,0 @@ -/* confdefs.h */ -#define PACKAGE_NAME "kino" -#define PACKAGE_TARNAME "kino" -#define PACKAGE_VERSION "1.3.4" -#define PACKAGE_STRING "kino 1.3.4" -#define PACKAGE_BUGREPORT "http://sourceforge.net/tracker/?group_id=14103&atid=114103"; -#define PACKAGE_URL "" -#define PACKAGE "kino" -#define VERSION "1.3.4" -#define STDC_HEADERS 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_STDLIB_H 1 -#define HAVE_STRING_H 1 -#define HAVE_MEMORY_H 1 -#define HAVE_STRINGS_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_DLFCN_H 1 -#define LT_OBJDIR ".libs/" diff -u kino-1.3.4/debian/rules kino-1.3.4/debian/rules --- kino-1.3.4/debian/rules +++ kino-1.3.4/debian/rules @@ -44,6 +44,7 @@ dh_installdirs $(MAKE) DESTDIR="$(CURDIR)/debian/kino/" install rm -r $(CURDIR)/debian/kino/usr/etc + rm `find $(CURDIR)/debian/kino -name '*.la'` # install icon dh_install debian/kino.xpm usr/share/pixmaps mv $(CURDIR)/debian/kino/usr/share/kino/help $(CURDIR)/debian/kino/usr/share/doc/kino/ diff -u kino-1.3.4/debian/changelog kino-1.3.4/debian/changelog --- kino-1.3.4/debian/changelog +++ kino-1.3.4/debian/changelog @@ -1,3 +1,13 @@ +kino (1.3.4-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Add 30_v4l1_includes.diff: Use <libv4l1-videodev.h> instead of + <linux/videodev.h>, as Linux 2.6.38 dropped V4L1. Package should use + v4l2 only then, but fails to build due to this (Closes: #621996). + * Don't ship .la files (Closes: #621686). + + -- Luk Claes <l...@debian.org> Fri, 24 Jun 2011 08:25:34 +0200 + kino (1.3.4-1.1) unstable; urgency=low * Non maintainer upload. diff -u kino-1.3.4/debian/control kino-1.3.4/debian/control --- kino-1.3.4/debian/control +++ kino-1.3.4/debian/control @@ -13,6 +13,7 @@ libtool, libraw1394-dev (>= 0.9-2), libdv4-dev, + libv4l-dev, libavc1394-dev (>= 0.4.1), libgnome2-dev, libglade2-dev, @@ -38,7 +39,7 @@ libdc1394-22-dev, libvorbis-dev, libgl1-mesa-dev | libgl-dev, - libswscale-dev + libswscale-dev, Breaks: udev (<< 136-1) Build-Conflicts: autoconf2.13, automake1.4 diff -u kino-1.3.4/debian/patches/series kino-1.3.4/debian/patches/series --- kino-1.3.4/debian/patches/series +++ kino-1.3.4/debian/patches/series @@ -2,2 +2,3 @@ 20_fix_bashism.diff +30_v4l1_includes.diff 80_move_doc.diff only in patch2: unchanged: --- kino-1.3.4.orig/debian/patches/30_v4l1_includes.diff +++ kino-1.3.4/debian/patches/30_v4l1_includes.diff @@ -0,0 +1,26 @@ +Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c +=================================================================== +--- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c 2011-04-11 15:12:41.915593967 +0200 ++++ kino-1.3.4/ffmpeg/libavdevice/v4l.c 2011-04-11 15:13:05.825593979 +0200 +@@ -26,7 +26,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +Index: kino-1.3.4/src/v4l.h +=================================================================== +--- kino-1.3.4.orig/src/v4l.h 2011-04-11 15:12:41.895593967 +0200 ++++ kino-1.3.4/src/v4l.h 2011-04-11 15:12:57.555593975 +0200 +@@ -40,7 +40,7 @@ + + #define _DEVICE_H_ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "displayer.h" +
