r33 - in dvb/linuxtv-dvb-apps/trunk: . debian debian/patches
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Wed, 23 Feb 2005 11:28:12 +0100
Author: tschmidt
Date: 2005-02-23 11:28:11 +0100 (Wed, 23 Feb 2005)
New Revision: 33
Added:
dvb/linuxtv-dvb-apps/trunk/debian/
dvb/linuxtv-dvb-apps/trunk/debian/changelog
dvb/linuxtv-dvb-apps/trunk/debian/control
dvb/linuxtv-dvb-apps/trunk/debian/copyright
dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.dirs
dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.examples
dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.install
dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.postinst
dvb/linuxtv-dvb-apps/trunk/debian/hauppauge2.rc5
dvb/linuxtv-dvb-apps/trunk/debian/patches/
dvb/linuxtv-dvb-apps/trunk/debian/patches/00list
dvb/linuxtv-dvb-apps/trunk/debian/patches/01_README.scan.dpatch
dvb/linuxtv-dvb-apps/trunk/debian/patches/02_av7110_loadkeys-BTN.dpatch
dvb/linuxtv-dvb-apps/trunk/debian/patches/03_budget_ci_loadkeys.dpatch
dvb/linuxtv-dvb-apps/trunk/debian/patches/04_scanfiles_from_cvs.dpatch
dvb/linuxtv-dvb-apps/trunk/debian/rules
dvb/linuxtv-dvb-apps/trunk/debian/watch
Log:
Load newtrunk into dvb/linuxtv-dvb-apps/trunk.
Added: dvb/linuxtv-dvb-apps/trunk/debian/changelog
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/changelog 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/changelog 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,287 @@
+linuxtv-dvb-apps (1.1.0-5) unstable; urgency=low
+
+ * The "This is my first upload." release
+ * Thomas Schmidt <tschmidt@debian.org>
+ - Added the new frequency-definitions for the scan-utility from
+ the cvs-repository to dvb-utils (closes: #294325)
+ - Changed my email-address to new debian one
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Wed, 9 Feb 2005 11:38:10 +0100
+
+linuxtv-dvb-apps (1.1.0-4) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Build-depend on dpatch (>= 2.0.9) to fix FTBFS on sparc,
+ caused by the new dpatch-file-format
+ - Applied patch from Darren Salt <linux@youmustbejoking.demon.co.uk>
+ to add budget_ci_loadkeys-utility (closes: #276082)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sat, 16 Oct 2004 10:01:14 +0200
+
+linuxtv-dvb-apps (1.1.0-3) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ - Applied patch from Darren Salt <linux@youmustbejoking.demon.co.uk>
+ to allow key names that begin with BTN_* in av7110_loadkeys
+ (closes: #273733)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Tue, 28 Sep 2004 15:50:41 +0200
+
+linuxtv-dvb-apps (1.1.0-2) unstable; urgency=low
+
+ * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+ + New upstream version (closes: Bug#242701)
+ + Cleanup of complete debian-directory
+ + Use dh_install
+ + Include README for szap (closes: Bug#254518)
+ + Include hauppauge2.rc5 for Hauppauge Nexus-S 2.2 from
+ Uwe Maier <uwe.maier@hp.com>
+ + Changed Maintainer to Debian VDR Team
+ <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+ + Cleaned up Build-Deps
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Fri, 30 Jul 2004 14:09:15 +0200
+
+linuxtv-dvb-apps (1.1.0-1) experimental; urgency=low
+
+ * Thomas Schmidt:
+ + Split apps from linuxtv-dvb-package, because upstream did this too
+ + Create DVB-Devices in dvb-utils, as suggested by Mark Purcell
+ + Added correct watch-file
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 7 Mar 2004 15:08:27 +0100
+
+linuxtv-dvb (1.0.1-7) unstable; urgency=low
+
+ * Make dvb-dev a dummy package - move the dvb-api-documentation to
+ dvb-utils (closes: Bug#226985)
+ * Include the datafiles for scan under /usr/share/doc/examples/scan/
+ and changed README.scan accordingly. (closes: Bug#225596)
+ * Do not package as debian-native-package anymore (closes: Bug#223855)
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 11 Jan 2004 11:37:42 +0100
+
+linuxtv-dvb (1.0.1-6) unstable; urgency=low
+
+ * Change dvb-dev to depend only on linux-kernel-headers
+ * Remove header-files from dvb-dev, because they are included in
+ linux-kernel-headers (closes: Bug#214502)
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Fri, 31 Oct 2003 12:09:04 +0100
+
+linuxtv-dvb (1.0.1-5) unstable; urgency=low
+
+ * Add linux-kernel-headers as alternative depend to dvb-dev to the
+ dvb-driver-source package
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Fri, 31 Oct 2003 00:28:45 +0100
+
+linuxtv-dvb (1.0.1-4) unstable; urgency=low
+
+ * changed build-system to dpatch
+ * corrected build-depends, as suggested by Santiago Vila
+ (closes: Bug#217531)
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Sun, 19 Oct 2003 00:19:30 +0200
+
+linuxtv-dvb (1.0.1-3) unstable; urgency=low
+
+ * cleaned up debian/rules a little bit
+ * changed "Source: dvb" to "Source: linuxtv-dvb" in control.template of the
+ dvb-driver-source
+ * changed symbolic link "linux" in the dvb-driver-source-package to
+ /usr/include and rename it to "include" (closes: Bug#216192)
+ * changed section of dvb-dev to devel
+
+ -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de> Fri, 17 Oct 2003 12:32:51 +0200
+
+linuxtv-dvb (1.0.1-2) unstable; urgency=low
+
+ * added Thomas as a co maintainer
+
+ -- Andreas Mueller <amu@tr.debian.net> Sun, 12 Oct 2003 16:50:12 +0200
+
+linuxtv-dvb (1.0.1-1) unstable; urgency=low
+
+ * New upstream version
+ * renamed source from dvb to upstream's linuxtv-dvb
+ * removed em8300.h since driver isnt supported :)
+ (closes: Bug#211933)
+
+ -- Andreas Mueller <amu@tr.debian.net> Mon, 29 Sep 2003 14:36:56 +0200
+
+dvb (1.0.0-3) unstable; urgency=low
+
+ * dvb-dev: trying to overwrite `/usr/include/linux/em8300.h', which
+ is also in package em8300-headers see bug: #211883. Added a
+ Conflicts. Notified upstream.
+ * finally close: bug #211933 added kernel-sources as a dependence
+ (closes: Bug#211933)
+
+ -- Andreas Mueller <amu@tr.debian.net> Fri, 26 Sep 2003 21:38:44 +0200
+
+dvb (1.0.0-2) unstable; urgency=low
+
+ * Moved to Standarts-Version: 3.6.1
+ * close: bug #211933
+ Added missing build dep kernel-headers for
+ dvb-driver-source
+ * testing now with precompiled modules
+
+ -- Andreas Mueller <amu@tr.debian.net> Sun, 21 Sep 2003 12:07:02 +0200
+
+dvb (1.0.0-1) unstable; urgency=low
+
+ * Updated to 1.0.0 release
+ * fixed the dvb-driver-source package
+ * close bug #186207
+ (closes: Bug#186207)
+ * close bug #172173
+ (closes: Bug#172173)
+ * close bug #166818
+ (closes: Bug#166818)
+ * close bug #166829
+ (closes: Bug#166829)
+ * close bug #199845
+ (closes: Bug#199845)
+
+ -- Andreas Mueller <amu@tr.debian.net> Tue, 9 Sep 2003 12:00:00 +0200
+
+dvb (0.9.4.20020803-6.1) unstable; urgency=low
+
+ * NMU (sponsored by Joey Hess)
+ * debian/patches/02_strstream-gcc3.3-fix_diff:
+ - Change all references to 'strstream.h' to 'strstream', so the package
+ can be successfully built with GCC 3.3, closes: #198286.
+
+ -- Tore Anderson <tore@linpro.no> Sun, 13 Jul 2003 20:05:32 +0200
+
+dvb (0.9.4.20020803-6) unstable; urgency=low
+
+ * close bug 157436
+ (closes: Bug#157436)
+ * set architecture to "any"
+ (closes: Bug#148272)
+ * Added autoconf2.13 as build-dep and modified autogen.sh to run
+ autoconf2.13. Added a patch file 01_auto_sh_diff for this.
+ thanks to Francesco
+ (closes: #157198)
+
+ -- Andreas Mueller <amu@tr.debian.net> Sat, 15 Mar 2003 21:22:00 +0100
+
+dvb (0.9.4.20020803-5) unstable; urgency=low
+
+ * some cosmetic changes
+
+ -- Andreas Mueller <amu@tr.debian.net> Sat, 4 Jan 2003 16:27:00 +0100
+
+
+dvb (0.9.4.20020803-4) unstable; urgency=low
+
+ * took package from Eduard/QA
+ (closes: Bug#117995)
+
+ -- Andreas Mueller <amu@tr.debian.net> Sat, 4 Jan 2003 16:27:00 +0100
+
+dvb (0.9.4.20020803-3) unstable; urgency=low
+
+ * Too bad, my own scripts reverted the changes in control. Now fixes
+ Build-Dependencies and Arch, thanks to Lamont, closes: #155364
+ * separated Debian changes from CVS snapshot, now patching like with DBS
+
+ -- Eduard Bloch <blade@debian.org> Sun, 4 Aug 2002 11:26:12 +0200
+
+dvb (0.9.4.20020803-2) unstable; urgency=low
+
+ * Arch: all, now really :(
+
+ -- Eduard Bloch <blade@debian.org> Sat, 3 Aug 2002 12:00:46 +0200
+
+dvb (0.9.4.20020803-1) unstable; urgency=low
+
+ * Updated CVS snapshot
+ * Fixed devfsd integration, thanks to Kay Sievers <kay@vrfy.org>
+ * Removed KDREV dependency, -DMODVERSIONS fixed this
+
+ -- Eduard Bloch <blade@debian.org> Sat, 3 Aug 2002 10:03:36 +0200
+
+dvb (0.9.4.20020709-1) unstable; urgency=low
+
+ * Updated CVS snapshot, works with 2.4.19-rc1
+ * Better dependency on automake, closes: #151685
+ * Defined MODVERSIONS, closes: #145006
+ * Devfs optimisations, closes: #133755. Symlinks may need some improvement,
+ cannot test yet.
+ * Changed misleading debconf message
+ * Arch: all, let's see how far this go.
+
+ -- Eduard Bloch <blade@debian.org> Tue, 9 Jul 2002 22:45:52 +0200
+
+dvb (0.9.4.20020321-1) unstable; urgency=low
+
+ * Updated CVS snapshot
+ * creating missing symlinks in mpegtools
+
+ -- Eduard Bloch <blade@debian.org> Wed, 20 Mar 2002 17:31:48 +0100
+
+dvb (0.9.4.20020308-1) unstable; urgency=medium
+
+ * New CVS snapshot, follows new main release
+ * Setting exact kernel version dependency, and Firmware files are installed
+ with the particular modules package. I am fed up with unresolved symbols
+ and ARM crashes.
+ * including Dpram and Root now. If someone tries to argument with GPL
+ violatons, they shold first explain how the various firmware files can be
+ distributed with the Linux kernel while Convergence gives the same
+ permissions for distribution
+ * Set DVB_FIRM_PATH to Debian's storage directory and removed other cludges
+ * Rewrotten a Makefile to make it work with kernel-headers only
+ * added changes from VDR author to make the driver act more smooth with
+ still frames
+
+ -- Eduard Bloch <blade@debian.org> Mon, 11 Mar 2002 15:57:39 +0100
+
+dvb (0.9.3.20011227-1) unstable; urgency=low
+
+ * New CVS snapshot
+ - 2.4.17 ready
+ - new module, included in the init script. Closes: #126422
+ * removed the patch from fimrware searching routine, making symlinks instead
+ * fixed spelling errors, closes: #124584
+ * fixed paths in dvb-driver-source, using dvb-dev package now
+ * used gtvscreen2.c from the previous version, the new is broken
+ * New example files apps/szap/channels.conf-dvbt*
+
+ -- Eduard Bloch <blade@debian.org> Tue, 27 Dec 2001 15:12:27 +0100
+
+dvb (0.9.3.20011107-1) unstable; urgency=low
+
+ * New CVS snapshot
+ - driver-source: fixes compilation problems with kernel >> 2.4.10
+ - zapping, mpegtools: various improvements and fixes
+ * improved description and README.Debian, upstream's hints
+
+ -- Eduard Bloch <blade@debian.org> Tue, 7 Nov 2001 09:36:27 +0100
+
+dvb (0.9.3.20011003-1) unstable; urgency=low
+
+ * New CVS snapshot, minor fix in mpegtools
+ * typos in manpages fixed
+ * included forgotten README in the mpegtools
+ * combined both rules files to build multiple modules packages.
+ * changed location of firmware to /lib/dvb
+
+ -- Eduard Bloch <blade@debian.org> Wed, 3 Oct 2001 23:11:23 +0200
+
+dvb (0.9.3.20010921-1) unstable; urgency=low
+
+ * Initial Release. Closes: #112463, Closes: #112464
+ * removed firmware from the source, unclear license.
+ * Hacked Makefile and dvb.c to compile w/o firmware files and load external
+ firmware from Debian conform locations.
+
+ -- Eduard Bloch <blade@debian.org> Fri, 21 Sep 2001 21:21:14 +0200
+
+Local variables:
+mode: debian-changelog
+End:
Added: dvb/linuxtv-dvb-apps/trunk/debian/control
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/control 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/control 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,24 @@
+Source: linuxtv-dvb-apps
+Section: misc
+Priority: extra
+Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Uploaders: Andreas Mueller <amu@tr.debian.net>, Thomas Schmidt <tschmidt@debian.org>
+Build-Depends: debhelper (>> 4.0.0), dpatch (>= 2.0.9)
+Standards-Version: 3.6.1
+
+Package: dvb-utils
+Architecture: any
+Depends: ${shlibs:Depends}, makedev (>=2.3.1-66)
+Provides: dvb-zapping
+Conflicts: dvb-zapping
+Replaces: dvb-zapping
+Description: Viewer programs for DVB cards
+ Some applications for DVB users:
+ .
+ av7110_loadkeys - tool to load keyfiles of ir-remotes
+ evtest - find out events-keys to generate a keyfile for your remote
+ femon - monitor the singal-strength... of your card
+ scan - scan all transponders and generate a channels.conf
+ czap - simple zapping tool for the Linux DVB API (DVB-C-Cards)
+ szap - simple zapping tool for the Linux DVB API (DVB-S-Cards)
+ tzap - simple zapping tool for the Linux DVB API (DVB-T-Cards)
Added: dvb/linuxtv-dvb-apps/trunk/debian/copyright
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/copyright 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/copyright 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,20 @@
+This package was debianized by Eduard Bloch <blade@debian.org> on
+Fri, 21 Sep 2001 17:31:06 +0200.
+
+It was downloaded from http://www.linuxtv.org/download/dvb/
+
+Upstream Authors:
+
+Ralph Metzler <mocm@metzlerbros.de> and Marcus Metzler <rjkm@metzlerbros.de>
+for convergence integrated media GmbH.
+
+Based on parts from:
+Michael Hunold <m.hunold@gmx.de>
+Christian Theiss <mistert@rz.fh-augsburg.de>
+Nathan Laredo <laredo@gnu.org>
+and others
+
+Copyright:
+
+It may be redistributed under the terms of the GNU GPL, Version 2
+found on Debian systems in the file /usr/share/common-licenses/GPL .
Added: dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.dirs
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.dirs 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.dirs 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/doc/dvb-utils/examples/scan
Added: dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.examples
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.examples 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.examples 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,4 @@
+util/szap/channels.conf*
+util/av7110_loadkeys/*.rcmm
+util/av7110_loadkeys/*.rc5
+debian/hauppauge2.rc5
Added: dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.install
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.install 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.install 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,13 @@
+util/av7110_loadkeys/av7110_loadkeys usr/bin
+util/av7110_loadkeys/budget_ci_loadkeys usr/bin
+util/av7110_loadkeys/evtest usr/bin
+
+util/dvbdate/dvbdate usr/bin
+
+util/scan/scan usr/bin
+util/scan/dvb-* usr/share/doc/dvb-utils/examples/scan/
+
+util/szap/czap usr/bin
+util/szap/femon usr/bin
+util/szap/szap usr/bin
+util/szap/tzap usr/bin
Added: dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.postinst
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.postinst 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/dvb-utils.postinst 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ ! -e /dev/.devfsd ] ; then
+cd /dev && /sbin/MAKEDEV dvb
+fi
+
+#DEBHELPER#
+
+exit 0
Added: dvb/linuxtv-dvb-apps/trunk/debian/hauppauge2.rc5
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/hauppauge2.rc5 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/hauppauge2.rc5 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,41 @@
+0x00 KEY_0
+0x01 KEY_1
+0x02 KEY_2
+0x03 KEY_3
+0x04 KEY_4
+0x05 KEY_5
+0x06 KEY_6
+0x07 KEY_7
+0x08 KEY_8
+0x09 KEY_9
+
+0x10 KEY_VOLUMEUP
+0x11 KEY_VOLUMEDOWN
+0x1e KEY_VENDOR
+
+0x20 KEY_CHANNELUP
+0x21 KEY_CHANNELDOWN
+0x22 KEY_SELECT
+0x26 KEY_CYCLEWINDOWS
+
+0x3d KEY_POWER
+0x3b KEY_GOTO
+0x1f KEY_BACK
+0x0d KEY_MENU
+0x0b KEY_RED
+0x2e KEY_GREEN
+0x38 KEY_YELLOW
+0x25 KEY_OK
+0x29 KEY_BLUE
+0x0f KEY_MUTE
+0x0c KEY_AUX
+0x3c KEY_SCREEN
+0x32 KEY_REWIND
+0x35 KEY_PLAY
+0x34 KEY_FORWARD
+0x37 KEY_RECORD
+0x36 KEY_STOP
+0x30 KEY_PAUSE
+0x24 KEY_LEFT
+0x1e KEY_RIGHT
+
Added: dvb/linuxtv-dvb-apps/trunk/debian/patches/00list
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/patches/00list 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/patches/00list 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,4 @@
+01_README.scan
+02_av7110_loadkeys-BTN
+03_budget_ci_loadkeys
+04_scanfiles_from_cvs
Added: dvb/linuxtv-dvb-apps/trunk/debian/patches/01_README.scan.dpatch
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/patches/01_README.scan.dpatch 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/patches/01_README.scan.dpatch 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_README.scan.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: change Readme to list Debian-specific Paths
+
+@DPATCH@
+diff -urNad /home/chelli/vdr/cvs/dvb/linuxtv-dvb-apps/util/scan/README linuxtv-dvb-apps/util/scan/README
+--- /home/chelli/vdr/cvs/dvb/linuxtv-dvb-apps/util/scan/README 2004-01-17 17:59:46.000000000 +0100
++++ linuxtv-dvb-apps/util/scan/README 2004-05-23 13:15:18.000000000 +0200
+@@ -7,12 +7,12 @@
+ and dvb-t networks around the world. If you make a new one feel free to
+ submit it to the linux-dvb mailing list http://linuxtv.org/mailinglists.xml.
+
+-Basic usage: ./scan dvb-s/Astra-19.2E | tee mychannels.conf
++Basic usage: scan /usr/share/doc/dvb-utils/examples/scan/dvb-s/Astra-19.2E | tee mychannels.conf
+
+ If you want it to check a specific frequency, tune to that frequency
+-(e.g. using szap/tzap/czap) and then use './scan -c'.
++(e.g. using szap/tzap/czap) and then use 'scan -c'.
+
+-For more scan options see ./scan -h.
++For more scan options see scan -h.
+
+ Good luck,
+ Holger + Johannes
Added: dvb/linuxtv-dvb-apps/trunk/debian/patches/02_av7110_loadkeys-BTN.dpatch
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/patches/02_av7110_loadkeys-BTN.dpatch 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/patches/02_av7110_loadkeys-BTN.dpatch 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,105 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_av7110_loadkeys-BTN.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: patch to allow BTN_* as input-keynames (closes: #273733)
+
+@DPATCH@
+diff -urNad linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c /tmp/dpep.6x7trg/linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c
+--- linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c 2004-05-14 12:32:12.000000000 +0200
++++ /tmp/dpep.6x7trg/linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c 2004-09-28 15:49:18.000000000 +0200
+@@ -35,7 +35,8 @@
+ {
+ int cmp, index;
+ int l = 1;
+- int r = sizeof (key_name) / sizeof (key_name[0]);
++ const struct input_key_name *kn;
++ int r;
+
+ if (limit < 5)
+ return -1;
+@@ -46,7 +47,18 @@
+ limit--;
+ }
+
+- if (pos [0] != 'K' || pos[1] != 'E' || pos[2] != 'Y' || pos[3] != '_')
++ if (pos[3] != '_')
++ return -2;
++
++ if (pos[0] == 'K' && pos[1] == 'E' && pos[2] == 'Y') {
++ kn = key_name;
++ r = sizeof (key_name) / sizeof (key_name[0]);
++ }
++ else if (pos[0] == 'B' && pos[1] == 'T' && pos[2] == 'N') {
++ kn = btn_name;
++ r = sizeof (btn_name) / sizeof (btn_name[0]);
++ }
++ else
+ return -2;
+
+ (*nend) += 4;
+@@ -58,19 +70,19 @@
+
+ index = (l + r) / 2;
+
+- len0 = strlen(key_name[index-1].name);
++ len0 = strlen(kn[index-1].name);
+
+ while (len1 < limit && isgraph(pos[len1]))
+ len1++;
+
+- cmp = strncmp (key_name[index-1].name, pos,
+- strlen(key_name[index-1].name));
++ cmp = strncmp (kn[index-1].name, pos,
++ strlen(kn[index-1].name));
+
+ if (len0 < len1 && cmp == 0)
+ cmp = -1;
+
+ if (cmp == 0) {
+- *nend = pos + strlen (key_name[index-1].name);
++ *nend = pos + strlen (kn[index-1].name);
+
+ if (**nend != '\n' &&
+ **nend != '\t' &&
+@@ -78,7 +90,7 @@
+ *nend != pos)
+ return -3;
+
+- return key_name[index-1].key;
++ return kn[index-1].key;
+ }
+
+ if (cmp < 0)
+diff -urNad linuxtv-dvb-apps/util/av7110_loadkeys/Makefile /tmp/dpep.6x7trg/linuxtv-dvb-apps/util/av7110_loadkeys/Makefile
+--- linuxtv-dvb-apps/util/av7110_loadkeys/Makefile 2004-05-14 12:32:12.000000000 +0200
++++ /tmp/dpep.6x7trg/linuxtv-dvb-apps/util/av7110_loadkeys/Makefile 2004-09-28 15:49:18.000000000 +0200
+@@ -12,7 +12,7 @@
+ evtest.o: evtest.c input_keynames.h
+
+
+-input_keynames.h: /usr/include/linux/input.h input_fake.h
++input_keynames.h: /usr/include/linux/input.h input_fake.h Makefile
+ @echo 'generate $@...'
+ @echo '#ifndef __INPUT_KEYNAMES_H__' > $@
+ @echo '#define __INPUT_KEYNAMES_H__' >> $@
+@@ -32,8 +32,17 @@
+ @echo '' >> $@
+ @echo 'static struct input_key_name key_name [] = {' >> $@
+ @for x in `cat /usr/include/linux/input.h input_fake.h | \
+- grep KEY_ | grep "#define" | grep -v KEY_MAX | \
+- cut -f 1 | cut -f 2 -d ' ' | sort | uniq` ; do \
++ egrep '#define[ \t]+KEY_' | grep -v KEY_MAX | \
++ cut -f 1 | cut -f 2 -d ' ' | sort -u` ; do \
++ echo " { \"`echo $$x | cut -b 5-`\", $$x }," >> $@ \
++ ; \
++ done
++ @echo '};' >> $@
++ @echo '' >> $@
++ @echo 'static struct input_key_name btn_name [] = {' >> $@
++ @for x in `cat /usr/include/linux/input.h input_fake.h | \
++ egrep '#define[ \t]+BTN_' | \
++ cut -f 1 | cut -f 2 -d ' ' | sort -u` ; do \
+ echo " { \"`echo $$x | cut -b 5-`\", $$x }," >> $@ \
+ ; \
+ done
Added: dvb/linuxtv-dvb-apps/trunk/debian/patches/03_budget_ci_loadkeys.dpatch
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/patches/03_budget_ci_loadkeys.dpatch 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/patches/03_budget_ci_loadkeys.dpatch 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,385 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_budget_ci_loadkeys.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: adds the utility budget_ci_loadkeys
+
+@DPATCH@
+diff -urNad linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c /tmp/dpep.HGK2iu/linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c
+--- linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c 2004-05-14 12:32:12.000000000 +0200
++++ /tmp/dpep.HGK2iu/linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c 2004-10-16 09:59:28.000000000 +0200
+@@ -1,5 +1,6 @@
+ #include <asm/types.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <sys/types.h>
+@@ -99,12 +100,20 @@
+
+
+
++#ifdef HW_MSP430
++const char usage [] = "\n\tusage: budget_ci_loadkeys keymap_filename.rc5\n\n";
++#else
+ const char usage [] = "\n\tusage: av7110_loadkeys [-i|--invert] [-a|--address <num>] keymap_filename.(rc5|rcmm)\n\n";
+-
++#endif
+
+ struct ir_setup {
++#ifdef HW_MSP430
++#define KEYTAB_SIZE 64
++#else
++#define KEYTAB_SIZE 256
+ __u32 ir_config;
+- __u16 keytab [256];
++#endif
++ __u16 keytab [KEYTAB_SIZE];
+ } __attribute__ ((packed));
+
+
+@@ -116,7 +125,10 @@
+ char *buf, *pos, *fname = NULL;
+
+ for (i=1; i<argc; i++) {
++#ifndef HW_MSP430
++ /* AV7110 only; not MSP430 */
+ if (!strcmp("-i", argv[i]) || !strcmp("--invert", argv[i]))
++
+ setup.ir_config |= 0x8000;
+ else if (!strcmp("-a", argv[i]) || !strcmp("--address", argv[i])) {
+ if (++i < argc) {
+@@ -124,6 +136,7 @@
+ setup.ir_config |= 0x4000;
+ }
+ } else
++#endif
+ fname = argv[i];
+ }
+
+@@ -132,6 +145,14 @@
+ exit (-1);
+ }
+
++#ifdef HW_MSP430
++ if (strncmp(".rc5", fname + strlen(fname) - 4, 4) != 0) {
++ const char msg [] = "\nERROR: "
++ "input filename must have suffix .rc5\n";
++ write (0, msg, strlen(msg));
++ exit (-1);
++ }
++#else
+ if (strncmp(".rcmm", fname + strlen(fname) - 5, 5) == 0)
+ setup.ir_config |= 0x0001;
+ else if (strncmp(".rc5", fname + strlen(fname) - 4, 4) != 0) {
+@@ -140,6 +161,7 @@
+ write (0, msg, strlen(msg));
+ exit (-1);
+ }
++#endif
+
+ if ((fd = open (fname, O_RDONLY)) < 0)
+ print_error ("open", fname);
+@@ -161,9 +183,11 @@
+ key = strtol (pos, &pos, 0);
+ keycode = parse_keyname (pos, &pos, buf + len - pos);
+
+- if (key < 0 || key > 0xff) {
+- const char msg [] =
+- "\nERROR: key must be in range 0 ... 0xff!\n\n";
++ if (key < 0 || key >= KEYTAB_SIZE) {
++ char *msg;
++ asprintf (&msg,
++ "\nERROR: key must be in range 0 ... 0x%02x!\n\n",
++ KEYTAB_SIZE);
+
+ write (0, msg, strlen(msg));
+ exit (-1);
+@@ -178,7 +202,7 @@
+ munmap (buf, len);
+ close (fd);
+
+- write (1, &setup, 4 + 256 * sizeof(__u16));
++ write (1, &setup, sizeof (setup));
+
+ return 0;
+ }
+diff -urNad linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c.orig /tmp/dpep.HGK2iu/linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c.orig
+--- linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c.orig 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.HGK2iu/linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c.orig 2004-05-14 12:32:12.000000000 +0200
+@@ -0,0 +1,186 @@
++#include <asm/types.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <sys/mman.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
++#include <ctype.h>
++#include <string.h>
++
++#include "input_keynames.h"
++
++
++static
++void print_error (const char *action, const char *file)
++__attribute__ ((noreturn));
++
++
++static
++void print_error (const char *action, const char *file)
++{
++ static const char msg [] = "\nERROR: could not ";
++
++ write (0, msg, strlen(msg));
++ write (0, action, strlen(action));
++ write (0, " '", 2);
++ write (0, file, strlen(file));
++ write (0, "'\n\n", 3);
++ exit (-1);
++}
++
++
++static
++int parse_keyname (char *pos, char **nend, int limit)
++{
++ int cmp, index;
++ int l = 1;
++ int r = sizeof (key_name) / sizeof (key_name[0]);
++
++ if (limit < 5)
++ return -1;
++
++ while ((*pos == ' ' || *pos == '\t') && limit > 0) {
++ (*nend)++;
++ pos++;
++ limit--;
++ }
++
++ if (pos [0] != 'K' || pos[1] != 'E' || pos[2] != 'Y' || pos[3] != '_')
++ return -2;
++
++ (*nend) += 4;
++ pos += 4;
++ limit -= 4;
++
++ while (r >= l) {
++ int len0, len1 = 0;
++
++ index = (l + r) / 2;
++
++ len0 = strlen(key_name[index-1].name);
++
++ while (len1 < limit && isgraph(pos[len1]))
++ len1++;
++
++ cmp = strncmp (key_name[index-1].name, pos,
++ strlen(key_name[index-1].name));
++
++ if (len0 < len1 && cmp == 0)
++ cmp = -1;
++
++ if (cmp == 0) {
++ *nend = pos + strlen (key_name[index-1].name);
++
++ if (**nend != '\n' &&
++ **nend != '\t' &&
++ **nend != ' ' &&
++ *nend != pos)
++ return -3;
++
++ return key_name[index-1].key;
++ }
++
++ if (cmp < 0)
++ l = index + 1;
++ else
++ r = index - 1;
++
++ if (r < l) {
++ static const char msg [] = "\nunknown key '";
++ write (0, msg, strlen(msg));
++ write (0, pos-4, len1 + 4);
++ write (0, "'\n", 2);
++ }
++ };
++
++ return -4;
++}
++
++
++
++const char usage [] = "\n\tusage: av7110_loadkeys [-i|--invert] [-a|--address <num>] keymap_filename.(rc5|rcmm)\n\n";
++
++
++struct ir_setup {
++ __u32 ir_config;
++ __u16 keytab [256];
++} __attribute__ ((packed));
++
++
++int main (int argc, char **argv)
++{
++ static struct ir_setup setup;
++ int i, fd;
++ size_t len;
++ char *buf, *pos, *fname = NULL;
++
++ for (i=1; i<argc; i++) {
++ if (!strcmp("-i", argv[i]) || !strcmp("--invert", argv[i]))
++ setup.ir_config |= 0x8000;
++ else if (!strcmp("-a", argv[i]) || !strcmp("--address", argv[i])) {
++ if (++i < argc) {
++ setup.ir_config |= (atoi(argv[i]) & 0xff) << 16;
++ setup.ir_config |= 0x4000;
++ }
++ } else
++ fname = argv[i];
++ }
++
++ if (!fname) {
++ write (0, usage, strlen(usage));
++ exit (-1);
++ }
++
++ if (strncmp(".rcmm", fname + strlen(fname) - 5, 5) == 0)
++ setup.ir_config |= 0x0001;
++ else if (strncmp(".rc5", fname + strlen(fname) - 4, 4) != 0) {
++ const char msg [] = "\nERROR: "
++ "input filename must have suffix .rc5 or .rcmm\n";
++ write (0, msg, strlen(msg));
++ exit (-1);
++ }
++
++ if ((fd = open (fname, O_RDONLY)) < 0)
++ print_error ("open", fname);
++
++ len = lseek (fd, 0, SEEK_END);
++
++ if (!(pos = buf = mmap (NULL, len, PROT_READ, MAP_PRIVATE, fd, 0)))
++ print_error ("mmap", fname);
++
++ while (pos < buf + len) {
++ int key, keycode;
++
++ while (!isxdigit(*pos) && pos < buf + len)
++ pos++;
++
++ if (pos == buf + len)
++ break;
++
++ key = strtol (pos, &pos, 0);
++ keycode = parse_keyname (pos, &pos, buf + len - pos);
++
++ if (key < 0 || key > 0xff) {
++ const char msg [] =
++ "\nERROR: key must be in range 0 ... 0xff!\n\n";
++
++ write (0, msg, strlen(msg));
++ exit (-1);
++ }
++
++ if (keycode < 0)
++ print_error ("parse", fname);
++
++ setup.keytab[key] = keycode;
++ }
++
++ munmap (buf, len);
++ close (fd);
++
++ write (1, &setup, 4 + 256 * sizeof(__u16));
++
++ return 0;
++}
++
++
+diff -urNad linuxtv-dvb-apps/util/av7110_loadkeys/Makefile /tmp/dpep.HGK2iu/linuxtv-dvb-apps/util/av7110_loadkeys/Makefile
+--- linuxtv-dvb-apps/util/av7110_loadkeys/Makefile 2004-05-14 12:32:12.000000000 +0200
++++ /tmp/dpep.HGK2iu/linuxtv-dvb-apps/util/av7110_loadkeys/Makefile 2004-10-16 09:59:27.000000000 +0200
+@@ -1,14 +1,23 @@
+ CC = gcc
+-CFLAGS = -g -Wall -O2
++CFLAGS = -g -Wall -O2 -D_GNU_SOURCE
+
+-all: av7110_loadkeys evtest
++all: av7110_loadkeys budget_ci_loadkeys evtest
+
+ av7110_loadkeys: av7110_loadkeys.o
+
++budget_ci_loadkeys: budget_ci_loadkeys.o
++
+ evtest: evtest.o
+
++av7110_loadkeys.o: CFLAGS += -UHW_MSP430
+ av7110_loadkeys.o: av7110_loadkeys.c input_keynames.h
+
++budget_ci_loadkeys.c: av7110_loadkeys.c
++ ln av7110_loadkeys.c budget_ci_loadkeys.c
++
++budget_ci_loadkeys.o: CFLAGS += -DHW_MSP430
++budget_ci_loadkeys.o: budget_ci_loadkeys.c input_keynames.h
++
+ evtest.o: evtest.c input_keynames.h
+
+
+@@ -44,5 +53,6 @@
+
+
+ clean:
+- $(RM) core* *.o input_keynames.h av7110_loadkeys evtest
++ $(RM) core* *.o input_keynames.h av7110_loadkeys budget_ci_loadkeys \
++ budget_ci_loadkeys.c evtest
+
+diff -urNad linuxtv-dvb-apps/util/av7110_loadkeys/Makefile.orig /tmp/dpep.HGK2iu/linuxtv-dvb-apps/util/av7110_loadkeys/Makefile.orig
+--- linuxtv-dvb-apps/util/av7110_loadkeys/Makefile.orig 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.HGK2iu/linuxtv-dvb-apps/util/av7110_loadkeys/Makefile.orig 2004-05-14 12:32:12.000000000 +0200
+@@ -0,0 +1,48 @@
++CC = gcc
++CFLAGS = -g -Wall -O2
++
++all: av7110_loadkeys evtest
++
++av7110_loadkeys: av7110_loadkeys.o
++
++evtest: evtest.o
++
++av7110_loadkeys.o: av7110_loadkeys.c input_keynames.h
++
++evtest.o: evtest.c input_keynames.h
++
++
++input_keynames.h: /usr/include/linux/input.h input_fake.h
++ @echo 'generate $@...'
++ @echo '#ifndef __INPUT_KEYNAMES_H__' > $@
++ @echo '#define __INPUT_KEYNAMES_H__' >> $@
++ @echo '' >> $@
++ @echo '#include <linux/input.h>' >> $@
++ @echo '' >> $@
++ @echo '#if !defined(KEY_OK)' >> $@
++ @echo '#include "input_fake.h"' >> $@
++ @echo '#endif' >> $@
++ @echo '' >> $@
++ @echo '' >> $@
++ @echo 'struct input_key_name {' >> $@
++ @echo ' const char *name;' >> $@
++ @echo ' int key;' >> $@
++ @echo '};' >> $@
++ @echo '' >> $@
++ @echo '' >> $@
++ @echo 'static struct input_key_name key_name [] = {' >> $@
++ @for x in `cat /usr/include/linux/input.h input_fake.h | \
++ grep KEY_ | grep "#define" | grep -v KEY_MAX | \
++ cut -f 1 | cut -f 2 -d ' ' | sort | uniq` ; do \
++ echo " { \"`echo $$x | cut -b 5-`\", $$x }," >> $@ \
++ ; \
++ done
++ @echo '};' >> $@
++ @echo '' >> $@
++ @echo '#endif /* __INPUT_KEYNAMES_H */' >> $@
++ @echo '' >> $@
++
++
++clean:
++ $(RM) core* *.o input_keynames.h av7110_loadkeys evtest
++
Added: dvb/linuxtv-dvb-apps/trunk/debian/patches/04_scanfiles_from_cvs.dpatch
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/patches/04_scanfiles_from_cvs.dpatch 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/patches/04_scanfiles_from_cvs.dpatch 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,1187 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_scanfiles_from_cvs.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: frequency-files from cvs (20050209) for the scan-tool
+
+@DPATCH@
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-c/at-SalzburgAG /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/at-SalzburgAG
+--- linuxtv-dvb-apps/util/scan/dvb-c/at-SalzburgAG 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/at-SalzburgAG 2004-10-15 18:43:54.000000000 +0200
+@@ -0,0 +1,10 @@
++# scan config for Salzburg AG cable provider
++# freq sr fec mod
++C 306000000 6900000 NONE QAM64
++C 370000000 6900000 NONE QAM64
++C 410000000 6900000 NONE QAM64
++C 418000000 6900000 NONE QAM64
++C 426000000 6900000 NONE QAM64
++C 442000000 6900000 NONE QAM64
++C 306000000 6900000 NONE QAM64
++
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-c/ch-Zuerich-cablecom /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/ch-Zuerich-cablecom
+--- linuxtv-dvb-apps/util/scan/dvb-c/ch-Zuerich-cablecom 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/ch-Zuerich-cablecom 2004-02-22 20:10:17.000000000 +0100
+@@ -0,0 +1,3 @@
++# Kabel cablecom.ch Zuerich
++# freq sr fec mod
++C 410000000 6900000 NONE QAM64
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-c/de-neftv /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/de-neftv
+--- linuxtv-dvb-apps/util/scan/dvb-c/de-neftv 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/de-neftv 2005-01-08 17:49:10.000000000 +0100
+@@ -0,0 +1,23 @@
++# Cable conf for NEFtv
++# (Nuernberg, Erlangen, Fuerth and Herzogenaurach)
++
++# freq sr fec mod
++C 346000000 6875000 NONE QAM64
++C 354000000 6875000 NONE QAM64
++C 362000000 6875000 NONE QAM64
++C 370000000 6875000 NONE QAM64
++C 378000000 6875000 NONE QAM64
++C 386000000 6875000 NONE QAM64
++C 394000000 6875000 NONE QAM64
++C 402000000 6875000 NONE QAM64
++C 410000000 6875000 NONE QAM64
++C 418000000 6875000 NONE QAM64
++C 426000000 6875000 NONE QAM64
++C 434000000 6875000 NONE QAM64
++C 450000000 6875000 NONE QAM64
++C 458000000 6875000 NONE QAM64
++C 474000000 6875000 NONE QAM64
++C 490000000 6875000 NONE QAM64
++C 498000000 6875000 NONE QAM64
++C 514000000 6875000 NONE QAM64
++C 546000000 6875000 NONE QAM64
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-c/fi-HTV /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/fi-HTV
+--- linuxtv-dvb-apps/util/scan/dvb-c/fi-HTV 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/fi-HTV 2004-12-19 17:49:55.000000000 +0100
+@@ -0,0 +1,4 @@
++# HTV
++# freq sr fec mod
++C 283000000 5900000 NONE QAM128
++C 154000000 6900000 NONE QAM128
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-c/fi-jkl /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/fi-jkl
+--- linuxtv-dvb-apps/util/scan/dvb-c/fi-jkl 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/fi-jkl 2005-01-13 03:04:29.000000000 +0100
+@@ -0,0 +1,10 @@
++# OnCable (Finland / Jyväskylä)
++# freq sr fec mod
++C 514000000 6900000 NONE QAM128
++C 426000000 6900000 NONE QAM128
++C 162000000 6900000 NONE QAM128
++C 418000000 6900000 NONE QAM128
++C 490000000 6900000 NONE QAM128
++C 498000000 6900000 NONE QAM128
++C 402000000 6900000 NONE QAM128
++C 410000000 6900000 NONE QAM128
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-c/fi-TTV /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/fi-TTV
+--- linuxtv-dvb-apps/util/scan/dvb-c/fi-TTV 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-c/fi-TTV 2004-12-19 17:50:50.000000000 +0100
+@@ -0,0 +1,4 @@
++# TTV
++# freq sr fec mod
++C 418000000 6900000 NONE QAM128
++C 346000000 6900000 NONE QAM128
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-s/Astra-28.2E /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-s/Astra-28.2E
+--- linuxtv-dvb-apps/util/scan/dvb-s/Astra-28.2E 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-s/Astra-28.2E 2004-02-09 13:58:35.000000000 +0100
+@@ -0,0 +1,3 @@
++# Astra 28.2E SDT info service transponder
++# freq pol sr fec
++S 10773000 H 22000000 5/6
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-s/OptusC1-156E /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-s/OptusC1-156E
+--- linuxtv-dvb-apps/util/scan/dvb-s/OptusC1-156E 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-s/OptusC1-156E 2004-05-12 11:19:37.000000000 +0200
+@@ -0,0 +1,20 @@
++# Optus C1 satellite 156E
++# freq pol sr fec
++S 12278000 H 30000000 2/3
++S 12305000 H 30000000 2/3
++S 12358000 H 27000000 2/3
++S 12398000 H 27800000 3/4
++S 12407000 V 30000000 2/3
++S 12438000 H 27800000 3/4
++S 12487000 V 27800000 3/4
++S 12501000 H 29473000 3/4
++S 12518000 H 27800000 3/4
++S 12527000 V 30000000 3/4
++S 12558000 H 27800000 3/4
++S 12564000 H 29473000 3/4
++S 12567000 V 27800000 2/3
++S 12598000 H 27800000 3/4
++S 12607000 V 29473000 3/4
++S 12638000 H 27800000 3/4
++S 12689000 H 27800000 3/4
++S 12720000 V 30000000 3/4
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/au-Adelaide /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Adelaide
+--- linuxtv-dvb-apps/util/scan/dvb-t/au-Adelaide 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Adelaide 2004-05-22 19:56:16.000000000 +0200
+@@ -0,0 +1,12 @@
++# Australia / Adelaide / Mt Lofty
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# ABC
++T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Seven
++T 177500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# Nine
++T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Ten
++T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# SBS
++T 564500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/au-Brisbane /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Brisbane
+--- linuxtv-dvb-apps/util/scan/dvb-t/au-Brisbane 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Brisbane 2004-04-08 17:34:09.000000000 +0200
+@@ -0,0 +1,12 @@
++# Australia / Brisbane (Mt Coot-tha transmitters)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# ABC
++T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Seven
++T 177500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# Nine
++T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Ten
++T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# SBS
++T 585625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+\ Kein Zeilenumbruch am Dateiende.
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/au-Melbourne /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Melbourne
+--- linuxtv-dvb-apps/util/scan/dvb-t/au-Melbourne 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Melbourne 2004-02-18 14:40:22.000000000 +0100
+@@ -0,0 +1,12 @@
++# Australia / Melbourne (Mt Dandenong transmitters)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# ABC
++T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Seven
++T 177500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# Nine
++T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Ten
++T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# SBS
++T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/au-Melbourne-Upwey /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Melbourne-Upwey
+--- linuxtv-dvb-apps/util/scan/dvb-t/au-Melbourne-Upwey 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Melbourne-Upwey 2004-12-28 11:44:34.000000000 +0100
+@@ -0,0 +1,21 @@
++# Australia / Melbourne (Upwey Repeater)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# ABC
++T 662500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Seven
++T 620500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# Nine
++T 641500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Ten
++T 711500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# SBS
++T 683500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++
++
++--
++No virus found in this outgoing message.
++Checked by AVG Anti-Virus.
++Version: 7.0.298 / Virus Database: 265.6.5 - Release Date: 26/12/2004
++
++
++
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/au-Perth /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Perth
+--- linuxtv-dvb-apps/util/scan/dvb-t/au-Perth 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/au-Perth 2004-10-15 00:20:49.000000000 +0200
+@@ -0,0 +1,12 @@
++# Australia / Perth (Carmel/Bickley transmitters)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# ABC
++T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Seven
++T 177500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# Nine
++T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Ten
++T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# SBS
++T 536625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/cz-Praha /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/cz-Praha
+--- linuxtv-dvb-apps/util/scan/dvb-t/cz-Praha 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/cz-Praha 2004-02-17 22:54:48.000000000 +0100
+@@ -0,0 +1,4 @@
++# DVB-T Praha (Prague, Czech Republic)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/de-Braunschweig /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Braunschweig
+--- linuxtv-dvb-apps/util/scan/dvb-t/de-Braunschweig 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Braunschweig 2004-11-09 16:23:43.000000000 +0100
+@@ -0,0 +1,7 @@
++# DVB-T Braunschweig -- info from http://www.skyplus.seyen.de/DVB-T.html
++T 198500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE
++T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/de-Bremen /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Bremen
+--- linuxtv-dvb-apps/util/scan/dvb-t/de-Bremen 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Bremen 2005-01-08 20:41:39.000000000 +0100
+@@ -0,0 +1,9 @@
++# DVB-T Bremen/Unterweser
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 2/3 AUTO QAM16 8k 1/4 NONE
++T 538000000 8MHz 2/3 1/2 QAM16 8k 1/4 NONE
++T 562000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
++T 642000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
++T 666000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
++T 698000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
++T 746000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/de-Frankfurt /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Frankfurt
+--- linuxtv-dvb-apps/util/scan/dvb-t/de-Frankfurt 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Frankfurt 2004-09-12 14:25:52.000000000 +0200
+@@ -0,0 +1,40 @@
++###########################################
++# DVB-T, Deutschland, Rhein-Main Gebiet
++###########################################
++
++# Start der Ausstrahlung: ARD Multiplex 2 und ZDF Multiplex ab 04.10.2004.
++# ARD Multiplex 1 sowie Private Multiplex 1 bis 3 am 06.12.2004.
++
++# Alle DVB-T Sender im Rhein-Main Gebiet senden vertikal polarisiert
++
++# Sender auf dem grossen Feldberg und FFM-Fernmeldeturm sind Rundstrahler,
++# Hohe Wurzel ist Richtstrahler
++
++# Kanaele 5 bis 10 liegen im "VHF"-Band, 21 bis 69 im "UHF"-Band, d.h.,
++# nur ARD Multiplex 1 wird im VHF-Band gesendet.
++
++# Nettodatenrate 13.06 MBit/s fuer ARD Multiplex 1, 13.27 MBit/s fuer alle anderen
++
++
++##################################################################################
++#T freq bw coderate_HP coderate_LP modulation transmode guard-int hierarchy
++#--------------------------------------------------------------------------------
++
++# Kanal 8, ARD Multiplex 1, Grosser Feldberg 10kW, Hohe Wurzel 20kW, FFM-Turm 10kW
++T 198500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE
++
++# Kanal 22, ZDF Multiplex, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
++T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++
++# Kanal 34, Private Multiplex 1, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
++T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++
++# Kanal 54, Private Multiplex 2, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
++T 738000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++
++# Kanal 57, ARD Multiplex 2, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
++T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++
++# Kanal 64, Private Multiplex 3, Grosser Feldberg 50kW, Hohe Wurzel 100kW, FFM-Turm 50kW
++T 818000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/de-Hamburg /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Hamburg
+--- linuxtv-dvb-apps/util/scan/dvb-t/de-Hamburg 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Hamburg 2004-11-08 13:27:41.000000000 +0100
+@@ -0,0 +1,8 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 23, ZDF, ZDFInfokanal/3Sat, KI.KA/ ZDFdokukanal, MHP: ZDFdigitext
++T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 30, Kabel 1, N24, ProSieben, SAT.1 Fernsehen
++T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 33, ARD, Phoenix, arte, Eins Extra
++T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 40, RTL Television, RTL II, Super RTL, VOX
++T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 56, NDR, WDR, mdr, hessen Fernsehen
++T 205500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE # Kanal 09, NDR, WDR, MDR, Bayrisches Fernsehen
++T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 53, HH1, Eurosport, Terra Nova, Neun Live
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/de-Hannover /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Hannover
+--- linuxtv-dvb-apps/util/scan/dvb-t/de-Hannover 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Hannover 2004-11-09 16:23:43.000000000 +0100
+@@ -0,0 +1,7 @@
++# DVB-T Hannover -- info from http://www.skyplus.seyen.de/DVB-T.html
++T 198500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE
++T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 594000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 658000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/de-Koeln-Bonn /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Koeln-Bonn
+--- linuxtv-dvb-apps/util/scan/dvb-t/de-Koeln-Bonn 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Koeln-Bonn 2004-11-14 21:05:12.000000000 +0100
+@@ -0,0 +1,8 @@
++# DVB-T NRW/Bonn
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 698000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 650000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 826000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 834000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/de-Luebeck /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Luebeck
+--- linuxtv-dvb-apps/util/scan/dvb-t/de-Luebeck 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Luebeck 2004-11-29 14:56:16.000000000 +0100
+@@ -0,0 +1,7 @@
++# DVB-T Lübeck
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 490000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 530000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 546000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 570000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 626000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/de-Ruhrgebiet /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Ruhrgebiet
+--- linuxtv-dvb-apps/util/scan/dvb-t/de-Ruhrgebiet 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/de-Ruhrgebiet 2005-01-06 12:35:28.000000000 +0100
+@@ -0,0 +1,8 @@
++# DVB-T Düsseldorf/Ruhrgebiet
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 506000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 538000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 722000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 746000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 818000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/es-Alpicat /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/es-Alpicat
+--- linuxtv-dvb-apps/util/scan/dvb-t/es-Alpicat 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/es-Alpicat 2004-12-13 14:49:35.000000000 +0100
+@@ -0,0 +1,5 @@
++# DVB-T Alpicat (Lleida)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 642000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3, K3/33, 3/24, Canal Pilot, 3XL.net
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, ANTENA 3, TELECINCO, CANAL+
++T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Veo TV, Net TV
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/es-Collserola /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/es-Collserola
+--- linuxtv-dvb-apps/util/scan/dvb-t/es-Collserola 2004-05-14 12:32:13.000000000 +0200
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/es-Collserola 2004-12-13 14:49:35.000000000 +0100
+@@ -1,6 +1,5 @@
+ # DVB-T Collserola (Barcelona)
+ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+-T 650000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE # C43: tvc
+-T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C61: tve, t5, a3, c+
+-T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C66: veotv, nettv
+-
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3, K3/33, 3/24, Canal Pilot, 3XL.net
++T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, ANTENA 3, TELECINCO, CANAL+
++T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Veo TV, Net TV
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/es-Madrid /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/es-Madrid
+--- linuxtv-dvb-apps/util/scan/dvb-t/es-Madrid 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/es-Madrid 2004-10-10 13:28:46.000000000 +0200
+@@ -0,0 +1,7 @@
++# DVB-T Madrid
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 770000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # TVE 1, TVE 2, ANTENA 3, TELECINCO, CANAL+
++T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Telemadrid, La Otra, Onda 6, Quiero Madrid
++T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Veo TV, Net TV
++#T 618000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Allocated for local TV stations
++#T 706000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Allocated for local TV stations
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/es-Mussara /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/es-Mussara
+--- linuxtv-dvb-apps/util/scan/dvb-t/es-Mussara 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/es-Mussara 2004-12-13 14:49:35.000000000 +0100
+@@ -0,0 +1,5 @@
++# DVB-T La Mussara (Reus-Tarragona)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3, K3/33, 3/24, Canal Pilot, 3XL.net
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, ANTENA 3, TELECINCO, CANAL+
++T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # Veo TV, Net TV
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Anjalankoski /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Anjalankoski
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Anjalankoski 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Anjalankoski 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,4 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Espoo /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Espoo
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Espoo 2004-05-14 12:32:13.000000000 +0200
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Espoo 2004-05-07 15:33:33.000000000 +0200
+@@ -1,3 +1,5 @@
+ # Espoo A-mux (Digita Finland)
+ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+ T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Eurajoki /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Eurajoki
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Eurajoki 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Eurajoki 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,4 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Fiskars /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Fiskars
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Fiskars 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Fiskars 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Haapavesi /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Haapavesi
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Haapavesi 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Haapavesi 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Joutseno /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Joutseno
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Joutseno 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Joutseno 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Jyvaskyla /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Jyvaskyla
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Jyvaskyla 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Jyvaskyla 2004-02-13 13:02:18.000000000 +0100
+@@ -0,0 +1,5 @@
++# Jyväskylä DVB-T (Digita Finland)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Kerimaki /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Kerimaki
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Kerimaki 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Kerimaki 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Koli /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Koli
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Koli 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Koli 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Kruunupyy /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Kruunupyy
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Kruunupyy 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Kruunupyy 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Kuopio /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Kuopio
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Kuopio 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Kuopio 2004-02-11 20:03:41.000000000 +0100
+@@ -0,0 +1,9 @@
++# Kuopio DVB-T (Digita Finland)
++# Channel numbers in Kuopio:
++# Multiplex A channel number 24 (498 MHz)
++# Multiplex B channel number 31 (554 MHz)
++# Multiplex C channel number 39 (618 MHz)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Lahti /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Lahti
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Lahti 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Lahti 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,4 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Lapua /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Lapua
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Lapua 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Lapua 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,4 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Mikkeli /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Mikkeli
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Mikkeli 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Mikkeli 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Oulu /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Oulu
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Oulu 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Oulu 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,4 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Pernaja /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Pernaja
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Pernaja 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Pernaja 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Pihtipudas /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Pihtipudas
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Pihtipudas 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Pihtipudas 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Pyhavuori /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Pyhavuori
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Pyhavuori 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Pyhavuori 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Tammela /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Tammela
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Tammela 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Tammela 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Turku /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Turku
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Turku 2004-05-14 12:32:13.000000000 +0200
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Turku 2004-08-11 12:10:32.000000000 +0200
+@@ -1,3 +1,4 @@
+-# Turku A-mux (Digita Finland)
+ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+ T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Vaasa /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Vaasa
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Vaasa 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Vaasa 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/fi-Vuokatti /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Vuokatti
+--- linuxtv-dvb-apps/util/scan/dvb-t/fi-Vuokatti 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/fi-Vuokatti 2004-08-11 12:10:32.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/it-Conero /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/it-Conero
+--- linuxtv-dvb-apps/util/scan/dvb-t/it-Conero 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/it-Conero 2004-10-13 11:05:45.000000000 +0200
+@@ -0,0 +1,8 @@
++# Italia / Conero (it-Conero) -- mailto: simon <f.simon@email.it>
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# C50
++T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++# C46
++T 674000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++# C21
++T 474000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Alvsbyn /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Alvsbyn
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Alvsbyn 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Alvsbyn 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Älvsbyn
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 682000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Angelholm /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Angelholm
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Angelholm 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Angelholm 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Ängelholm
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Bollnas /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Bollnas
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Bollnas 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Bollnas 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Bollnäs
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 826000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Boras /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Boras
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Boras 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Boras 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Borås
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Borlange /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Borlange
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Borlange 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Borlange 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Borlänge
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Emmaboda /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Emmaboda
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Emmaboda 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Emmaboda 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Emmaboda
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Falun /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Falun
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Falun 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Falun 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Falun
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 738000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Gavle /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Gavle
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Gavle 2004-05-14 12:32:13.000000000 +0200
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Gavle 2004-08-03 14:14:04.000000000 +0200
+@@ -1,4 +1,4 @@
+-# Gavle (Senda/Boxer Sweden)
++# Sweden - Gävle
+ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+ T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+ T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Goteborg_Brudaremossen /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Goteborg_Brudaremossen
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Goteborg_Brudaremossen 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Goteborg_Brudaremossen 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Göteborg Brudaremossen
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Goteborg_Slattadamm /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Goteborg_Slattadamm
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Goteborg_Slattadamm 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Goteborg_Slattadamm 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Göteborg/Slättadamm
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Halmstad /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Halmstad
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Halmstad 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Halmstad 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Halmstad
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 474000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 802000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Harnosand /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Harnosand
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Harnosand 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Harnosand 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Härnösand
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Helsingborg /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Helsingborg
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Helsingborg 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Helsingborg 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Helsingborg
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Horby /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Horby
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Horby 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Horby 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Hörby
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Hudiksvall /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Hudiksvall
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Hudiksvall 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Hudiksvall 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Hudiksvall
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 618000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 578000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Jonkoping /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Jonkoping
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Jonkoping 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Jonkoping 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Jönköping
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Kalix /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Kalix
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Kalix 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Kalix 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Kalix
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 706000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 770000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 786000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Karlshamn /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Karlshamn
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Karlshamn 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Karlshamn 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Karlshamn
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 498000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Karlskrona /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Karlskrona
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Karlskrona 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Karlskrona 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Karlskrona
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 746000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 498000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Karlstad /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Karlstad
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Karlstad 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Karlstad 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Karlstad
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 546000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 626000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Kiruna /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Kiruna
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Kiruna 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Kiruna 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Kiruna
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Kisa /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Kisa
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Kisa 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Kisa 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Kisa
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Kramfors /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Kramfors
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Kramfors 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Kramfors 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Kramfors
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 554000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Linkoping_Vattentorn /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Linkoping_Vattentorn
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Linkoping_Vattentorn 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Linkoping_Vattentorn 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Linköping/Vattentorn
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 474000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Malmo /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Malmo
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Malmo 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Malmo 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Malmö
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Malmo_Kronprinsen /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Malmo_Kronprinsen
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Malmo_Kronprinsen 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Malmo_Kronprinsen 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Malmö/Kronprinsen
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 618000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Molndal_Vasterberget /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Molndal_Vasterberget
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Molndal_Vasterberget 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Molndal_Vasterberget 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Mölndal/Västerberget
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 594000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Mora /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Mora
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Mora 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Mora 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Mora
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 658000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Motala /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Motala
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Motala 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Motala 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Motala
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 522000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 626000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 474000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 642000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Nassjo /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Nassjo
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Nassjo 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Nassjo 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Nässjö
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Norrkoping /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Norrkoping
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Norrkoping 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Norrkoping 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Norrköping
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 530000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 802000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Norrtälje/Södra Bergen
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Orebro /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Orebro
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Orebro 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Orebro 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Örebro
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 586000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Ornskoldsvik /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Ornskoldsvik
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Ornskoldsvik 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Ornskoldsvik 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Örnsköldsvik
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Ostersund /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Ostersund
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Ostersund 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Ostersund 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Östersund
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Osthammar /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Osthammar
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Osthammar 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Osthammar 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Östhammar
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Skelleftea /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Skelleftea
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Skelleftea 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Skelleftea 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Skellefteå
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 490000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Skovde /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Skovde
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Skovde 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Skovde 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Skövde
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 562000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Södertälje/Ragnhildsborg
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 538000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 794000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Stockholm_Marieberg /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Stockholm_Marieberg
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Stockholm_Marieberg 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Stockholm_Marieberg 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Stockholm Marieberg
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Stockholm_Nacka /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Stockholm_Nacka
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Stockholm_Nacka 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Stockholm_Nacka 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Stockholm/Nacka
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 730000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 746000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Sundsvall /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Sundsvall
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Sundsvall 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Sundsvall 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Sundsvall
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Trollhattan /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Trollhattan
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Trollhattan 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Trollhattan 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Trollhättan
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Uddevalla /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Uddevalla
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Uddevalla 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Uddevalla 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Uddevalla
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 730000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 754000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 554000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Uppsala /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Uppsala
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Uppsala 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Uppsala 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Uppsala
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 474000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 650000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 570000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Vannas /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Vannas
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Vannas 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Vannas 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Vännäs
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 722000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Varberg /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Varberg
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Varberg 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Varberg 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Varberg
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 474000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 530000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 610000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 802000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Vasteras /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Vasteras
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Vasteras 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Vasteras 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Västerås
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 482000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Vastervik /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Vastervik
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Vastervik 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Vastervik 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Västervik
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 498000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Visby /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Visby
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Visby 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Visby 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Visby
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Vislanda /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Vislanda
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Vislanda 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Vislanda 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,6 @@
++# Sweden - Vislanda
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 626000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 578000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 602000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/se-Ystad /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Ystad
+--- linuxtv-dvb-apps/util/scan/dvb-t/se-Ystad 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/se-Ystad 2004-08-03 14:14:04.000000000 +0200
+@@ -0,0 +1,7 @@
++# Sweden - Ystad
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 506000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 794000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 818000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
++T 850000000 8MHz 3/4 NONE QAM64 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/tw-Taipei /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/tw-Taipei
+--- linuxtv-dvb-apps/util/scan/dvb-t/tw-Taipei 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/tw-Taipei 2004-12-02 03:53:14.000000000 +0100
+@@ -0,0 +1,7 @@
++# Taiwan - Taipei, northern Taiwan
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 533000000 6MHz 1/2 NONE QAM16 8k 1/8 NONE
++T 545000000 6MHz 2/3 NONE QAM16 8k 1/8 NONE
++T 557000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 581000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 593000000 6MHz 2/3 NONE QAM16 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/uk-EmleyMoor /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-EmleyMoor
+--- linuxtv-dvb-apps/util/scan/dvb-t/uk-EmleyMoor 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-EmleyMoor 2004-05-13 23:06:14.000000000 +0200
+@@ -0,0 +1,3 @@
++# Emley Moor, West Yorkshire
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 673833330 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/uk-Heathfield /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-Heathfield
+--- linuxtv-dvb-apps/util/scan/dvb-t/uk-Heathfield 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-Heathfield 2005-02-05 01:57:12.000000000 +0100
+@@ -0,0 +1,3 @@
++# Heathfield, South-east England
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 538000 8MHz 3/4 NONE QAM64 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/uk-Mendip /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-Mendip
+--- linuxtv-dvb-apps/util/scan/dvb-t/uk-Mendip 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-Mendip 2004-06-20 22:14:45.000000000 +0200
+@@ -0,0 +1,3 @@
++# Mendip, Southern England
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 754167000 8MHz 2/3 NONE QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/uk-SuttonColdfield /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-SuttonColdfield
+--- linuxtv-dvb-apps/util/scan/dvb-t/uk-SuttonColdfield 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-SuttonColdfield 2004-11-09 16:19:53.000000000 +0100
+@@ -0,0 +1,16 @@
++# Suttoncoldfield, Midlands
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# ITV Multiplex
++T 658166670 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# BBC Multiplex
++T 634166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Chan 5 Multiplex
++T 682166670 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Interactive Multiplex
++T 714166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Sky Multiplex
++T 722166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Radio / Audio Multiplex
++T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++
++
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/uk-TheWrekin /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-TheWrekin
+--- linuxtv-dvb-apps/util/scan/dvb-t/uk-TheWrekin 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-TheWrekin 2005-01-22 08:06:42.000000000 +0100
+@@ -0,0 +1,14 @@
++# The Wrekin (W), Midlands
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# Multiplex 1 BBC
++T 474000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex 2 Digital 3&4
++T 554000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Multiplex A SDN
++T 498166670 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Multiplex B BBC
++T 522166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex C Crown Castle
++T 730000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex D Crown Castle
++T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps/util/scan/dvb-t/uk-TheWrekinB /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-TheWrekinB
+--- linuxtv-dvb-apps/util/scan/dvb-t/uk-TheWrekinB 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.Ws5uUY/linuxtv-dvb-apps/util/scan/dvb-t/uk-TheWrekinB 2005-01-22 08:06:42.000000000 +0100
+@@ -0,0 +1,11 @@
++# The Wrekin B (E), Midlands
++# You may want to combine this with The Wrekin (W) transmitter for more channels
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# Multiplex 1 BBC
++T 618166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex 2 Digital 3&4
++T 698000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Multiplex A SDN
++T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Multiplex B BBC
++T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
Added: dvb/linuxtv-dvb-apps/trunk/debian/rules
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/rules 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/rules 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,75 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 by Joey Hess.
+#
+# This version is for a hypothetical package that builds an
+# architecture-dependant package, as well as an architecture-independent
+# package.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=4
+
+# include dpatch stuff
+include /usr/share/dpatch/dpatch.make
+
+SHELL=/bin/bash
+
+build: build-stamp
+build-stamp: patch-stamp
+ dh_testdir
+ # Add here commands to compile the package.
+ make
+
+ touch build-stamp
+
+clean: clean1 unpatch
+
+clean1:
+ dh_testdir
+ dh_testroot
+
+ rm -f *-stamp
+
+ # Add here commands to clean up after the build process.
+ make clean
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # install stuff into debian/dvb-utils.
+ cp -a util/av7110_loadkeys/README debian/dvb-utils/usr/share/doc/dvb-utils/README.av7110_loadkeys
+ cp -a util/scan/README debian/dvb-utils/usr/share/doc/dvb-utils/README.scan
+ cp -a util/szap/README debian/dvb-utils/usr/share/doc/dvb-utils/README.szap
+
+ dh_install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installmenu -a
+ dh_installcron -a
+ dh_installinfo -a
+ dh_installchangelogs -a
+ dh_strip -a
+ dh_link -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-arch
+.PHONY: build clean binary-arch binary build install patch unpatch configure clean1
Property changes on: dvb/linuxtv-dvb-apps/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: dvb/linuxtv-dvb-apps/trunk/debian/watch
===================================================================
--- dvb/linuxtv-dvb-apps/trunk/debian/watch 2005-02-23 10:27:54 UTC (rev 32)
+++ dvb/linuxtv-dvb-apps/trunk/debian/watch 2005-02-23 10:28:11 UTC (rev 33)
@@ -0,0 +1,2 @@
+version=2
+http://www.linuxtv.org/download/dvb/ linuxtv-dvb-apps.*-([\d+\.]+|\d+)\.tar(\.gz|\.bz2) debian uupdate