[Pkg-wmaker-commits] [wmtv] 10/48: Imported Debian patch 0.6.5-15
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Feb 1 20:13:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmtv.
commit e55aa722d889271360eda3277c8a454f39005b8e
Author: Nicolas Boullis <nboullis at debian.org>
Date: Thu Aug 28 22:53:19 2003 +0200
Imported Debian patch 0.6.5-15
---
Makefile | 6 ++--
debian/changelog | 20 +++++++++++
debian/conffiles | 1 -
debian/control | 13 +++----
debian/copyright | 2 +-
debian/rules | 10 +++---
debian/wmtv.1x | 101 +++++++++++++++++++++++--------------------------------
src/wmtv.c | 2 +-
8 files changed, 79 insertions(+), 76 deletions(-)
diff --git a/Makefile b/Makefile
index 3497aa6..a50683a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
#
# Makefile for wmtv
#
-DEBUG =
-CC = gcc
CPPFLAGS= -DGLOBALCONFFILE="\"$(ETCDIR)/wmtvrc\""
-CFLAGS = $(DEBUG) -O2 -Wall
-LDFLAGS = $(DEBUG) -L/usr/X11R6/lib
+CFLAGS = -O2 -Wall
+LDFLAGS = -L/usr/X11R6/lib
LIBS = -lXpm -lXext -lX11 -lXxf86dga -lXxf86vm
OBJS = src/wmtv.o src/wmgeneral/wmgeneral.o
PROG = wmtv
diff --git a/debian/changelog b/debian/changelog
index ac0d9ce..903e832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+wmtv (0.6.5-15) unstable; urgency=low
+
+ * Fixed long description thanks to Colin Watson.
+ * Fixed manpages thanks to Anthony DeRobertis.
+ * Fixed versionned build-dependency on debhelper thanks to lintian.
+ * Removed superfluous "(s)" to "Upstream Author(s)" to please lintian.
+ * Updated Makefile and debian/rules to support noopt in
+ $DEB_BUILD_OPTIONS.
+ * Bump Standards-Version: to 3.6.1.
+
+ -- Nicolas Boullis <nboullis at debian.org> Thu, 28 Aug 2003 22:53:19 +0200
+
+wmtv (0.6.5-14) unstable; urgency=low
+
+ * Removed duplicate entry in wmtv.conffiles.
+ * Changed maintainer's e-mail.
+ * wmtv now suggests xawtv.
+
+ -- Nicolas Boullis <nboullis at debian.org> Fri, 26 Jul 2002 21:29:21 +0200
+
wmtv (0.6.5-13) unstable; urgency=medium
* Added missing #include in wmtv.c.
diff --git a/debian/conffiles b/debian/conffiles
deleted file mode 100644
index d8826dc..0000000
--- a/debian/conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/wmtvrc
diff --git a/debian/control b/debian/control
index 988f389..920dd44 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
Source: wmtv
Section: x11
Priority: extra
-Maintainer: Nicolas Boullis <Boullis.Nicolas at libertysurf.fr>
-Build-Depends: debhelper (>=2.0.0), xlibs-dev
-Standards-Version: 3.5.6
+Maintainer: Nicolas Boullis <nboullis at debian.org>
+Build-Depends: debhelper (>=3.0.0), xlibs-dev
+Standards-Version: 3.6.1
Package: wmtv
Architecture: any
Depends: ${shlibs:Depends}, v4l-conf
+Suggests: xawtv
Description: Dockable video4linux TV player for WindowMaker
- A miniature size dockable TV appllication. It currently supports
- channel presets, PAL/SECAM/NTSC, fine tuning, scanning of TV stations,
- use of external TV application, and more.
+ A miniature size dockable TV application. It currently supports
+ channel presets, PAL/SECAM/NTSC, fine tuning, scanning of TV
+ stations, use of external TV applications, and more.
diff --git a/debian/copyright b/debian/copyright
index e828c50..8bf293a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Sun, 8 Aug 1999 14:52:41 -0400.
It was downloaded from http://www.student.uwa.edu.au/~wliang
-Upstream Author(s): Wee Liang <wliang at tartarus.uwa.edu.au>
+Upstream Author: Wee Liang <wliang at tartarus.uwa.edu.au>
Copyright:
This program is free software; you can redistribute it and/or modify
diff --git a/debian/rules b/debian/rules
index 0514279..be9eba5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,15 +10,17 @@
# This is the debhelper compatability version to use.
export DH_COMPAT=3
-DEBUG=
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-DEBUG=-g
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+CFLAGS += -O0
+else
+CFLAGS += -O2
endif
build: build-stamp
build-stamp:
dh_testdir
- $(MAKE) DEBUG=$(DEBUG)
+ $(MAKE) CFLAGS="$(CFLAGS)"
touch build-stamp
clean:
diff --git a/debian/wmtv.1x b/debian/wmtv.1x
index cea590d..67bd968 100644
--- a/debian/wmtv.1x
+++ b/debian/wmtv.1x
@@ -1,6 +1,5 @@
-.TH WMTV 1
-.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
+.TH WMTV 1 "July 2003"
+
.SH "NAME"
wmtv \- dockable video4linux TV player for WindowMaker.
@@ -11,10 +10,7 @@ wmtv \- dockable video4linux TV player for WindowMaker.
.SH "DESCRIPTION"
.BR wmtv
is a dockable video4linux TV player. It supports channel presets,
-PAL/Secam/NTSC, fine tuning, full screen display, ... This manual
-page was written for the Debian GNU/Linux distribution because the
-original program does not have a manual page. It is widely based on
-the README provided with the program.
+PAL/Secam/NTSC, fine tuning, full screen display, ...
.SH "OPTIONS"
.TP
@@ -23,13 +19,13 @@ Specifies the X server to contact.
.TP
.B \-e, \-\-exe
-Uses an external TV player to be launched when double clicking on the
-TV screen. It is possible to pass some parameters to this external
-application with % codes.
+Launch an external TV player when the screen is double clicked. It is
+possible to pass some parameters to this external application with %
+codes.
.SH "USAGE"
This sections describes how to use the application in docked
-state. See lower for fullscreen mode usage.
+state. See below for fullscreen mode usage.
Button map:
.br
@@ -38,70 +34,60 @@ Button map:
<1> <2> <3>
There are 3 modes of operation on this applications. You can cycle
-through the 3 modes by clicking on the right most button <3> repeatedly.
+through the 3 modes by clicking on the right most button <3>.
The 3 modes are described below:
.in +5
.B "On mode"
.br
-.B "-------"
-.br
Clicking on the rightmost button <3> for the first time (after the
-start of WMTV) would turn TV on. During this mode, the left <1> and
-right <2> but tons are used to change preset channels which has been
-defined in your config file. Left button to move down 1 channel and
-Right button to move up one channel.
+start of WMTV) will turn the TV on. While in this mode, the left <1>
+and right <2> buttons change to preset channels which has been defined
+in your config file. Use the left button to move down one channel and
+the right button to move up one channel.
.B "Tune mode"
.br
-.B "---------"
-.br
-Clicking again on button <3> after On mode would bring WMTV into
-tune mode. During this mode, the left <1> and right <2> buttons have
-two purposes individually. Left clicking on the left <1> or right <2>
-buttons would perform scans of channels. Scanning will stop when there
-is a strong signal strength. Right clicking on the left <1> or right
-<2> button would fine tune the current frequency. After tuning,
-clicking on button <3> would set the fine tuned offset into your
-config file and bring you back into "On mode".
+Clicking again on button <3> after On mode will change WMTV into tune
+mode. Left-clicking on the left <1> or right <2> button performs a
+channel scan. Scanning stops when there is a strong signal
+strength. Right-clicking on the left <1> or right <2> button fine
+tunes the current channel. After tuning, clicking on button <3> saves
+the fine tuning to your config file and brings you back into "On
+mode".
.B "Off mode"
.br
-.B "--------"
-.br
Holding down button <3> for about 3 seconds from any of the two
-modes described above, would turn the TV off.
+modes described above turns the TV off.
.in -5
-Right clicking once on the TV Screen would mute/unmute the audio.
+Right-clicking the TV screen mutes/unmutes the audio.
+
+Double left-clicking the TV screen launches the application specified
+with --exe. If --exe was not specified, then the built-in full-screen
+mode is used instead. Double middle-clicking will always invoke the
+built-in full screen mode.
-Double clicking LEFT mouse button on the TV Screen would launch your
-favorite TV application when specified with the -e/--exe option in the
-command line. If the external application is not set, It'll
-automatically switch to the build in full screen mode. Double clicking
-the MIDDLE mouse button on the TV Screen would bring you into the
-built in full screen mode.
.SH "FULL SCREEN MODE"
-Single click on any mouse button will return to initial screen.
+To exit full screen mode, click.
.B Keyboard functions
.br
-.B ------------------
-.br
.in +2
-Up - Switch preset channels up.
+Up - Change to next preset channel.
.br
-Down - Switch preset channels down.
+Down - Change to previous preset channel.
.br
-Right - Volume up. (If supported by the v4l device.)
+Right - Increase volume. (If supported by the v4l device.)
.br
-Left - Volume down. (If supported.)
+Left - Decrease volume. (If supported.)
.br
-Escape - Return to initial screen.
+Escape - Leave full screen mode.
.br
-m - mute/unmute audio.
+m - mute/unmute.
.br
.in -2
@@ -111,7 +97,7 @@ through % codes:
.br
.in +2
.B %%
-is replaced by a single raw %.
+is replaced by a single %.
.br
.B %n
is replaced by the name of the current channel.
@@ -120,16 +106,16 @@ is replaced by the name of the current channel.
is replaced by the number of the current channel.
.br
.B %f
-is replaced by the current frequency.
+is replaced by the current frequency in MHz.
.br
.in -2
-Other % codes my lead to unspecified behaviors.
+The behavior of other % codes is undefined and subject to change.
Example: wmtv -e 'xawtv "%n"'
.SH "CONFIGURATION FILE"
-This section describes on how to configure WMTV's configuration file.
-Your configuration file is located in your home directory as ".wmtvrc".
+This section describes the format of WMTV's configuration file. It is
+located in your home directory under ".wmtvrc".
Excerpt from a sample config file:
.in +5
@@ -170,8 +156,6 @@ S21 LAST CHANNEL
.B Settings
.br
-.B --------
-.br
source = { Television | CompositeX | S-Video } (X is an integer)
.br
.sp
@@ -246,12 +230,11 @@ System wide config file.
.I ~/.wmtvrc
Users config file.
-.\".SH "SEE ALSO"
-.\"The programs are documented fully by
-.\".IR "The Rise and Fall of a Fooish Bar" ,
-.\"available via the Info system.
.SH AUTHOR
This manual page was first written by Remi Lefebvre <remi at debian.org>,
-and then modified by Nicolas Boullis <Boullis.Nicolas at libertysurf.fr>,
+and then modified by Nicolas Boullis <nboullis at debian.org>,
for the Debian GNU/Linux system (but may be used by others).
+This manual page was written for the Debian GNU/Linux distribution
+because the original program does not have a manual page. It is widely
+based on the README provided with the program.
diff --git a/src/wmtv.c b/src/wmtv.c
index 00810bd..9678084 100644
--- a/src/wmtv.c
+++ b/src/wmtv.c
@@ -547,7 +547,7 @@ main(int argc, char *argv[])
snprintf(expansions[0], 3, "%d", cchannel+1);
expansions[1] = comment[cchannel];
expansions[2] = malloc(15*sizeof(char));
- snprintf(expansions[2], 15, "%ld", rfreq);
+ snprintf(expansions[2], 15, "%.3f", (double)rfreq/(double)st);
command = expand_format(exe, letters, expansions);
/* system(exe); */
child_pid = fork();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtv.git
More information about the Pkg-wmaker-commits
mailing list