Bug#600381: gem: diff for NMU version 1:0.92.3-1.1

tags 600381 + pending
tags 621956 + patch
tags 621956 + pending
thanks

Dear maintainer,

I've prepared an NMU for gem (versioned as 1:0.92.3-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru gem-0.92.3/debian/changelog gem-0.92.3/debian/changelog
gem-0.92.3/debian/changelog 2010-03-25 10:15:58.000000000 +0100
+++ gem-0.92.3/debian/changelog 2011-05-05 01:18:40.000000000 +0200
@@ -1,3 +1,18 @@
+gem (1:0.92.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/04_v4l1_headers_moved.patch:
+ - Find the new location of the header libv4l1-videodev.h;
+ V4L1 support was dropped from the latest kernel (Closes: #621956).
+ * debian/patches/05_missing_includes.patch:
+ - Add missing #include statements in src/Pixes/videoV4L2.h to prevent
+ it fail to build (Closes: #600381).
+ * Replace puredata with puredata-dev in Build-Depends since puredata's
+ stuff were splitted into several packages, puredata-dev provides the
+ development headers.
+
+ -- Alessio Treglia <alessio@debian.org> Thu, 05 May 2011 01:05:20 +0200
+
gem (1:0.92.3-1) unstable; urgency=low

* New upstream
diff -Nru gem-0.92.3/debian/control gem-0.92.3/debian/control
gem-0.92.3/debian/control 2010-03-25 10:15:58.000000000 +0100
+++ gem-0.92.3/debian/control 2011-05-05 01:04:25.000000000 +0200
@@ -10,7 +10,7 @@
autoconf,
automake,
pkg-config,
- puredata | pd,
+ puredata-dev | pd,
libftgl-dev,
libmagick++-dev,
libxxf86vm-dev,
diff -Nru gem-0.92.3/debian/patches/04_v4l1_headers_moved.patch
gem-0.92.3/debian/patches/04_v4l1_headers_moved.patch
gem-0.92.3/debian/patches/04_v4l1_headers_moved.patch 1970-01-01
01:00:00.000000000 +0100
+++ gem-0.92.3/debian/patches/04_v4l1_headers_moved.patch 2011-05-05
01:09:37.000000000 +0200
@@ -0,0 +1,23 @@
+Description: Recent kernel has dropped V4L1 support.
+ The <linux/videodev.h> header was renamed.
+Author: Andreas Moog <amoog@ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/756070
+Bug-Debian: http://bugs.debian.org/621956
+Bug: http://sourceforge.net/support/trac...?aid290926
+Reviewed-by: Alessio Treglia <alessio@debian.org>
+Last-Update: 2011-05-05
+
+ src/Pixes/videoV4L.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+ gem-0.92.3.orig/src/Pixes/videoV4L.h
++++ gem-0.92.3/src/Pixes/videoV4L.h
+@@ -40,7 +40,7 @@
+ # include <sys/types.h>
+ # include <sys/time.h>
+ # include <linux/types.h>
+-# include <linux/videodev.h>
++# include <libv4l1-videodev.h>
+ # include <sys/mman.h>
+ //#ifdef HAVE_PTHREADS
+ # include <pthread.h>
diff -Nru gem-0.92.3/debian/patches/05_missing_includes.patch
gem-0.92.3/debian/patches/05_missing_includes.patch
gem-0.92.3/debian/patches/05_missing_includes.patch 1970-01-01
01:00:00.000000000 +0100
+++ gem-0.92.3/debian/patches/05_missing_includes.patch 2011-05-05
01:14:48.000000000 +0200
@@ -0,0 +1,19 @@
+Description: Add missing #include statements to avoid a build failure.
+Bug-Debian: http://bugs.debian.org/600381
+Author: Claude Heiland-Allen <claudiusmaximus@goto10.org>
+
+ src/Pixes/videoV4L2.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+ gem-0.92.3.orig/src/Pixes/videoV4L2.h
++++ gem-0.92.3/src/Pixes/videoV4L2.h
+@@ -36,7 +36,8 @@ WARRANTIES, see the file, "GEM.LICENSE.T
+ # include <fcntl.h>
+ # include <errno.h>
+ # include <sys/ioctl.h>
+-//# include <sys/types.h>
++# include <sys/types.h>
++# include <sys/stat.h>
+ //# include <sys/time.h>
+ # include <asm/types.h>
+ # include <linux/videodev2.h>
diff -Nru gem-0.92.3/debian/patches/series gem-0.92.3/debian/patches/series
gem-0.92.3/debian/patches/series 2010-03-25 10:15:58.000000000 +0100
+++ gem-0.92.3/debian/patches/series 2011-05-05 01:12:48.000000000 +0200
@@ -1,3 +1,5 @@
01_change_defaultfont.patch
02_manual_examples_install.patch
03_falign_default.patch
+04_v4l1_headers_moved.patch
+05_missing_includes.patch

Alessio Treglia          | www.alessiotreglia.com
Debian Developer         | alessio@debian.org
Ubuntu Core Developer    | quadrispro@ubuntu.com
0FEC 59A5 E18E E04F 6D40 593B 45D4 8C7C DCFC 3FD0



To UNSUBSCRIBE, email to debian-bugs-dist-REQUEST@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org