[Pkg-wmaker-commits] [wmtv] 11/48: Imported Debian patch 0.6.5-16

[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 7a63ed586f27119cda09626ae77d5cd4f4ba37d9
Author: Nicolas Boullis <nboullis at debian.org>
Date:   Wed Aug 3 19:44:25 2005 +0200

    Imported Debian patch 0.6.5-16
---
 debian/changelog           | 11 +++++++++++
 debian/control             |  4 ++--
 debian/dirs                |  2 +-
 debian/rules               |  4 ++--
 debian/{wmtv.1x => wmtv.1} |  6 +++++-
 src/wmtv.c                 |  7 ++++++-
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 903e832..45b72de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+wmtv (0.6.5-16) unstable; urgency=low
+
+  * Move the wmtv binary from /usr/X11R6/bin to /usr/bin.
+  * Move the wmtv manpage from section 1x to section 1.
+  * Build-depend on the needed libx*-dev packages rather than xlibs-dev (that
+    misses both libxxf86dga-dev and libxxf86vm-dev).
+  * Bump Standards-Version: to 3.6.2 (no change needed).
+  * Add a new -c option to choose the video4linux device to use.
+
+ -- Nicolas Boullis <nboullis at debian.org>  Wed,  3 Aug 2005 19:44:25 +0200
+
 wmtv (0.6.5-15) unstable; urgency=low
 
   * Fixed long description thanks to Colin Watson.
diff --git a/debian/control b/debian/control
index 920dd44..9019cfe 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: wmtv
 Section: x11 
 Priority: extra 
 Maintainer: Nicolas Boullis <nboullis at debian.org>
-Build-Depends: debhelper (>=3.0.0), xlibs-dev
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>=3.0.0), libxt-dev, libxpm-dev, libxext-dev, libx11-dev, libxxf86dga-dev, libxxf86vm-dev
+Standards-Version: 3.6.2
 
 Package: wmtv
 Architecture: any
diff --git a/debian/dirs b/debian/dirs
index bee0244..b745c0b 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,2 @@
-usr/X11R6/bin
+usr/bin
 etc
diff --git a/debian/rules b/debian/rules
index be9eba5..907252f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=`pwd`/debian/wmtv
+	$(MAKE) install BINDIR=/usr/bin DESTDIR=`pwd`/debian/wmtv
 
 binary-indep: build install
 # We have nothing to do.
@@ -44,7 +44,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installmanpages
+	dh_installman debian/wmtv.1
 	dh_installchangelogs CHANGES
 	dh_strip
 	dh_compress
diff --git a/debian/wmtv.1x b/debian/wmtv.1
similarity index 98%
rename from debian/wmtv.1x
rename to debian/wmtv.1
index 67bd968..65b4d4b 100644
--- a/debian/wmtv.1x
+++ b/debian/wmtv.1
@@ -1,4 +1,4 @@
-.TH WMTV 1 "July 2003"
+.TH WMTV 1 "August 2005"
 
 .SH "NAME"
 wmtv \- dockable video4linux TV player for WindowMaker.  
@@ -14,6 +14,10 @@ PAL/Secam/NTSC, fine tuning, full screen display, ...
 
 .SH "OPTIONS"
 .TP
+.B \-c, \-\-device
+Specifies the video4linux device to use.
+
+.TP
 .B \-d, \-\-display
 Specifies the X server to contact.
 
diff --git a/src/wmtv.c b/src/wmtv.c
index 9678084..e4d0bf3 100644
--- a/src/wmtv.c
+++ b/src/wmtv.c
@@ -77,7 +77,7 @@
 #define SETSPD		3
 
 #define MAXCHAN		99
-#define OPTIONS		"hvd:g:e:b:"
+#define OPTIONS		"hvd:g:e:b:c:"
 
 #define TELEVISION	0
 #define COMPOSITE   1
@@ -288,6 +288,7 @@ main(int argc, char *argv[])
 	int pressed_button = -1;
 	/* pid_t pid; */
 	static struct option long_options[] = {
+		{"device", 1, 0, 'c'},
 		{"display", 1, 0, 'd'},
 		{"geometry", 1, 0, 'g'},
 		{"bpp", 1, 0, 'b'},
@@ -338,6 +339,9 @@ main(int argc, char *argv[])
 					exe = strdup(optarg);
 					/* strcat(exe, " &"); */
 					break;
+				case 'c':
+					dev = strdup(optarg);
+					break;
 				case 'b':
 					fprintf(stderr, "wmtv: option not implemented yet\n");
 					Usage();
@@ -1677,6 +1681,7 @@ Usage(void)
 	fprintf(stderr, "\n");
 	fprintf(stderr, "wmtv v%s, Copyright (c) 1999 Wee Liang <wliang at tartarus.uwa.edu.au>\n", VERSION);
 	fprintf(stderr, "usage: wmtv [%s]\n", OPTIONS);
+	fprintf(stderr, "  -c, --device <file>\tsets video4linux device to use\n");
 	fprintf(stderr, "  -d, --display <host:vs>\tsets display name\n");
 	fprintf(stderr, "  -g, --geometry <{+-}XP{+-}YP>\tsets geometry\n");
 	fprintf(stderr, "  -b, --bpp\t\t\tdisplay color depth\n");

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