Package: motv
Version: 3.94-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my motv 3.94-1.1 NMU.
--
Homepage: http://www.sesse.net/
diff -u motv-3.94/debian/changelog motv-3.94/debian/changelog
--- motv-3.94/debian/changelog
+++ motv-3.94/debian/changelog
@@ -1,3 +1,16 @@
+motv (3.94-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace build-dependency on xlibs-dev with an explicit build-dependency
+ on each required package. Bump the version on the libmotif-dev
+ build-dependency so we're sure the buildds don't pick it up before
+ openmotif (also NMUed today) is ready. (Closes: #346872)
+ * Fix various compilation issues with gcc-4.0; patch from Andreas Jochens
+ (which also adds fakeroot as a build-dependency, since the Makefile uses
+ it). (Closes: #297183, #300290)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Sun, 22 Jan 2006 23:11:59 +0100
+
motv (3.94-1) unstable; urgency=low
* new release (closes: #223108, #254259).
diff -u motv-3.94/debian/control motv-3.94/debian/control
--- motv-3.94/debian/control
+++ motv-3.94/debian/control
@@ -1,7 +1,7 @@
Source: motv
Section: contrib/graphics
Priority: extra
-Build-Depends: debhelper (>=2.0), libjpeg-dev, libncurses5-dev, xlibs-dev (>=
4.0.1), libxaw7-dev, liblircclient-dev, debhelper, xutils, xbase-clients,
libmotif-dev (>= 2.2.2-4), libasound2-dev, libzvbi-dev, libxft2-dev,
libpng12-dev
+Build-Depends: debhelper (>=2.0), fakeroot, libjpeg-dev, libncurses5-dev,
libx11-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, libxv-dev, x-dev,
libfs-dev, libxaw7-dev, liblircclient-dev, debhelper, xutils, xbase-clients,
libmotif-dev (>= 2.2.3-1.3), libasound2-dev, libzvbi-dev, libxft2-dev,
libpng12-dev
Maintainer: Gerd Knorr <[EMAIL PROTECTED]>
Standards-Version: 3.6.1
only in patch2:
unchanged:
--- motv-3.94.orig/dist/gcc4.diff
+++ motv-3.94/dist/gcc4.diff
@@ -0,0 +1,49 @@
+diff -urN ../xawtv-3.94/console/fbtv.c xawtv-3.94/console/fbtv.c
+--- ../xawtv-3.94/console/fbtv.c 2004-06-30 12:26:52.000000000 +0000
++++ xawtv-3.94/console/fbtv.c 2005-02-27 19:22:24.811259997 +0000
+@@ -187,7 +187,6 @@
+
+ #define NKEYTAB (sizeof(keytab)/sizeof(struct KEYTAB))
+
+-static char *snapbase;
+ static char default_title[128] = "???";
+ static char message[128] = "";
+
+diff -urN tmp/xawtv-3.94/common/channel.c xawtv-3.94/common/channel.c
+--- tmp/xawtv-3.94/common/channel.c 2003-03-28 13:22:06.000000000 +0100
++++ xawtv-3.94/common/channel.c 2005-03-18 19:55:18.725753547 +0100
+@@ -181,6 +181,9 @@
+ { -1, NULL, },
+ };
+
++extern struct STRTAB booltab[];
++extern struct STRTAB captab[];
++
+ /* just malloc memory for a new channel ... */
+ struct CHANNEL*
+ add_channel(char *name)
+diff -urN tmp/xawtv-3.94/common/channel.h xawtv-3.94/common/channel.h
+--- tmp/xawtv-3.94/common/channel.h 2003-02-14 15:14:04.000000000 +0100
++++ xawtv-3.94/common/channel.h 2005-03-18 19:43:32.462851013 +0100
+@@ -90,8 +90,6 @@
+
+ /* ----------------------------------------------------------------------- */
+
+-extern struct STRTAB booltab[];
+-extern struct STRTAB captab[];
+
+ int str_to_int(char *str, struct STRTAB *tab);
+ const char* int_to_str(int n, struct STRTAB *tab);
+diff -urN tmp/xawtv-3.94/common/commands.c xawtv-3.94/common/commands.c
+--- tmp/xawtv-3.94/common/commands.c 2004-04-19 18:24:05.000000000 +0200
++++ xawtv-3.94/common/commands.c 2005-03-18 19:55:48.485941906 +0100
+@@ -162,6 +162,9 @@
+
+ static int keypad_state = -1;
+
++extern struct STRTAB booltab[];
++extern struct STRTAB captab[];
++
+ /* ----------------------------------------------------------------------- */
+
+ void add_attrs(struct ng_attribute *new)
