[Pkg-wmaker-commits] [wmtv] 12/48: Imported Debian patch 0.6.5-16.1

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmtv.

commit dc6545ab7dd5371af39a96dde4189f26d1eee535
Author: Bart Martens <bartm at debian.org>
Date:   Fri Sep 30 23:01:13 2011 +0200

    Imported Debian patch 0.6.5-16.1
---
 debian/changelog | 8 ++++++++
 debian/control   | 2 +-
 src/wmtv.c       | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 45b72de..1e0b331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmtv (0.6.5-16.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control: Build-Depends: libv4l-dev and replace
+    linux/videodev.h by libv4l1-videodev.h.  Closes: #621952.
+
+ -- Bart Martens <bartm at debian.org>  Fri, 30 Sep 2011 23:01:13 +0200
+
 wmtv (0.6.5-16) unstable; urgency=low
 
   * Move the wmtv binary from /usr/X11R6/bin to /usr/bin.
diff --git a/debian/control b/debian/control
index 9019cfe..f997002 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: wmtv
 Section: x11 
 Priority: extra 
 Maintainer: Nicolas Boullis <nboullis at debian.org>
-Build-Depends: debhelper (>=3.0.0), libxt-dev, libxpm-dev, libxext-dev, libx11-dev, libxxf86dga-dev, libxxf86vm-dev
+Build-Depends: debhelper (>=3.0.0), libxt-dev, libxpm-dev, libxext-dev, libx11-dev, libxxf86dga-dev, libxxf86vm-dev, libv4l-dev
 Standards-Version: 3.6.2
 
 Package: wmtv
diff --git a/src/wmtv.c b/src/wmtv.c
index e4d0bf3..ef7dca8 100644
--- a/src/wmtv.c
+++ b/src/wmtv.c
@@ -34,7 +34,7 @@
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <linux/videodev.h>
+#include <libv4l1-videodev.h>
 #include <linux/soundcard.h>
 
 #include <X11/Xlib.h>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtv.git