Imported Debian patch 1.1.1+rev1457-2debian/1.1.1+rev1457-2

6 files changed, 1086 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 119bf7f..cd5ba41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+linuxtv-dvb-apps (1.1.1+rev1457-2) unstable; urgency=low
+
+  * Fixed upstream "be-Schoten and be-Antwerp run on 506MHz" (Closes: #566336)
+  * Add apps_manpages.patch - Thanks Uwe (Closes: #312570)
+  * Added & refresh alevt.patch - Thks Uwe 
+  * Add Build-Depends: libzvbi-dev
+
+ -- Mark Purcell <msp@debian.org>  Thu, 05 Jan 2012 22:39:17 +1100
+
 linuxtv-dvb-apps (1.1.1+rev1457-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index c1e988f..fbd0590 100644
--- a/debian/control
+++ b/debian/control
@@ -31,12 +31,13 @@ Description: Digital Video Broadcasting (DVB) applications
   . gnutv              - Tune, watch and stream your TV
  .
  General Utilities:
-  . util/dvbdate    - Set your clock from digital TV
-  . util/dvbnet     - Control digital data network interfaces
-  . util/dvbtraffic - Monitor traffic on a digital device
-  . util/femon      - Monitor the tuning on a digital TV device
-  . util/zap        - *Just* tunes a digital device
-  . util/atsc_epg   - Display ATSC Electronic Program Guide (next programs)
+  . dvbdate    - Set your clock from digital TV
+  . dvbnet     - Control digital data network interfaces
+  . dvbtraffic - Monitor traffic on a digital device
+  . femon      - Monitor the tuning on a digital TV device
+  . zap        - *Just* tunes a digital device
+  . atsc_epg   - Display ATSC Electronic Program Guide (next programs)
+  . alevt      - Teletext browser
  .
  Hardware Specific Utilities:
   . util/av7110_loadkeys    - Load remote keys into an av7110 based card
diff --git a/debian/dvb-apps.lintian-overrides b/debian/dvb-apps.lintian-overrides
new file mode 100644
index 0000000..3603e30
--- /dev/null
+++ b/debian/dvb-apps.lintian-overrides
@@ -0,0 +1,6 @@
+dvb-apps: sharedobject-in-library-directory-missing-soname usr/lib/libucsi.so
+dvb-apps: sharedobject-in-library-directory-missing-soname usr/lib/libdvbapi.so
+dvb-apps: sharedobject-in-library-directory-missing-soname usr/lib/libdvben50221.so
+dvb-apps: sharedobject-in-library-directory-missing-soname usr/lib/libdvbsec.so
+dvb-apps: sharedobject-in-library-directory-missing-soname usr/lib/libdvbcfg.so
+dvb-apps: sharedobject-in-library-directory-missing-soname usr/lib/libesg.so
diff --git a/debian/patches/alevt.patch b/debian/patches/alevt.patch
new file mode 100644
index 0000000..e271350
--- /dev/null
+++ b/debian/patches/alevt.patch
@@ -0,0 +1,173 @@
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/ChangeLog
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/ChangeLog	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/ChangeLog	2012-01-05 22:23:33.000000000 +1100
+@@ -1,11 +1,11 @@
+-Thu Feb 11 22:05:00 MET 2010	(1.7.0)
++Sat Feb 14 15:10:00 MET 2010	(1.7.0)
+ 
+     - redesigned version:
+     - outfile, new starting methods, libzvbi implementation
+     - lots of bug fixes, all patches available in the Internet applied
+-    - extensive code cleanup
++    - intensive code cleanup
+ 
+-Mon Dec  3 03:11:07 MET 2007	(1.6.2)
++Mon Dec 3 03:11:07 MET 2007	(1.6.2)
+ 
+     - compilation fixes for newer gcc
+     - makefile tweaks (man vs share/man, /usr/X11R6 vs /usr, etc)
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/README
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/README	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/README	2012-01-05 22:23:33.000000000 +1100
+@@ -13,7 +13,7 @@
+ 3. lots of cruft which is completely outdated or obsolete for other reasons
+ 
+ To handle all that in one big effort I decided to redesign the program
+-completely, enlarging its capabilities for DVB-S at the same time.
++completely, enlarging its DVB capabilities at the same time.
+ 
+ So here are the changes:
+ 
+@@ -22,8 +22,7 @@
+ 
+ 2. Erasure of old outdated integers, functions, parameters:
+ 
+-- bell, big_buf, debug, display, editor, erc, fine_tune, newbttv,
+-- oldbttv
++- bell, big_buf, debug, display, editor, erc, fine_tune, newbttv, oldbttv.
+ 
+ 3. Coding style cleanups (no superfluous comments, not more than
+    80 characters per column, no uncommented code.
+@@ -52,20 +51,24 @@
+    make install" there is an uninstaller now to revert the installation:
+    "make uninstall".
+ 
+-ENJOY IT!
++External dependencies to run that program:
+ 
+-Uwe Bugla, February 11th, 2010.
++AleVT needs some some system libraries to be installed in your system.
++- libc6 (>= 2.3.6)
++- libpng12 (>= 1.2.13)
++- libx11 (>= 1.3.3)
++- libzvbi0 (>= 0.2.11)
++- zlib (>= 1.1.4)
+ 
+-External dependencies
++ENJOY IT!
+ 
+-AleVT needs some system libraries to be installed in your system.
+-They are zlib, libX11, libpng and libzvbi.
++Uwe Bugla, February 14th, 2010.
+ 
+ Credits go to:
+ - Andreas Rottmann from debian.org for compiler fixes and
+   other kinds of investigation.
+ - Francesco Lavra for supplying a kernel patch to avoid kernel demux
+-  incompatibilities with kernels >= 2.6.32
++  incompatibilities with kernels 2.6.32-rc1 - 2.6.33-rc7
+ - Andy Walls for helpful investigation in kernelspace
+ - Edgar Toernig for providing the source version 1.6.2 and doing all the
+   development for the basic versions
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/TODO
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/TODO	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/TODO	2012-01-05 22:23:33.000000000 +1100
+@@ -1,12 +1,18 @@
+-Hi, these are issues that I unfortunately cannot resolve myself:
++These are issues that I unfortunately cannot resolve myself:
+ 
+-1. graphical menu written in GKT2, to be used in general connection with
++1. Most important: for usage without script and outfile option:
++    DVB monitoring demon helping the program to rewrite the PAT
++    (Program Allocation Table) when the external player software
++    has chosen a channel which is part of a new transponder.
++    At the moment alevt hangs when the transponder is changed by an
++    external player software.
++    It then can only be stopped via "killall -9 alevt".
++    Or you switch it off before every channel change.
++
++2. Graphical menu written in GKT2, to be used in general connection with
+     the outfile (-o) option.
+ 
+-2. for usage without script and outfile option:
+-    DVB monitoring demon helping the program to rewrite the PAT when the
+-    external player software has chosen a channel which is part of a
+-    new transponder.
+-    At the moment alevt hangs when the transponder is changed.
++3. New BDF fonts for slightly bigger windows.
++    Those BDF fonts need to be edited so that they can be transformed by bdf2xbm.
+ 
+-Uwe Bugla, February 11th, 2010.
++Uwe Bugla, February 14th, 2010.
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/vbi.c
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/vbi.c	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/vbi.c	2012-01-05 22:23:33.000000000 +1100
+@@ -706,10 +706,6 @@
+ 			}
+ 		j = i + 5;
+ 		i = j + (((tbl[i+3] << 8) | tbl[i+4]) & 0x0fff);
+-		if (!progp) {
+-			error("SDT: service_id 0x%x not in PAT\n", k);
+-			continue;
+-		}
+          while (j < i) {
+             switch (tbl[j]) {
+                case 0x48: // service descriptor
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/Makefile	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/Makefile	2012-01-05 22:23:33.000000000 +1100
+@@ -19,3 +19,4 @@
+ 	$(MAKE) -C gotox $@
+ 	$(MAKE) -C zap $@
+ 	$(MAKE) -C lsdvb $@
++	$(MAKE) -C alevt $@
+Index: linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/Makefile
+===================================================================
+--- linuxtv-dvb-apps-1.1.1+rev1457.orig/util/alevt/Makefile	2011-12-08 01:26:50.000000000 +1100
++++ linuxtv-dvb-apps-1.1.1+rev1457/util/alevt/Makefile	2012-01-05 22:27:12.000000000 +1100
+@@ -57,28 +57,36 @@
+ 	rm -f alevt alevt-date alevt-cap
+ 
+ rpm-install: all
++	install -d 0755 ${RPM_BUILD_ROOT}$(USR_X11R6)/bin
++	install -d 0755 ${RPM_BUILD_ROOT}$(USR_X11R6)/$(MAN)/man1
++	install -d 0755 $(RPM_BUILD_ROOT)$(USR_X11R6)/include/X11/pixmaps
++
+ 	install -m 0755 alevt        ${RPM_BUILD_ROOT}$(USR_X11R6)/bin
+ 	install -m 0755 alevt-date   ${RPM_BUILD_ROOT}$(USR_X11R6)/bin
+ 	install -m 0755 alevt-cap    ${RPM_BUILD_ROOT}$(USR_X11R6)/bin
+ 	install -m 0644 alevt.1      ${RPM_BUILD_ROOT}$(USR_X11R6)/$(MAN)/man1
+ 	install -m 0644 alevt-date.1 ${RPM_BUILD_ROOT}$(USR_X11R6)/$(MAN)/man1
+ 	install -m 0644 alevt-cap.1  ${RPM_BUILD_ROOT}$(USR_X11R6)/$(MAN)/man1
+-	install -d 0755 $(RPM_BUILD_ROOT)$(USR_X11R6)/include/X11/pixmaps
+-	install -m 0644 alevt.png $(RPM_BUILD_ROOT)$(USR_X11R6)/include/X11/pixmaps
++	install -m 0644 icon.xbm $(RPM_BUILD_ROOT)$(USR_X11R6)/include/X11/pixmaps/alevt.xbm
+ 
+ install: all
++	install -d 0755 $(DESTDIR)$(PREFIX)/bin
++	install -d 0755 $(DESTDIR)$(PREFIX)/share/man/man1
++	install -d 0755 $(DESTDIR)$(PREFIX)/share/pixmaps
++	install -d 0755 $(DESTDIR)$(PREFIX)/share/applications
++
+ 	install -m 0755 alevt		$(DESTDIR)$(PREFIX)/bin
+ 	install -m 0755 alevt-date	$(DESTDIR)$(PREFIX)/bin
+ 	install -m 0755 alevt-cap	$(DESTDIR)$(PREFIX)/bin
+ 	install -m 0644 alevt.1		$(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 alevt-date.1	$(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 alevt-cap.1	$(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 0644 alevt.png $(DESTDIR)$(PREFIX)/share/pixmaps
++	install -m 0644 icon.xbm $(DESTDIR)$(PREFIX)/share/pixmaps/alevt.xbm
+ 	install -m 0644 alevt.desktop $(DESTDIR)$(PREFIX)/share/applications
+ 
+ uninstall: clean
+ 	rm -f /usr/bin/alevt /usr/bin/alevt-cap /usr/bin/alevt-date \
+-	/usr/share/pixmaps/alevt.png /usr/share/applications/alevt.desktop \
++	/usr/share/pixmaps/alevt.xbm /usr/share/applications/alevt.desktop \
+ 	/usr/share/man/man1/alevt.1 /usr/share/man/man1/alevt-cap.1 \
+ 	/usr/share/man/man1/alevt-date.1
+ 
diff --git a/debian/patches/apps_manpages.patch b/debian/patches/apps_manpages.patch
new file mode 100644
index 0000000..a459446
--- /dev/null
+++ b/debian/patches/apps_manpages.patch
@@ -0,0 +1,889 @@
+--- a/Make.rules
++++ b/Make.rules
+@@ -33,6 +33,7 @@
+ includedir ?= $(prefix)/include
+ libdir     ?= $(prefix)/lib
+ sharedir   ?= $(prefix)/share
++mandir     ?= $(prefix)/share/man/man1
+ 
+ ifneq ($(DESTDIR),)
+ DESTDIR := $(DESTDIR)/
+@@ -64,6 +65,11 @@
+ 	mkdir -p $(DESTDIR)$(bindir)
+ 	install -m 755 $(inst_bin) $(DESTDIR)$(bindir)/
+ endif
++ifneq ($(inst_man),)
++	@echo installing manpages
++	@mkdir -p $(DESTDIR)$(mandir)
++	@install -m 755 $(inst_man) $(DESTDIR)$(mandir)/
++endif
+ else
+ %.o: %.c
+ 	@echo CC $@
+@@ -99,6 +105,11 @@
+ 	@mkdir -p $(DESTDIR)$(bindir)
+ 	@install -m 755 $(inst_bin) $(DESTDIR)$(bindir)/
+ endif
++ifneq ($(inst_man),)
++	@echo installing manpages
++	@mkdir -p $(DESTDIR)$(mandir)
++	@install -m 755 $(inst_man) $(DESTDIR)$(mandir)/
++endif
+ endif
+ 
+ -include $(prerequisites)
+--- a/Makefile
++++ b/Makefile
+@@ -6,6 +6,7 @@
+ 	$(MAKE) -C lib $@
+ 	$(MAKE) -C test $@
+ 	$(MAKE) -C util $@
++	$(MAKE) -C man $@
+ 
+ update:
+ 	@echo "Pulling changes & updating from master repository"
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -0,0 +1,14 @@
++manpages = *.1
++inst_man = $(manpages)
++
++.PHONY: all
++all: $(manpages)
++$(manpages): atsc_epg.1 av7110_loadkeys.1 azap.1 czap.1 dib3000-watch.1 \
++dst_test.1 dvbdate.1 dvbnet.1 dvbscan.1 dvbtraffic.1 femon.1 gnutv.1 gotox.1 \
++scan.1 szap.1 tzap.1 zap.1
++include ../Make.rules
++
++install::
++	@echo installing manpages
++	@mkdir -p $(DESTDIR)$(mandir)
++	@install -m 644 *.1 $(DESTDIR)$(mandir)/
+--- a/man/atsc_epg.1
++++ b/man/atsc_epg.1
+@@ -0,0 +1,35 @@
++.TH atsc_epg 1 "February 14, 2010"
++.SH NAME
++atsc_epg \- an electronic program guide using ATSC devices.
++.SH SYNOPSIS
++.B atsc_epg
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B atsc_epg
++commands.
++.PP
++\fBatsc_epg\fP is an electronic program guide for ATSC devices.
++.SH OPTIONS
++.TP
++.B \-a
++adapter index to use, (default 0)
++.TP
++.B \-f
++tuning frequency
++.TP
++.B \-h
++print this help text
++.TP
++.B \-p
++period in hours, (default 12)
++.TP
++.B \-m
++modulation ATSC vsb_8|vsb_16 (default vsb_8)
++.TP
++.B \-t
++enable ETT to receive program details, if available
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/av7110_loadkeys.1
++++ b/man/av7110_loadkeys.1
+@@ -0,0 +1,26 @@
++.TH av7110_loadkeys 1 "February 14, 2010"
++.SH NAME
++av7110_loadkeys \- a program to load keymaps.
++.SH SYNOPSIS
++.B av7110_loadkeys
++.RI [ options ] keymap_filename.(rc5|rcmm
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B av7110_loadkeys
++commands.
++.PP
++\fBav7110_loadkeys\fP is a program to load keymaps.
++.SH OPTIONS
++.TP
++.B \-i
++invert
++.TP
++.B \-a
++address <num>
++.TP
++.B \-h
++print this help text
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/azap.1
++++ b/man/azap.1
+@@ -0,0 +1,35 @@
++.TH azap 1 "February 14, 2010"
++.SH NAME
++azap \- a program to process channels.conf files.
++.SH SYNOPSIS
++.B azap
++.RI [ options ] <channel name>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B azap
++commands.
++.PP
++\fBazap\fP is a program to process a channels.conf file.
++.SH OPTIONS
++.TP
++.B \-a adapter_num
++use given adapter (default 0)
++.TP
++.B \-f frontend_id
++use given frontend (default 0)
++.TP
++.B \-d demux_id
++use given demux (default 0)
++.TP
++.B \-c conf_file
++read channels list from 'file'
++.TP
++.B \-r
++set up /dev/dvb/adapterX/dvr0 for TS recording
++.TP
++.B \-h
++print this help text
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/czap.1
++++ b/man/czap.1
+@@ -0,0 +1,46 @@
++.TH czap 1 "February 14, 2010"
++.SH NAME
++czap \- a program to process channels.conf files.
++.SH SYNOPSIS
++.B czap
++.RI [ options ] <channel name>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B czap
++commands.
++.PP
++\fBczap\fP is a program to process a channels.conf file.
++.SH OPTIONS <channel name>
++.TP
++.B \-a adapter_num
++use given adapter (default 0)
++.TP
++.B \-f frontend_id
++use given frontend (default 0)
++.TP
++.B \-d demux_id
++use given demux (default 0)
++.TP
++.B \-c conf_file
++read channels list from 'file'
++.TP
++.B \-H
++produce human readable output
++.TP
++.B \-n channel_num
++use given channel number
++.TP
++.B \-x
++exit after tuning
++.TP
++.B \-c conf_file -l
++list channel names in channels.conf file
++.B \-r
++set up /dev/dvb/adapterX/dvr0 for TS recording
++.TP
++.B \-h
++print this help text
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/dib3000-watch.1
++++ b/man/dib3000-watch.1
+@@ -0,0 +1,34 @@
++.TH dib3000-watch 1 "February 14, 2010"
++.SH NAME
++dib3000-watch \- a program to check DVB cards.
++.SH SYNOPSIS
++.B dib3000-watch
++.RI [ options ] <channel name>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B dib3000-watch
++commands.
++.PP
++\fBdib3000-watch\fP is a program to check DVB cards.
++.SH OPTIONS
++.TP
++.B \-d <i2c-device>
++-d: normally one of /dev/i2c-[0-255]
++.TP
++.B \-a <i2c-address>
++-a: is 8 for DiB3000M-B and 9, 10, 11 or 12 for DiB3000M-C or DiB3000-P
++.TP
++.B \-o <type>
++-o: output type (print|csv) (default: print)
++.TP
++.B \-i <seconds>
++-i: query interval in seconds (default: 0.1)
++.TP
++.B \-h
++print this help text
++.br
++.SH AUTHOR
++Copyright (C) 2005 by Patrick Boettcher <patrick.boettcher@desy.de>
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/dst_test.1
++++ b/man/dst_test.1
+@@ -0,0 +1,41 @@
++.TH dst_test 1 "February 14, 2010"
++.SH NAME
++dst_test \- a Twinhan DST and clones test utility.
++.SH SYNOPSIS
++.B dst_test
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B dst_test
++commands.
++.PP
++\fBdst_test\fP is a Twinhan DST and clones test utility.
++.SH OPTIONS
++.TP
++.B \-c
++capabilities
++.TP
++.B \-i
++info
++.TP
++.B \-r
++reset
++.TP
++.B \-p
++pid
++.TP
++.B \-g
++get descr
++.TP
++.B \-s
++set_descr
++.TP
++.B \-a
++app_info
++.TP
++.B \-t
++session test
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/dvbdate.1
++++ b/man/dvbdate.1
+@@ -0,0 +1,38 @@
++.TH dvbdate 1 "February 14, 2010"
++.SH NAME
++dvbdate \- a program to show the actual time.
++.SH SYNOPSIS
++.B dvbdate
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B dvbdate
++commands.
++.PP
++\fBdvbdate\fP is a program to show the actual time.
++.SH OPTIONS
++.TP
++.B \-a --adapter
++adapter to use, default: 0
++.TP
++.B \-p --print
++print current time, received time and delta
++.TP
++.B \-s --set
++set the system clock to received time
++.TP
++.B \-f --force
++force the setting of the clock
++.TP
++.B \-q --quiet
++be silent
++.TP
++.B \-h --help
++display this message
++.TP
++.B \-t --timeout n
++max seconds to wait, default: 25
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/dvbnet.1
++++ b/man/dvbnet.1
+@@ -0,0 +1,38 @@
++.TH dvbnet 1 "February 14, 2009"
++.SH NAME
++dvbnet \- a DVB Network Interface Manager.
++.SH SYNOPSIS
++.B dvbnet
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B dvbnet
++commands.
++.PP
++\fBdvbnet\fP is a DVB Network Interface Manager.
++.SH OPTIONS
++.TP
++.B \-a AD
++Adapter card (default 0)
++.TP
++.B \-n DD
++Demux (default 0)
++.TP
++.B \-p PID
++Add interface listening on PID
++.TP
++.B \-d NUM
++Remove interface NUM
++.TP
++.B \-l
++List currently available interfaces
++.TP
++.B \-U
++use ULE framing (default: MPE)
++.TP
++.B \-v
++Print current version
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/dvbscan.1
++++ b/man/dvbscan.1
+@@ -0,0 +1,72 @@
++.TH dvbscan 1 "February 14, 2009"
++.SH NAME
++dvbscan \- a program to produce DVB-T channels.conf files.
++.SH SYNOPSIS
++.B dvbscan
++.RI [ options ] <initial scan file>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B dvbscan
++commands.
++.PP
++\fBdvbscan\fP is a program to produce DVB-T channels.conf files.
++.SH OPTIONS
++.TP
++.B \ -h
++print this help text
++.TP
++.B \-adapter <id>
++adapter to use (default 0)
++.TP
++.B \-frontend <id>
++frontend to use (default 0)
++.TP
++.B \-demux <id>
++demux to use (default 0)
++.TP
++.B \-secfile <filename>
++Optional sec.conf file
++.TP
++.B \-secid <secid>
++ID of the SEC configuration to use, one of:
++	* UNIVERSAL (default) - Europe, 10800 to 11800 MHz and 11600 to 12700 Mhz,\
++	  Dual LO, loband 9750, hiband 10600 MHz
++	* DBS - Expressvu, North America, 12200 to 12700 MHz, Single LO, 11250 MHz
++	* STANDARD - 10945 to 11450 Mhz, Single LO, 10000 Mhz
++	* ENHANCED - Astra, 10700 to 11700 MHz, Single LO, 9750 MHz
++	* C-BAND - Big Dish, 3700 to 4200 MHz, Single LO, 5150 Mhz
++	* C-MULTI - Big Dish - Multipoint LNBf, 3700 to 4200 MHz, Dual LO, H:5150MHz, V:5750MHz
++	* One of the sec definitions from the secfile if supplied
++.TP
++.B \-satpos <position>
++Specify DISEQC switch position for DVB-S
++.TP
++.B \-inversion <on|off|auto>
++Specify inversion (default: auto)
++.TP
++.B \-uk-ordering
++Use UK DVB-T channel ordering if present.
++.TP
++.B \-timeout <secs>
++Specify filter timeout to use (standard specced values will be used by default)
++.TP
++.B \-filter <filter>
++Specify service filter, a comma seperated list of the following tokens:
++If no filter is supplied, all services will be output
++	* tv - Output TV channels
++	* radio - Output radio channels
++	* other - Output other channels
++	* encrypted - Output encrypted channels
++.TP
++.B \-out raw <filename>|-
++Output in raw format to <filename> or stdout
++.B \-out channels <filename>|-
++Output in channels.conf format to <filename> or stdout
++.B \-out vdr12 <filename>|-
++Output in vdr 1.2.x format to <filename> or stdout
++.B \-out vdr13 <filename>|-
++Output in vdr 1.3.x format to <filename> or stdout
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/dvbtraffic.1
++++ b/man/dvbtraffic.1
+@@ -0,0 +1,26 @@
++.TH dvbtraffic 1 "February 14, 2010"
++.SH NAME
++dvbtraffic \- a program to show satellite traffic.
++.SH SYNOPSIS
++.B dvbtraffic
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B dvbtraffic
++commands.
++.PP
++\fBdvbtraffic\fP is a program to show satellite traffic.
++.SH OPTIONS
++.TP
++.B \-a N
++use dvb adapter N
++.TP
++.B \-d N
++use demux N
++.TP
++.B \-h
++display this help
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/femon.1
++++ b/man/femon.1
+@@ -0,0 +1,32 @@
++.TH femon 1 "February 14, 2010"
++.SH NAME
++femon \- a program to monitor DVB frontend signal input.
++.SH SYNOPSIS
++.B femon
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B femon
++commands.
++.PP
++\fBfemon\fP is a program to monitor DVB frontend signal input.
++.SH OPTIONS
++.TP
++.B \-h
++print this help text
++.TP
++.B \-H
++human readable output
++.TP
++.B \-a number
++use given adapter (default 0)
++.TP
++.B \-f number
++use given frontend (default 0)
++.TP
++.B \-c number
++samples to take (default 0 = infinite)
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/gnutv.1
++++ b/man/gnutv.1
+@@ -0,0 +1,79 @@
++.TH gnutv 1 "February 14, 2010"
++.SH NAME
++gnutv \- a digital tv utility.
++.SH SYNOPSIS
++.B gnutv
++.RI [ options ] <channel name>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B gnutv
++commands.
++.PP
++\fBgnutv\fP is a digital tv utility.
++.SH OPTIONS
++.TP
++.B \-adapter <id>
++adapter to use (default 0)
++.TP
++.B \-frontend <id>
++frontend to use (default 0)
++.TP
++.B \-demux <id>
++demux to use (default 0)
++.TP
++.B \-caslotnum <id>
++ca slot number to use (default 0)
++.TP
++.B \-channels <filename>
++channels.conf file
++.TP
++.B \-secfile <filename>
++Optional sec.conf file
++.TP
++.B \-secid <secid>
++ID of the SEC configuration to use, one of:
++	* UNIVERSAL (default) - Europe, 10800 to 11800 MHz and 11600 to 12700 Mhz,\
++	  Dual LO, loband 9750, hiband 10600 MHz
++	* DBS - Expressvu, North America, 12200 to 12700 MHz, Single LO, 11250 MHz
++	* STANDARD - 10945 to 11450 Mhz, Single LO, 10000 Mhz
++	* ENHANCED - Astra, 10700 to 11700 MHz, Single LO, 9750 MHz
++	* C-BAND - Big Dish, 3700 to 4200 MHz, Single LO, 5150 Mhz
++	* C-MULTI - Big Dish - Multipoint LNBf, 3700 to 4200 MHz, Dual LO, H:5150MHz, V:5750MHz
++	* One of the sec definitions from the secfile if supplied
++.TP
++.B \-out decoder
++Output to hardware decoder (default)
++.TP
++.B -out decoderabypass
++Output to hardware decoder using audio bypass
++.B -out dvr
++Output stream to dvr device
++.B -out null
++Do not output anything
++.B -out stdout
++Output to stdout
++.B -out file <filename>
++Output stream to file
++.B -out udp <address> <port>
++Output stream to address:port using udp
++.B -out udpif <address> <port> <interface>
++Output stream to address:port using udp forcing the specified interface
++.B -out rtp <address> <port>
++Output stream to address:port using udp-rtp
++.B -out rtpif <address> <port> <interface>
++Output stream to address:port using udp-rtp forcing the specified interface
++.TP
++.B \-timeout <secs>
++Number of seconds to output channel for (0=>exit immediately after successful tuning, default is to output forever)
++.TP
++.B \-cammenu
++Show the CAM menu
++.TP
++.B \-nomoveca
++Do not attempt to move CA descriptors from stream to programme level
++.B \-h
++print this help text
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/gotox.1
++++ b/man/gotox.1
+@@ -0,0 +1,33 @@
++.TH gotox 1 "February 14, 2010"
++.SH NAME
++gotox \- a program to operate a rotor of a satellite dish.
++.SH SYNOPSIS
++.B gotox
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B gotox
++commands.
++.PP
++\fBgotox \fP is a program to operate a rotor set to tune a satellite dish.
++.SH OPTIONS
++.TP
++.B \-h
++print this help text
++.TP
++.B \-d degrees
++Goto the specified angle. Positive value for East rotation,
++negative value for West rotation on Northern Hemisphere (default 0)
++.TP
++.B \-a number
++use given adapter (default 0)
++.TP
++.B \-f number
++use given frontend (default 0)
++.TP
++.B \-t seconds
++leave power on to rotor for at least specified seconds of time (default 30)
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/scan.1
++++ b/man/scan.1
+@@ -0,0 +1,85 @@
++.TH scan 1 "February 14, 2010"
++.SH NAME
++scan \- a program to produce channel.conf files.
++.SH SYNOPSIS
++.B scan
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B scan
++commands.
++.PP
++\fBscan\fP is a program to produce channels.conf files.
++.SH OPTIONS
++.TP
++.B \-c	[initial-tuning-data-file]
++scan on currently tuned transponder only
++.TP
++.B \-v
++verbose (repeat for more)
++.TP
++.B \-q
++quiet (repeat for less)
++.TP
++.B \-a N
++use DVB /dev/dvb/adapterN/
++.TP
++.B \-f N
++use DVB /dev/dvb/adapter?/frontendN
++.TP
++.B \-d N
++use DVB /dev/dvb/adapter?/demuxN
++.TP
++.B \-s N
++use DiSEqC switch position N (DVB-S only)
++.TP
++.B \-i N
++spectral inversion setting (0: off, 1: on, 2: auto [default])
++.TP
++.B \-n
++evaluate NIT-other for full network scan (slow!)
++.TP
++.B \-5
++multiply all filter timeouts by factor 5 for non-DVB-compliant section repitition rates
++.TP
++.B \-o fmt
++output format: 'zap' (default), 'vdr' or 'pids' (default with -c)
++.TP
++.B \-x N
++Conditional Access, (default -1)
++	N=0 gets only FTA channels
++	N=-1 gets all channels
++	N=xxx sets ca field in vdr output to :xxx:
++.TP
++.B \-t N
++Service select, Combined bitfield parameter.
++1 = TV, 2 = Radio, 4 = Other, (default 7)
++.TP
++.B \-p
++for vdr output format: dump provider name
++.TP
++.B \-e N
++	VDR version, default 3 for VDR-1.3.x and newer value 2 sets NIT and TID to zero
++	Vdr version 1.3.x and up implies -p.
++.TP
++.B \-l
++lnb-type (DVB-S Only) (use -l help to print types) or
++.TP
++.B \-l
++low[,high[,switch]] in Mhz
++.TP
++.B \-u
++UK DVB-T Freeview channel numbering for VDR
++.TP
++.B \-P
++do not use ATSC PSIP tables for scanning (but only PAT and PMT) (applies for ATSC only)
++.TP
++.B \-A N
++check for ATSC 1=Terrestrial [default], 2=Cable or 3=both
++.TP
++.B \-U
++Uniquely name unknown services
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/szap.1
++++ b/man/szap.1
+@@ -0,0 +1,57 @@
++.TH szap 1 "February 14, 2010"
++.SH NAME
++szap \- a program to process channels.conf files.
++.SH SYNOPSIS
++.B szap
++.RI [ options ]
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B szap
++commands.
++.PP
++\fBszap\fP is a program to process a channels.conf file.
++.SH OPTIONS
++.TP
++.B \-n channel-number | channel_name
++zap to channel via number or full name (case insensitive)
++.TP
++.B \-q
++list known channels
++.TP
++.B \-a number
++use given adapter (default 0)
++.TP
++.B \-f number
++use given frontend (default 0)
++.TP
++.B \-d number
++use given demux (default 0)
++.TP
++.B \-c file
++read channels list from 'file'
++.TP
++.B \-b
++enable Audio Bypass (default no)
++.TP
++.B \-x
++exit after tuning
++.TP
++.B \-H
++human readable output
++.TP
++.B \-r
++set up /dev/dvb/adapterX/dvr0 for TS recording
++.TP
++.B \-l lnb-type (DVB-S Only) (use -l help to print types) or
++.TP
++.B \-l low[,high[,switch]] in Mhz
++.TP
++.B \-i
++run interactively, allowing you to type in channel names
++.TP
++.B \-p
++add pat and pmt to TS recording (implies -r) or -n numbers for zapping
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/tzap.1
++++ b/man/tzap.1
+@@ -0,0 +1,56 @@
++.TH tzap 1 "February 14, 2010"
++.SH NAME
++tzap \- a program to process channels.conf files.
++.SH SYNOPSIS
++.B tzap
++.RI [ options ] <channel_name>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B tzap
++commands.
++.PP
++\fBtzap\fP is a program to process channels.conf files.
++.SH OPTIONS
++.TP
++.B \-a number
++use given adapter (default 0)
++.TP
++.B \-f number
++use given frontend (default 0)
++.TP
++.B \-d number
++use given demux (default 0)
++.TP
++.B \-c file
++read channels list from 'file'
++.TP
++.B \-x
++exit after tuning
++.TP
++.B \-H
++human readable output
++.TP
++.B \-r
++set up /dev/dvb/adapterX/dvr0 for TS recording
++.TP
++.B \-s
++only print summary
++.TP
++.B \-S
++run silently (no output)
++.TP
++.B \-F
++set up frontend only, don't touch demux
++.TP
++.B \-t number
++timeout (seconds)
++.TP
++.B \-o file
++output filename (use -o - for stdout)
++.TP
++.B \-h
++display this help and exit
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
+--- a/man/zap.1
++++ b/man/zap.1
+@@ -0,0 +1,44 @@
++.TH zap 1 "February 14, 2010"
++.SH NAME
++zap \- a program to process channels.conf files.
++.SH SYNOPSIS
++.B zap
++.RI [ options ] <channel name>
++.br
++.SH DESCRIPTION
++This manual page documents briefly the
++.B zap
++commands.
++.PP
++\fBzap\fP is a program to process a channels.conf file.
++.SH OPTIONS
++.TP
++.B \-adapter <id>
++adapter to use (default 0)
++.TP
++.B \-frontend <id>
++frontend to use (default 0)
++.TP
++.B \-demux <id>
++demux to use (default 0)
++.TP
++.B \-caslotnum <id>
++ca slot number to use (default 0)
++.TP
++.B \-channels <filename>
++channels.conf file
++.TP
++.B \-secfile <filename>
++Optional sec.conf file
++.TP
++.B \-secid <secid>
++ID of the SEC configuration to use
++.TP
++.B \-nomoveca
++Do not attempt to move CA descriptors from stream to program level
++.TP
++.B \-h
++print this help text
++.br
++.PP
++This manual page was written by Uwe Bugla <uwe.bugla@gmx.de>.
diff --git a/debian/patches/series b/debian/patches/series
index b225301..305bd2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 01_README.scan.dpatch
 09_x_zap_flush_stdout.dpatch
 15_stdint_include.dpatch
+apps_manpages.patch
+alevt.patch