[linuxtv-dvb-apps] 05/30: Imported Debian patch 1.1.0-8
Tobias Grimm
tiber-guest at alioth.debian.org
Tue Sep 3 07:51:55 UTC 2013
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch master
in repository linuxtv-dvb-apps.
commit e050b128f4466790054e1befdeab19a7d9e84e11
Author: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Date: Sun Dec 11 13:37:12 2005 +0100
Imported Debian patch 1.1.0-8
---
debian/changelog | 20 +
debian/control | 2 +-
debian/patches/00list | 4 +-
debian/patches/03_budget_ci_loadkeys.dpatch | 242 ----
debian/patches/04_scanfiles_from_cvs.dpatch | 1593 +++++++++++++++++----
debian/patches/05_scanfile_de-Hamburg.dpatch | 34 -
debian/patches/06_freeview_channel_numbers.dpatch | 19 +
debian/patches/07_vdr_output.dpatch | 140 ++
debian/patches/08_debug_minor_fixes.dpatch | 37 +
9 files changed, 1531 insertions(+), 560 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 22a04bc..7fc86af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+linuxtv-dvb-apps (1.1.0-8) unstable; urgency=low
+
+ * Darren Salt <linux at youmustbejoking.demon.co.uk>:
+ - New patch 06_freeview_channel_numbers:
+ + fix Freeview channel number extraction (was losing the top two bits).
+ - New patch 07_vdr_output:
+ + correct format - output "channel;provider", not "provider - channel";
+ + output audio language information (assume that the AC3 PID is in the
+ same language as the first 'plain' audio channel);
+ + ensure that the transport stream ID is set for every service (else
+ there may be an apparent lack of EPG data for some channels).
+ - New patch 08_debug_minor_fixes:
+ + remove duplicate "0x".
+ - Modified patch 03_budget_ci_loadkeys, removing *.orig.
+ * Thomas Schmidt <tschmidt at debian.org>
+ - Updated scan files from linuxtv.org cvs (20051210)
+ - Bumped Standards-Version to 3.6.2.1
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 11 Dec 2005 13:37:12 +0100
+
linuxtv-dvb-apps (1.1.0-7) unstable; urgency=low
* Thomas Schmidt <tschmidt at debian.org>
diff --git a/debian/control b/debian/control
index 6e9b509..ad81385 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>
Build-Depends: debhelper (>> 4.0.0), dpatch (>= 2.0.9)
-Standards-Version: 3.6.1
+Standards-Version: 3.6.2.1
Package: dvb-utils
Architecture: any
diff --git a/debian/patches/00list b/debian/patches/00list
index 3a5a32d..4585a17 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,4 +2,6 @@
02_av7110_loadkeys-BTN
03_budget_ci_loadkeys
04_scanfiles_from_cvs
-05_scanfile_de-Hamburg
+06_freeview_channel_numbers
+07_vdr_output
+08_debug_minor_fixes
diff --git a/debian/patches/03_budget_ci_loadkeys.dpatch b/debian/patches/03_budget_ci_loadkeys.dpatch
index 722eb56..5a72efb 100644
--- a/debian/patches/03_budget_ci_loadkeys.dpatch
+++ b/debian/patches/03_budget_ci_loadkeys.dpatch
@@ -104,196 +104,6 @@ diff -urNad linuxtv-dvb-apps/util/av7110_loadkeys/av7110_loadkeys.c /tmp/dpep.HG
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
@@ -331,55 +141,3 @@ diff -urNad linuxtv-dvb-apps/util/av7110_loadkeys/Makefile /tmp/dpep.HGK2iu/linu
+ $(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
-+
diff --git a/debian/patches/04_scanfiles_from_cvs.dpatch b/debian/patches/04_scanfiles_from_cvs.dpatch
index a9ce4aa..8683fba 100644
--- a/debian/patches/04_scanfiles_from_cvs.dpatch
+++ b/debian/patches/04_scanfiles_from_cvs.dpatch
@@ -5,9 +5,21 @@
## DP: frequency-files from cvs (20050209) for the scan-tool
@DPATCH@
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-SalzburgAG /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-SalzburgAG
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-Innsbruck /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-Innsbruck
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-Innsbruck 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-Innsbruck 2005-08-31 13:45:31.000000000 +0200
+@@ -0,0 +1,8 @@
++# scan config for Innsbruck Telesystem cable provider
++# freq sr fec mod
++C 450000000 6875000 NONE QAM64
++C 490000000 6875000 NONE QAM64
++C 442000000 6875000 NONE QAM64
++C 546000000 6875000 NONE QAM64
++C 554000000 6875000 NONE QAM64
++C 562000000 6875000 NONE QAM64
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-SalzburgAG /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-SalzburgAG
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-SalzburgAG 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-SalzburgAG 2005-04-06 20:57:02.478006352 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -19,24 +31,51 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/at-SalzburgAG /tmp/dpep.sjvdC
+C 442000000 6900000 NONE QAM64
+C 306000000 6900000 NONE QAM64
+
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Zuerich-cablecom /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Zuerich-cablecom
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Video2000 /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Video2000
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Video2000 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Video2000 2005-06-28 23:52:11.000000000 +0200
+@@ -0,0 +1,5 @@
++# Cable Video2000
++# Canton of Neuchatel, Switzerland
++
++# freq sr fec mod
++C 306000000 6900000 NONE QAM64
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Zuerich-cablecom /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Zuerich-cablecom
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Zuerich-cablecom 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/ch-Zuerich-cablecom 2005-04-06 20:57:02.479006200 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-c/de-Berlin /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Berlin
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Berlin /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Berlin
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Berlin 2004-04-22 13:09:09.000000000 +0200
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Berlin 2004-03-10 22:16:29.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Berlin 2004-03-10 22:16:29.000000000 +0100
@@ -2,3 +2,4 @@
# freq sr fec mod
C 394000000 6900000 NONE QAM64
C 113000000 6900000 NONE QAM64
+C 466000000 6900000 NONE QAM64
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-neftv /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-neftv
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Muenchen /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Muenchen
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Muenchen 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-Muenchen 2005-08-17 01:03:15.000000000 +0200
+@@ -0,0 +1,14 @@
++# Kabel Muenchen
++# freq sr fec mod
++C 346000000 6900000 NONE QAM64
++C 354000000 6900000 NONE QAM64
++C 362000000 6900000 NONE QAM64
++C 370000000 6900000 NONE QAM64
++C 378000000 6900000 NONE QAM64
++C 386000000 6900000 NONE QAM64
++C 394000000 6900000 NONE QAM64
++C 402000000 6900000 NONE QAM64
++C 410000000 6900000 NONE QAM64
++C 418000000 6900000 NONE QAM64
++C 426000000 6900000 NONE QAM64
++C 434000000 6900000 NONE QAM64
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-neftv /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-neftv
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-neftv 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-neftv 2005-04-06 20:57:02.479006200 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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)
@@ -61,17 +100,17 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/de-neftv /tmp/dpep.sjvdCW/lin
+C 498000000 6875000 NONE QAM64
+C 514000000 6875000 NONE QAM64
+C 546000000 6875000 NONE QAM64
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-HTV /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-HTV
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-HTV /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-HTV
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-HTV 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-HTV 2005-04-06 20:57:02.479006200 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-c/fi-jkl /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-jkl
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-jkl /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-jkl
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-jkl 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-jkl 2005-04-06 20:57:02.479006200 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -83,24 +122,198 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-jkl /tmp/dpep.sjvdCW/linux
+C 498000000 6900000 NONE QAM128
+C 402000000 6900000 NONE QAM128
+C 410000000 6900000 NONE QAM128
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-TTV /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-TTV
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-TTV /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-TTV
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-TTV 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/fi-TTV 2005-04-06 20:57:02.479006200 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-s/Astra-28.2E /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/Astra-28.2E
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/lu-Ettelbruck-ACE /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/lu-Ettelbruck-ACE
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/lu-Ettelbruck-ACE 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/lu-Ettelbruck-ACE 2005-06-07 15:14:12.000000000 +0200
+@@ -0,0 +1,20 @@
++# Scan config for Antenne Collective Ettelbruck a.s.b.l.
++# (http://antenne-ettelbruck.lu)
++# Luxembourg - Ettelbruck
++# freq sr fec mod
++C 634000000 6900000 5/6 QAM64
++C 642000000 6900000 5/6 QAM64
++C 650000000 6900000 5/6 QAM64
++C 666000000 6900000 5/6 QAM64
++C 674000000 6900000 5/6 QAM64
++C 682000000 6900000 5/6 QAM64
++C 690000000 6900000 5/6 QAM64
++C 698000000 6900000 5/6 QAM64
++C 706000000 6900000 5/6 QAM64
++C 714000000 6900000 5/6 QAM64
++C 656000000 3450000 5/6 QAM64
++C 660000000 3450000 5/6 QAM64
++C 720000000 3450000 5/6 QAM64
++C 732000000 3450000 5/6 QAM64
++C 724000000 3450000 5/6 QAM64
++C 728000000 3450000 5/6 QAM64
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/no-Oslo-CanalDigital /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/no-Oslo-CanalDigital
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/no-Oslo-CanalDigital 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/no-Oslo-CanalDigital 2005-11-20 02:21:07.000000000 +0100
+@@ -0,0 +1,13 @@
++# no-oslo-CanalDigital (cable)
++C 354000000 6950000 NONE QAM64
++C 362000000 6950000 NONE QAM64
++C 370000000 6950000 NONE QAM64
++C 378000000 6950000 NONE QAM64
++C 386000000 6950000 NONE QAM64
++C 394000000 6950000 NONE QAM64
++C 402000000 6950000 NONE QAM64
++C 410000000 6950000 NONE QAM64
++C 418000000 6950000 NONE QAM64
++C 426000000 6950000 NONE QAM64
++C 450000000 6950000 NONE QAM64
++C 474000000 6950000 NONE QAM64
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/se-comhem /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/se-comhem
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/se-comhem 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-c/se-comhem 2005-08-16 00:14:46.000000000 +0200
+@@ -0,0 +1,3 @@
++# com hem
++# freq sr fec mod
++C 362000000 6875000 NONE QAM64
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/AsiaSat3S_C-105.5E /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/AsiaSat3S_C-105.5E
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/AsiaSat3S_C-105.5E 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/AsiaSat3S_C-105.5E 2005-04-23 23:35:50.000000000 +0200
+@@ -0,0 +1,122 @@
++# AsiaSat 3S 105.5E C-BAND
++# Generated by Xingbo Wang
++# Apr 2, 2005
++
++# MPEG-2 QPSK
++# freq pol sr fec
++
++# [encrypted] ZEE English, ZEE TV International, ZEE Movies, MX, ZEE TV SE Asia, ZEE TV Asia, Trendz
++S 3700000 V 27500000 3/4
++
++# BTV World
++S 3725000 V 4450000 3/4
++
++# SAB TV
++S 3743000 V 3300000 3/4
++
++# AAJ TV
++S 3750000 V 2820000 3/4
++
++# Arirang TV
++S 3755150 V 4417900 7/8
++
++# [encrypted] STAR Plus India, STAR Movies India, STAR News India, National Geographic India, STAR Gold, STAR Movies (Middle East)
++# STAR Utsav
++S 3780000 V 28100000 3/4
++
++# Chinese Provincial TV: Guangxi, Shanxi, Anhui, Jiangsu, Heilongjiang
++S 3806000 V 4420000 3/4
++S 3813000 V 4420000 3/4
++S 3820000 V 4420000 3/4
++S 3827000 V 4420000 3/4
++S 3834000 V 4420000 3/4
++
++# [encrypted] ESPN Taiwan, STAR Sports Taiwan, ESPN Asia, STAR Sports South East Asia, STAR Sports India, ESPN India, ESPN Philippines
++S 3860000 V 27500000 3/4
++
++# Dragon TV
++S 3886000 V 4800000 3/4
++
++# Shandong TV
++S 3895000 V 6813000 3/4
++
++# CCTV-1(comprehensive), China National Radio Channel 1
++S 3904000 V 4420000 7/8
++
++# Jilin Provincial TV
++S 3914500 V 4420000 3/4
++
++# [encrypted] A1, History, STAR Movies SEA/China, STAR World India, STAR Plus Pakistan, Channel[V] India, STAR Chinese Movies, CNBC India, STAR One, STAR Vijay
++S 3980000 V 28100000 3/4
++
++# Sahara One, Sahara Samay National, Sahara Samay Mumbai, Sahara Samay Uttar Pradesh, Sahara Samay Bihar, Sahara Samay Madhya Pradesh
++S 4020000 V 27250000 3/4
++
++# Tianjin TV
++S 4046000 V 5950000 3/4
++
++# PTV-1, PTV World, PTV Channel 3, AVT Khyber
++S 4091000 V 13333000 3/4
++
++# PTV National
++S 4106000 V 3333300 3/4
++
++# Indus News
++S 4115750 V 3333000 3/4
++
++# [encrypted] ZEE Biz, ZEE News, ZEE Cinema, ZEE Music, Alpha TV Punjabi, Alpha TV Gujarati, Alpha TV Bangla, Alpha TV Marathi, Smile TV
++S 4140000 V 27500000 3/4
++
++# Chinese Provincial TV: Henan, Fujian, Jiangxi, Liaoning
++S 4166000 V 4420000 3/4
++S 4180000 V 4420000 3/4
++S 4187000 V 4420000 3/4
++S 4194000 V 4420000 3/4
++
++# CETV
++S 3680000 H 26670000 3/4
++
++# Channel NewsAsia
++S 3706000 H 6000000 3/4
++
++# Asia Plus
++S 3715500 H 7000000 3/4
++
++# TVB 8, CETV
++S 3729000 H 13650000 3/4
++
++# Network of the World, Bloomberg TV Asia, Indus Vision, Indus Music, Muslim TV Ahmadiyya, Living Asia Channel
++# [encrypted] Filmazia
++S 3760000 H 26000000 7/8
++
++# [encrypted] Fox News, Sky News, STAR Movies Int'l Taiwan, National Geographic Taiwan, STAR Chinese Channel, STAR Movies mandarin, Channel[V] Taiwan
++S 3840000 H 26850000 7/8
++
++# STAR Sports Asia
++# [encrypted] ESPN China, STAR Sports Hong Kong, ESPN Hong Kong
++S 3920000 H 26750000 7/8
++
++# [encrypted] CNN International Asia, CNN Newsource, Cartoon Network Asia, Cartoon Network Taiwan, Cartoon Network Philippines, Cartoon Network Australia/New Zealand, TCM Australia, Boomerang
++S 3960000 H 27500000 3/4
++
++# [encrypted] Phoenix Movies, star World Asia, Star Movies Int'l, Channel[V] International, National Geographic Regional
++# Phoenix Chinese Channel, Phoenix Info News Channel, Xiong Kong Int'l, Xing Kong Regional, Channel[V](Greater China)
++S 4000000 H 26850000 7/8
++
++# Chinese Provincial TV: Hubei, Sichuan
++S 4034600 H 4420000 3/4
++S 4051000 H 4420000 3/4
++
++# Chinese Provincial TV: Qinghai, Hunan
++S 4067000 H 4420000 3/4
++S 4082000 H 4420000 3/4
++
++# Sun TV
++S 4094000 H 5555000 3/4
++
++# MATV, Horizon Channel
++# [encrypted] Tian Ying Movies Channel, TVB Xing He Channel
++S 4111000 H 13650000 3/4
++
++# CCTV Channel 4 (International), Channel 9 (English language), CCTV E&F
++S 4129000 H 13240000 3/4
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/Astra-28.2E /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/Astra-28.2E
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/Astra-28.2E 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/Astra-28.2E 2005-04-06 20:57:02.479006200 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-s/OptusC1-156E /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/OptusC1-156E
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/OptusC1-156E /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/OptusC1-156E
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/OptusC1-156E 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/OptusC1-156E 2005-04-06 20:57:02.480006048 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -122,9 +335,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-s/OptusC1-156E /tmp/dpep.sjvdCW
+S 12638000 H 27800000 3/4
+S 12689000 H 27800000 3/4
+S 12720000 V 30000000 3/4
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Adelaide /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Adelaide
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Adelaide /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Adelaide
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Adelaide 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Adelaide 2005-04-06 20:57:02.480006048 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -138,9 +351,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Adelaide /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/au-Brisbane /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Brisbane
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Brisbane /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Brisbane
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Brisbane 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Brisbane 2005-04-06 20:57:02.480006048 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -155,9 +368,50 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Brisbane /tmp/dpep.sjvdCW/
+# SBS
+T 585625000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
\ Kein Zeilenumbruch am Dateiende.
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Mackay /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Mackay
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-GoldCoast /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-GoldCoast
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-GoldCoast 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-GoldCoast 2005-08-31 19:00:42.000000000 +0200
+@@ -0,0 +1,21 @@
++# DVB-T frequencies & modulation for the Gold Coast, Australia (Mt Tamborine)
++# See http://www.dba.org.au/index.asp?sectionID=22&recLocation=Gold+Coast
++# and http://www.dba.org.au/index.asp?sectionID=120
++#
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# ABC (UHF 62)
++T 767500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# SBS (UHF 36)
++T 585500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# Seven (UHF 53)
++T 704500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# NBN (UHF 68)
++T 809500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Prime (UHF 65)
++T 788500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Southern Cross Ten (UHF 43)
++T 634500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Nine (UHF 59)
++T 746500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Ten (UHF 56)
++T 725500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Hobart /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Hobart
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Hobart 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Hobart 2005-11-19 01:17:05.000000000 +0100
+@@ -0,0 +1,12 @@
++# Australia / Tasmania / Hobart
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# ABC VHF 8
++T 191625000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
++# SBS VHF 9a
++T 205500000 7MHz 2/3 2/3 QAM64 8k 1/8 NONE
++# SCT VHF 10
++T 212500000 7MHz 3/4 3/4 QAM64 8k 1/16 NONE
++# WIN VHF 7
++T 184500000 7MHz 3/4 3/4 QAM64 8k 1/8 NONE
++# TDT VHF 11
++T 219500000 7MHz 3/4 3/4 QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Mackay /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Mackay
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Mackay 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Mackay 2005-03-13 22:32:25.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Mackay 2005-03-13 22:32:25.000000000 +0100
@@ -0,0 +1,14 @@
+# Australia / Mackay (Mt Blackwood transmitters)
+# aufreq=((UHF channel number)*8+306)
@@ -173,9 +427,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Mackay /tmp/dpep.sjvdCW/li
+T 557500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# SBS
+T 536500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne 2005-04-06 20:57:02.497003464 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -189,9 +443,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/au-Melbourne-Upwey /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne-Upwey
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne-Upwey /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne-Upwey
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne-Upwey 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne-Upwey 2005-04-06 20:57:02.497003464 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -214,9 +468,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Melbourne-Upwey /tmp/dpep.
+
+
+
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Perth /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Perth
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Perth /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Perth
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Perth 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Perth 2005-04-06 20:57:02.497003464 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -230,9 +484,52 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Perth /tmp/dpep.sjvdCW/lin
+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-1.1.0/util/scan/dvb-t/au-Townsville /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Townsville
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Sydney_Kings_Cross /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Sydney_Kings_Cross
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Sydney_Kings_Cross 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Sydney_Kings_Cross 2005-12-07 01:44:22.000000000 +0100
+@@ -0,0 +1,14 @@
++# Australia / Sydney / Kings Cross and North Head
++#
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++#
++# ABC UHF30
++T 543500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Seven UHF48
++T 669500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# Nine UHF33
++T 564500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# Ten UHF45
++T 648500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
++# SBS UHF34
++T 571500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-sydney_north_shore /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-sydney_north_shore
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-sydney_north_shore 2004-04-22 13:09:10.000000000 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-sydney_north_shore 2005-12-11 12:48:12.000000000 +0100
+@@ -1,12 +1,16 @@
+ # Australia / Sydney / North Shore (aka Artarmon/Gore Hill)
++#
+ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+-# ABC
++#
++# ABC VHF12
+ T 226500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+-# Seven
++# Seven VHF6
+ T 177500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+-# Nine
++# Nine VHF8
+ T 191625000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+-# Ten
++# Ten VHF11
+ T 219500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+-# SBS
++# SBS UHF34
+ T 571500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
++# D44 UHF35 (testing)
++T 578500000 7MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Townsville /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Townsville
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Townsville 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Townsville 2005-03-17 23:16:03.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Townsville 2005-03-17 23:16:03.000000000 +0100
@@ -0,0 +1,12 @@
+# Australia / Brisbane (Mt Coot-tha transmitters)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
@@ -246,17 +543,27 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/au-Townsville /tmp/dpep.sjvdC
+T 620500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
+# Ten
+T 585500000 7MHz 3/4 NONE QAM64 8k 1/16 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/cz-Praha /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/cz-Praha
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/cz-Praha /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/cz-Praha
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/cz-Praha 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/cz-Praha 2005-04-06 20:57:02.497003464 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/de-Braunschweig /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Braunschweig
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Berlin /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Berlin
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Berlin 2004-04-22 13:09:10.000000000 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Berlin 2005-12-02 23:12:05.000000000 +0100
+@@ -2,4 +2,6 @@
+ # T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+ T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # ard / rbb
+ T 570000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # zdf
++T 618000000 8MHz 1/2 NONE QAM16 8k 1/8 NONE # dvb-h testbouqet
+ T 658000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # t-systems
++T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # Kanal 59, n-tv, Euronews + Radio (IFA)
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Braunschweig /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Braunschweig
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Braunschweig 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Braunschweig 2005-04-06 20:57:02.498003312 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -265,9 +572,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Braunschweig /tmp/dpep.sjv
+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-1.1.0/util/scan/dvb-t/de-Bremen /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Bremen
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Bremen /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Bremen
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Bremen 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Bremen 2005-04-06 20:57:02.498003312 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -278,9 +585,18 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Bremen /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/de-Frankfurt /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Frankfurt
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Erfurt-Weimar /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Erfurt-Weimar
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Erfurt-Weimar 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Erfurt-Weimar 2005-12-07 01:38:01.000000000 +0100
+@@ -0,0 +1,5 @@
++# DVB-T Erfurt-Weimar
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 21, ARD, arte, Phoenix, Eins festival
++T 522000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # Kanal 27, MDR Th�ringen, rbb, WDR, hr
++T 706000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE # Kanal 50, ZDF, ZDF info / 3sat, KiKA / ZDF doku, MHP
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Frankfurt /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Frankfurt
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Frankfurt 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Frankfurt 2005-04-06 20:57:02.498003312 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Frankfurt 2004-09-12 14:25:52.000000000 +0200
@@ -0,0 +1,40 @@
+###########################################
+# DVB-T, Deutschland, Rhein-Main Gebiet
@@ -322,21 +638,26 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Frankfurt /tmp/dpep.sjvdCW
+# 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-1.1.0/util/scan/dvb-t/de-Hamburg /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg 2005-04-06 20:57:02.498003312 +0200
-@@ -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-1.1.0/util/scan/dvb-t/de-Hannover /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hannover
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg 2005-12-02 23:12:05.000000000 +0100
+@@ -0,0 +1,13 @@
++# DVB-T Hamburg
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 205500000 7MHz 3/4 NONE QAM16 8k 1/8 NONE # CH09: NDR, WDR, MDR, Bayrisches Fernsehen
++T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, Info/3sat, Doku/KiKa
++T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Sat.1, N24, ProSieben, KABEL1
++T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste Hamburg, Eins Extra, arte, Phoenix
++T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL Television, RTL2, Super RTL, VOX
++T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH53: HH1, Eurosport, Terra Nova, Neun Live
++T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH56: NDR, MDR, WDR, hr
++T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hannover /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hannover
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hannover 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hannover 2005-04-06 20:57:02.498003312 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -345,22 +666,21 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hannover /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/de-Kiel /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Kiel
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Kiel /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Kiel
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Kiel 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Kiel 2005-02-21 08:14:23.000000000 +0100
-@@ -0,0 +1,9 @@
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Kiel 2005-12-02 23:12:05.000000000 +0100
+@@ -0,0 +1,8 @@
+# DVB-T Kiel
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 21, ZDF, ZDFInfokanal/3Sat, KI.KA/ ZDFdokukanal, MHP: ZDFdigitext
-+T 514000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 26, Kabel 1, N24, ProSieben, SAT.1 Fernsehen
-+# T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 35,Kabel 1, N24, ProSieben, SAT.1 Fernsehen # ab 01.03.2005
++T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 35, Kabel 1, N24, ProSieben, SAT.1 Fernsehen
+T 618000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 39, NDR, WDR, mdr, Bayerisches Fernsehen
+T 666000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 45, RTL Television, RTL II, Super RTL, VOX
+T 682000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 47, ARD, Phoenix, arte, Eins Extra
-+
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Koeln-Bonn /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Koeln-Bonn
++T 762000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # Kanal 57, EuroSport, 9Live, TELE 5
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Koeln-Bonn /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Koeln-Bonn
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Koeln-Bonn 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Koeln-Bonn 2005-04-06 20:57:02.498003312 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -370,9 +690,19 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Koeln-Bonn /tmp/dpep.sjvdC
+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-1.1.0/util/scan/dvb-t/de-Luebeck /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Luebeck
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Leipzig /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Leipzig
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Leipzig 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Leipzig 2005-12-11 12:48:12.000000000 +0100
+@@ -0,0 +1,6 @@
++# DVB-T Leipzig (Germany)
++# Generated by Albrecht Lohoefener <albrechtloh at gmx.de>
++
++T 642000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH1:ZDF CH2:ZDFinfo/3sat CH3:ZDFDoku/KiKa
++T 205500000 7MHz 2/3 NONE QAM16 8k 1/16 NONE # CH1:BR CH2:MDR CH3:rbb CH4: WDR
++T 482000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH1:arte CH2:Phoenix CH3:EinsFestival CH4:ARD
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Luebeck /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Luebeck
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Luebeck 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Luebeck 2005-04-06 20:57:02.499003160 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -381,139 +711,307 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Luebeck /tmp/dpep.sjvdCW/l
+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-1.1.0/util/scan/dvb-t/de-Ruhrgebiet /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Ruhrgebiet
---- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Ruhrgebiet 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Ruhrgebiet 2005-04-06 20:57:02.499003160 +0200
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Muenchen /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Muenchen
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Muenchen 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Muenchen 2005-05-31 16:18:48.000000000 +0200
+@@ -0,0 +1,10 @@
++# DVB-T Muenchen/Bayern
++# by Christoph Anton Mitterer (cam at mathematica.scientia.net)
++# http://christoph.anton.mitterer.name/
++
++T 212500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE
++T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 586000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 690000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 754000000 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-1.1.0/util/scan/dvb-t/de-Nuernberg /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Nuernberg
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Nuernberg 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Nuernberg 2005-06-06 16:10:15.000000000 +0200
@@ -0,0 +1,8 @@
++# DVB-T Nuernberg
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 184500000 7MHz 3/4 NONE QAM16 8k 1/4 NONE # ard
++T 578000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # zdf
++T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # prosieben
++T 778000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # br
++T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # franken
++T 834000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # rtl
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Ruhrgebiet /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Ruhrgebiet
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Ruhrgebiet 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Ruhrgebiet 2005-12-02 23:12:05.000000000 +0100
+@@ -0,0 +1,16 @@
+# DVB-T D�sseldorf/Ruhrgebiet
++# not everyone in this area will be able to tune on the
++# last 3 frequencies, as they are not broadcasted in the whole
++# area. see
++# http://nrw.ueberallfernsehen.de/fileadmin/downloads/Programm_Ruhr_2005_04_04_final.pdf
++# for details on regional availability.
++#
+# 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-1.1.0/util/scan/dvb-t/es-Alpicat /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alpicat
++T 506000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
++T 674000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
++T 778000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alfabia /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alfabia
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alfabia 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alfabia 2005-12-07 01:31:30.000000000 +0100
+@@ -0,0 +1,7 @@
++# DVB-T Alfabia, Mallorca, Balearic Islands, Spain.
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.63: 24h, 50 aniv., ClanTV, La 2, TVE1; RNE 1, RNE 3, RNE C; Digitext, EPG, Lanzadera.
++T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.66: NetTV, Teledeporte, VeoTV1, VeoTV2.
++T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.67: 40 Latino TV, CNN+, Cuatro, La Sexta 1.
++T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.68: Fly Music, Tele 5, Tele 5 Estrellas, Tele 5 Sport.
++T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C.69: Antena 3, La Sexta 2, Neox, Nova.
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alpicat /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alpicat
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alpicat 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alpicat 2005-04-06 20:57:02.499003160 +0200
-@@ -0,0 +1,5 @@
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Alpicat 2005-12-02 23:12:05.000000000 +0100
+@@ -0,0 +1,8 @@
+# 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-1.1.0/util/scan/dvb-t/es-Collserola /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Collserola
++T 770000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c58: TV3, K3/33, 3/24, 300, 3i
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c64: TVE1, TVE2, Teledeporte, C24h
++T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
++T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c67: Cuatro, 40Latino, CNN+, LaSexta 1
++T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
++T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Collserola /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Collserola
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Collserola 2004-04-22 13:09:10.000000000 +0200
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Collserola 2005-04-06 20:57:02.499003160 +0200
-@@ -1,6 +1,5 @@
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Collserola 2005-12-11 12:48:12.000000000 +0100
+@@ -1,6 +1,10 @@
# 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-1.1.0/util/scan/dvb-t/es-Madrid /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Madrid
++T 514000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c26: BTV
++T 570000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c33: CityTV
++T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c61: TV3, K3/33, 3/24, 300
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c64: TVE1, TVE2, TVE 24H, Clan/TVE 50 A�os, RNE1, RNEC, RNE3
++T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c66: Veo TV, Veo2, Net TV, Teledeporte
++T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c67: Cuatro, CNN+, 40 Latino, La Sexta1
++T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c68: Telecino, T5 Sport, T5 Estrellas, Fly Music
++T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #c69: Antena 3, Antena.Neox, Antena.Nova, La Sexta2
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Lugo /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Lugo
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Lugo 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Lugo 2005-06-10 20:33:48.000000000 +0200
+@@ -0,0 +1,4 @@
++# DVB-T Paramo (Lugo, Spain)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C59: Canales nacionales
++T 810000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C63: Canales autonomicos
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Madrid /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Madrid
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Madrid 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Madrid 2005-04-06 20:57:02.499003160 +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-1.1.0/util/scan/dvb-t/es-Mussara /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Mussara
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Madrid 2005-12-11 12:48:12.000000000 +0100
+@@ -0,0 +1,8 @@
++T 770000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 58: La Primera, La 2, Canal 24H, Clan/TVE 50, RNE1, RNE Cl�sica, RNE 3
++T 810000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 63: Telemadrid, La Otra, Onda 6
++T 834000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 66: Veo, Veo 2, Net TV, Teledeporte
++T 842000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 67: Cuatro, CNN+, 40 Latino, La Sexta 1
++T 850000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 68: Telecinco, Telecinco Sport, Telecinco Estrellas, Fly Music
++T 858000000 8MHz 2/3 1/2 QAM64 8k 1/4 NONE # Canal 69: Antena 3, Antena Neox, Antena Nova, La Sexta 2
++
++
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Mussara /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Mussara
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Mussara 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Mussara 2005-04-06 20:57:02.499003160 +0200
-@@ -0,0 +1,5 @@
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Mussara 2005-12-02 23:12:05.000000000 +0100
+@@ -0,0 +1,8 @@
+# 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-1.1.0/util/scan/dvb-t/fi-Anjalankoski /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Anjalankoski
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c59: TV3, K3/33, 3/24, 300, 3i
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c64: TVE1, TVE2, Teledeporte, C24h
++T 834000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c66: TVE ClanTV, TVE 50a, Veo1, Veo2, Net
++T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c67: Cuatro, 40Latino, CNN+, LaSexta 1
++T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c68: T5, T5 Sports, T5 Estrellas, Net Fly Music
++T 858000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # c69: Antena3, Antena.Neox, Antena.Nova, La Sexta 2
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Rocacorba /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Rocacorba
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Rocacorba 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Rocacorba 2005-11-20 01:39:48.000000000 +0100
+@@ -0,0 +1,6 @@
++# DVB-T Rocacorba (Girona)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 786000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TVE 1, TVE 2, ANTENA 3, TELECINCO, CUATRO
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # TV3, K3/33, 3XL.NET, 3/24, CANAL PILOT
++T 842000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # SERVICIO PRUEBAS CANAL 67
++T 850000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE #
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Sevilla /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Sevilla
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Sevilla 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/es-Sevilla 2005-06-07 17:07:11.000000000 +0200
+@@ -0,0 +1,4 @@
++# DVB-T Sevilla (Andalucia)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE # C43: autonomicos
++T 794000000 8MHz 2/3 NONE QAM64 8k 1/4 NONE # C61: nacionales
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ahtari /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ahtari
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ahtari 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ahtari 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 722000000 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-1.1.0/util/scan/dvb-t/fi-Ala-Vuokki /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ala-Vuokki
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ala-Vuokki 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ala-Vuokki 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 786000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ammansaari /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ammansaari
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ammansaari 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ammansaari 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 642000000 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-1.1.0/util/scan/dvb-t/fi-Anjalankoski /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Anjalankoski
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Anjalankoski 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Anjalankoski 2005-04-06 20:57:02.500003008 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Espoo /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Espoo
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Espoo /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Espoo
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Espoo 2004-04-22 13:09:10.000000000 +0200
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Espoo 2005-04-06 20:57:02.500003008 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Eurajoki /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Eurajoki
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Eurajoki /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Eurajoki
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Eurajoki 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Eurajoki 2005-04-06 20:57:02.500003008 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Fiskars /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Fiskars
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Fiskars /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Fiskars
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Fiskars 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Fiskars 2005-04-06 20:57:02.500003008 +0200
-@@ -0,0 +1,3 @@
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Fiskars 2005-12-02 23:12:05.000000000 +0100
+@@ -0,0 +1,4 @@
+# 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-1.1.0/util/scan/dvb-t/fi-Haapavesi /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Haapavesi
++T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Haapavesi /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Haapavesi
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Haapavesi 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Haapavesi 2005-04-06 20:57:02.500003008 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Joutseno /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Joutseno
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Hetta /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Hetta
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Hetta 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Hetta 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 554000000 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-1.1.0/util/scan/dvb-t/fi-Iisalmi /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Iisalmi
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Iisalmi 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Iisalmi 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 514000000 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-1.1.0/util/scan/dvb-t/fi-Inari /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Inari
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Inari 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Inari 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Joutseno /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Joutseno
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Joutseno 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Joutseno 2005-04-06 20:57:02.500003008 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Jyvaskyla /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Jyvaskyla
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Juntusranta /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Juntusranta
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Juntusranta 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Juntusranta 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 642000000 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-1.1.0/util/scan/dvb-t/fi-Jyvaskyla /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Jyvaskyla
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Jyvaskyla 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Jyvaskyla 2005-04-06 20:57:02.501002856 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Kerimaki /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kerimaki
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kaihuanvaara /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kaihuanvaara
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kaihuanvaara 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kaihuanvaara 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 706000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Karigasniemi /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Karigasniemi
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Karigasniemi 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Karigasniemi 2005-07-16 19:50:22.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 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kaunispaa /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kaunispaa
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kaunispaa 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kaunispaa 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 506000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kerimaki /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kerimaki
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kerimaki 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kerimaki 2005-04-06 20:57:02.501002856 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Koli /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Koli
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kiihtelysvaara /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kiihtelysvaara
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kiihtelysvaara 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kiihtelysvaara 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kilpisjarvi /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kilpisjarvi
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kilpisjarvi 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kilpisjarvi 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 666000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Koli /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Koli
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Koli 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Koli 2005-04-06 20:57:02.501002856 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Kruunupyy /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kruunupyy
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kruunupyy /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kruunupyy
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kruunupyy 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kruunupyy 2005-04-06 20:57:02.501002856 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Kuopio /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuopio
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuopio /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuopio
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuopio 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuopio 2005-04-06 20:57:02.501002856 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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:
@@ -524,91 +1022,344 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuopio /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/fi-Lahti /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lahti
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuttanen /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuttanen
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuttanen 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Kuttanen 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 770000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lahti /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lahti
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lahti 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lahti 2005-04-06 20:57:02.501002856 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Lapua /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lapua
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lapua /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lapua
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lapua 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Lapua 2005-04-06 20:57:02.502002704 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Mikkeli /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Mikkeli
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Mikkeli /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Mikkeli
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Mikkeli 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Mikkeli 2005-04-06 20:57:02.502002704 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Oulu /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Oulu
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Oulu /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Oulu
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Oulu 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Oulu 2005-04-06 20:57:02.502002704 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Pernaja /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pernaja
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pello /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pello
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pello 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pello 2005-07-16 19:50:22.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 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pernaja /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pernaja
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pernaja 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pernaja 2005-04-06 20:57:02.502002704 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Pihtipudas /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pihtipudas
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pihtipudas /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pihtipudas
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pihtipudas 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pihtipudas 2005-04-06 20:57:02.502002704 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Pyhavuori /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pyhavuori
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Posio /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Posio
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Posio 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Posio 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++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-1.1.0/util/scan/dvb-t/fi-Pudasjarvi /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pudasjarvi
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pudasjarvi 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pudasjarvi 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 690000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Puolanka /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Puolanka
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Puolanka 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Puolanka 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 642000000 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-1.1.0/util/scan/dvb-t/fi-Pyhatunturi /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pyhatunturi
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pyhatunturi 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pyhatunturi 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 634000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pyhavuori /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pyhavuori
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pyhavuori 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Pyhavuori 2005-04-06 20:57:02.503002552 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Tammela /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tammela
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ranua /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ranua
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ranua 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ranua 2005-07-16 19:50:22.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 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Rovaniemi /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Rovaniemi
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Rovaniemi 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Rovaniemi 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 650000000 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-1.1.0/util/scan/dvb-t/fi-Ruka /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ruka
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ruka 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Ruka 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 670000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Salla /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Salla
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Salla 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Salla 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 514000000 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-1.1.0/util/scan/dvb-t/fi-Taivalkoski /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Taivalkoski
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Taivalkoski 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Taivalkoski 2005-07-16 19:50:22.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 610000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tammela /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tammela
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tammela 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tammela 2005-04-06 20:57:02.503002552 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Turku /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Turku
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tervola /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tervola
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tervola 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Tervola 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 642000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Turku /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Turku
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Turku 2004-04-22 13:09:10.000000000 +0200
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Turku 2005-04-06 20:57:02.503002552 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Vaasa /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vaasa
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Utsjoki /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Utsjoki
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Utsjoki 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Utsjoki 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# 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 714000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vaasa /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vaasa
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vaasa 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vaasa 2005-04-06 20:57:02.503002552 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fi-Vuokatti /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuokatti
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuokatti /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuokatti
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuokatti 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuokatti 2005-04-06 20:57:02.503002552 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/fr-Paris /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Paris
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuotso /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuotso
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuotso 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Vuotso 2005-07-16 19:50:22.000000000 +0200
+@@ -0,0 +1,3 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 554000000 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-1.1.0/util/scan/dvb-t/fi-Yllas /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Yllas
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Yllas 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fi-Yllas 2005-07-16 19:50:22.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 594000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Bordeaux /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Bordeaux
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Bordeaux 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Bordeaux 2005-05-23 10:06:40.000000000 +0200
+@@ -0,0 +1,8 @@
++# Bordeaux - France (DVB-T transmitter of Bouliac or Cauderan)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 482000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Brest /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Brest
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Brest 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Brest 2005-11-19 00:16:44.000000000 +0100
+@@ -0,0 +1,9 @@
++# Brest - France
++# Emetteur du Roch Tredudon
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 546000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 482000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 506000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 490000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 530000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 514000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-LeMans /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-LeMans
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-LeMans 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-LeMans 2005-10-24 02:17:46.000000000 +0200
+@@ -0,0 +1,21 @@
++# Le Mans - France (DVB-T transmitter of Mayet)
++# Le Mans - France (signal DVB-T transmis depuis l'�metteur de Mayet )
++# Pour plus d'informations vous pouvez consulter :
++# - le topic sur l'�metteur de Mayet sur le forum du site tvnt.net :
++# http://www.tvnt.net/forum/viewtopic.php?t=48
++# - le site de TDF : http://tnt.niv2.com/72100-LE-MANS.html
++# contact : Matthieu Duchemin <alkahan at free.fr>
++
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# R1 : Canal 26
++T 514000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R2 : Canal 23
++T 490000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R3 : Canal 56
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R4 : Canal 31
++T 554000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R5 : Canal 37
++T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R6 : Canal 36
++T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Lyon-Fourviere /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Lyon-Fourviere
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Lyon-Fourviere 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Lyon-Fourviere 2005-11-20 01:41:22.000000000 +0100
+@@ -0,0 +1,18 @@
++# Lyon - France (DVB-T transmitter of Fourvi�re)
++# Lyon - France (signal DVB-T transmis depuis l'�metteur de Fourvi�re)
++# see : http://tnt.niv2.com/69000-LYON.html
++# contact : Nicolas Estre <n_estre at yahoo.fr>
++
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# R1 : Canal 56
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R2 : Canal 36
++T 594000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R3 : Canal 21
++T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R4 : Canal 54
++T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R5 : Canal 27
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R6 : Canal 24
++T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Lyon-Pilat /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Lyon-Pilat
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Lyon-Pilat 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Lyon-Pilat 2005-11-20 01:41:22.000000000 +0100
+@@ -0,0 +1,18 @@
++# Lyon - France (DVB-T transmitter of Mt Pilat)
++# Lyon - France (signal DVB-T transmis depuis l'�metteur du Mont Pilat)
++# see : http://tnt.niv2.com/69000-LYON.html
++# contact : Nicolas Estre <n_estre at yahoo.fr>
++
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# R1 : Canal 45
++T 666000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R2 : Canal 36
++T 589000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R3 : Canal 39
++T 618000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R4 : Canal 54
++T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R5 : Canal 42
++T 642000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++# R6 : Canal 47
++T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Marseille /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Marseille
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Marseille 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Marseille 2005-05-21 13:12:25.000000000 +0200
+@@ -0,0 +1,6 @@
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 546000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Nantes /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Nantes
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Nantes 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Nantes 2005-10-24 00:46:49.000000000 +0200
+@@ -0,0 +1,8 @@
++# Nantes - France
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 506000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 530000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 658000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 802000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Niort /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Niort
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Niort 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Niort 2005-07-15 18:13:35.000000000 +0200
+@@ -0,0 +1,7 @@
++# Niort - France (DVB-T transmitter of Niort-Maisonnay)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 498000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 602000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 738000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 778000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
++T 802000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Orleans /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Orleans
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Orleans 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Orleans 2005-12-01 21:57:18.000000000 +0100
+@@ -0,0 +1,17 @@
++# Orl�ans / France
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++#
++# R2: canal 38 : direct8 TMC Gulli europe2 bfm it�l�
++T 610166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++
++# R1: canal 46 : F2 F3 F4 F5 arte LCP
++T 674166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++
++# R4: canal 48 : M6 W9 NT1
++T 690166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++
++# R6: canal 51 : TF1 NRJ12
++T 714166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++
++# R3: canal 63 : canalplus
++T 810166000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Paris /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Paris
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Paris 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Paris 2005-03-24 21:04:09.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Paris 2005-12-02 23:12:06.000000000 +0100
@@ -0,0 +1,7 @@
+# Paris - France (DVB-T transmitter of the Eiffel tower)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
@@ -616,10 +1367,10 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Paris /tmp/dpep.sjvdCW/lin
+T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-+T 586000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rennes /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rennes
++T 586000000 8MHz 3/4 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rennes /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rennes
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rennes 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rennes 2005-03-22 17:12:04.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rennes 2005-03-22 17:12:04.000000000 +0100
@@ -0,0 +1,7 @@
+# Rennes - France
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
@@ -628,27 +1379,130 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rennes /tmp/dpep.sjvdCW/li
+T 650000000 8MHz 1/2 NONE QAM16 8k 1/32 NONE
+T 674000000 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-1.1.0/util/scan/dvb-t/it-Bologna /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bologna
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rouen /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rouen
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rouen 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Rouen 2005-06-06 17:00:22.000000000 +0200
+@@ -0,0 +1,8 @@
++# Rouen - France
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 538000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 474000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 522000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 498000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 602000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 562000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Toulouse /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Toulouse
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Toulouse 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Toulouse 2005-08-29 01:02:50.000000000 +0200
+@@ -0,0 +1,8 @@
++# Toulouse - France (DVB-T transmitter of Bohnoure)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 754167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 698167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 722167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 714167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 746167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 730167000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Vannes /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Vannes
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Vannes 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/fr-Vannes 2005-06-06 17:02:54.000000000 +0200
+@@ -0,0 +1,7 @@
++# Vannes - France
++# 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 698000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 762000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/hr-Zagreb /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/hr-Zagreb
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/hr-Zagreb 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/hr-Zagreb 2005-10-23 23:23:36.000000000 +0200
+@@ -0,0 +1,3 @@
++# DVB-T Hamburg
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 522000000 8MHz 3/4 NONE AUTO 8k 1/32 NONE # CH27:
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/is-Reykjavik /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/is-Reykjavik
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/is-Reykjavik 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/is-Reykjavik 2005-08-31 13:47:41.000000000 +0200
+@@ -0,0 +1,13 @@
++# Initial scan config for Digital �sland in Iceland
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 682000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 690000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 698000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 706000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 714000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 738000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 754000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 762000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 778000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 794000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
++T 818000000 8MHz 2/3 NONE QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bologna /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bologna
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bologna 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bologna 2005-02-26 19:10:48.000000000 +0100
-@@ -0,0 +1,14 @@
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bologna 2005-12-02 23:12:06.000000000 +0100
+@@ -0,0 +1,22 @@
+# DVB-T Collserola (Barcelona)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+#RaiA
+T 203500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
-+#Rete7
++#Sestarete / Rete 7
+T 212500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
-+#Rete7
++#Modena
++T 219500000 7MHz 2/3 2/3 QAM64 8k 1/32 NONE
++#ReteA, Camera e Senato
++T 594000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
++#Sestarete / Rete 7
+T 610000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+#DFree
+T 634000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
++#Mediaset Mux-B
++T 698000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+#La7
+T 714000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+#RaiB
+T 722000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Conero /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Conero
++#Mediaset Mux-A
++T 794000000 8MHz 2/3 2/3 QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bolzano /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bolzano
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bolzano 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Bolzano 2005-10-24 00:34:35.000000000 +0200
+@@ -0,0 +1,5 @@
++# DVB-T Bolzano
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++
++#RAS DVB-t NETWORK
++T 698000000 8MHz 2/3 2/3 QAM16 8k 1/4 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Catania /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Catania
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Catania 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Catania 2005-09-10 18:29:27.000000000 +0200
+@@ -0,0 +1,23 @@
++# it-Catania
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++
++# MUX DFREE (Canale 5,Italia1,SportItalia,LCI,RadioItalia Tv)
++T 810000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++T 690000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++T 618000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++
++# MUX LA7/MTV (La 7,MTV ITALIA,Canale D,Music Box)
++#T 586000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++
++# MUX RTI (Rete 4,Class News,Sole 24 Ore TV,BBC World)
++T 586000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++
++# MUX MEDIASET 2
++T 818000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++T 650000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++
++# MUX-A RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
++T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
++
++# MUX-B RAI (Rai Utile,Rai Doc,RaiSportSAT,RaiNews24,Rai EDU1)
++T 482000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Conero /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Conero
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Conero 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Conero 2005-04-06 20:57:02.514000880 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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 at email.it>
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
@@ -658,9 +1512,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Conero /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/it-Genova /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Genova
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Genova /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Genova
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Genova 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Genova 2005-03-04 14:33:18.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Genova 2005-03-04 14:33:18.000000000 +0100
@@ -0,0 +1,12 @@
+# Italia / Genova (it-Genova) - Angelo Conforti <angeloxx at angeloxx.it>
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
@@ -674,9 +1528,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Genova /tmp/dpep.sjvdCW/li
+T 770000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+# MUX Mediaset
+T 850000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Milano /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Milano
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Milano /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Milano
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Milano 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Milano 2005-02-26 19:10:48.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Milano 2005-02-26 19:10:48.000000000 +0100
@@ -0,0 +1,13 @@
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+# MUX-A RAI
@@ -691,9 +1545,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Milano /tmp/dpep.sjvdCW/li
+T 706000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+# MUX DFREE 2
+T 538000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Torino /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Torino
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Torino /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Torino
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Torino 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Torino 2005-04-03 21:30:13.000000000 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Torino 2005-04-03 21:30:13.000000000 +0200
@@ -0,0 +1,13 @@
+# DVB-T Torino (Italia)
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
@@ -708,9 +1562,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Torino /tmp/dpep.sjvdCW/li
+T 602000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
+#MUX DFREE
+T 650000000 8MHz 1/2 NONE QAM64 8k 1/4 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Varese /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Varese
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Varese /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Varese
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Varese 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Varese 2005-03-26 22:11:33.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Varese 2005-03-26 22:11:33.000000000 +0100
@@ -0,0 +1,16 @@
+# Italia / Varese -- mailto: b.gabriele <gb.dvbch at dveprojects.com>
+#
@@ -728,9 +1582,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/it-Varese /tmp/dpep.sjvdCW/li
+T 514000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
+# MUX RTI UHF C38 514 V CAMPO DEI FIORI ALBERGO
+T 610000000 8MHz 2/3 1/2 QAM64 8k 1/32 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Alvsbyn /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Alvsbyn
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Alvsbyn /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Alvsbyn
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Alvsbyn 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Alvsbyn 2005-04-06 20:57:02.514000880 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -739,9 +1593,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Alvsbyn /tmp/dpep.sjvdCW/l
+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-1.1.0/util/scan/dvb-t/se-Angelholm /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Angelholm
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Angelholm /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Angelholm
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Angelholm 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Angelholm 2005-04-06 20:57:02.514000880 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -750,9 +1604,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Angelholm /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Bollnas /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Bollnas
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Bollnas /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Bollnas
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Bollnas 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Bollnas 2005-04-06 20:57:02.514000880 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -760,9 +1614,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Bollnas /tmp/dpep.sjvdCW/l
+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-1.1.0/util/scan/dvb-t/se-Boras /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Boras
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Boras /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Boras
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Boras 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Boras 2005-04-06 20:57:02.514000880 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -770,9 +1624,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Boras /tmp/dpep.sjvdCW/lin
+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-1.1.0/util/scan/dvb-t/se-Borlange /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Borlange
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Borlange /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Borlange
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Borlange 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Borlange 2005-04-06 20:57:02.515000728 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -780,9 +1634,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Borlange /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/se-Emmaboda /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Emmaboda
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Emmaboda /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Emmaboda
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Emmaboda 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Emmaboda 2005-04-06 20:57:02.515000728 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -790,9 +1644,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Emmaboda /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/se-Falun /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Falun
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Falun /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Falun
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Falun 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Falun 2005-04-06 20:57:02.515000728 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -800,18 +1654,27 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Falun /tmp/dpep.sjvdCW/lin
+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-1.1.0/util/scan/dvb-t/se-Gavle /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Gavle
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Gallivare /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Gallivare
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Gallivare 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Gallivare 2005-12-07 01:33:28.000000000 +0100
+@@ -0,0 +1,5 @@
++# Sweden -Gellivare
++T 674000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 514000000 8MHz 2/3 NONE QAM64 8k 1/8 NONE
++T 530000000 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-1.1.0/util/scan/dvb-t/se-Gavle /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Gavle
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Gavle 2004-04-22 13:09:10.000000000 +0200
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Gavle 2005-04-06 20:57:02.515000728 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/se-Goteborg_Brudaremossen /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Brudaremossen
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Brudaremossen /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Brudaremossen
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Brudaremossen 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Brudaremossen 2005-04-06 20:57:02.515000728 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -820,9 +1683,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Brudaremossen /tm
+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-1.1.0/util/scan/dvb-t/se-Goteborg_Slattadamm /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Slattadamm
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Slattadamm /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Slattadamm
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Slattadamm 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Slattadamm 2005-04-06 20:57:02.515000728 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -831,9 +1694,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Goteborg_Slattadamm /tmp/d
+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-1.1.0/util/scan/dvb-t/se-Halmstad /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Halmstad
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Halmstad /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Halmstad
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Halmstad 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Halmstad 2005-04-06 20:57:02.516000576 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -841,9 +1704,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Halmstad /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/se-Harnosand /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Harnosand
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Harnosand /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Harnosand
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Harnosand 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Harnosand 2005-04-06 20:57:02.516000576 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -851,9 +1714,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Harnosand /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Helsingborg /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Helsingborg
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Helsingborg /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Helsingborg
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Helsingborg 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Helsingborg 2005-04-06 20:57:02.516000576 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -862,9 +1725,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Helsingborg /tmp/dpep.sjvd
+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-1.1.0/util/scan/dvb-t/se-Horby /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Horby
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Horby /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Horby
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Horby 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Horby 2005-04-06 20:57:02.516000576 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -873,9 +1736,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Horby /tmp/dpep.sjvdCW/lin
+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-1.1.0/util/scan/dvb-t/se-Hudiksvall /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Hudiksvall
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Hudiksvall /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Hudiksvall
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Hudiksvall 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Hudiksvall 2005-04-06 20:57:02.516000576 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -883,9 +1746,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Hudiksvall /tmp/dpep.sjvdC
+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-1.1.0/util/scan/dvb-t/se-Jonkoping /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Jonkoping
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Jonkoping /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Jonkoping
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Jonkoping 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Jonkoping 2005-04-06 20:57:02.517000424 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -893,9 +1756,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Jonkoping /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Kalix /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kalix
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kalix /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kalix
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kalix 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kalix 2005-04-06 20:57:02.517000424 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -903,9 +1766,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kalix /tmp/dpep.sjvdCW/lin
+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-1.1.0/util/scan/dvb-t/se-Karlshamn /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlshamn
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlshamn /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlshamn
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlshamn 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlshamn 2005-04-06 20:57:02.517000424 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -913,9 +1776,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlshamn /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Karlskrona /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlskrona
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlskrona /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlskrona
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlskrona 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlskrona 2005-04-06 20:57:02.517000424 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -923,9 +1786,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlskrona /tmp/dpep.sjvdC
+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-1.1.0/util/scan/dvb-t/se-Karlstad /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlstad
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlstad /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlstad
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlstad 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlstad 2005-04-06 20:57:02.517000424 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -933,9 +1796,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Karlstad /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/se-Kiruna /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kiruna
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kiruna /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kiruna
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kiruna 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kiruna 2005-04-06 20:57:02.517000424 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -943,9 +1806,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kiruna /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/se-Kisa /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kisa
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kisa /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kisa
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kisa 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kisa 2005-04-06 20:57:02.518000272 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -953,9 +1816,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kisa /tmp/dpep.sjvdCW/linu
+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-1.1.0/util/scan/dvb-t/se-Kramfors /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kramfors
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kramfors /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kramfors
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kramfors 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kramfors 2005-04-06 20:57:02.518000272 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -963,9 +1826,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Kramfors /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/se-Linkoping_Vattentorn /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Linkoping_Vattentorn
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Linkoping_Vattentorn /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Linkoping_Vattentorn
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Linkoping_Vattentorn 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Linkoping_Vattentorn 2005-04-06 20:57:02.518000272 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -973,9 +1836,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Linkoping_Vattentorn /tmp/
+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-1.1.0/util/scan/dvb-t/se-Malmo /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo 2005-04-06 20:57:02.518000272 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -984,9 +1847,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo /tmp/dpep.sjvdCW/lin
+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-1.1.0/util/scan/dvb-t/se-Malmo_Kronprinsen /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo_Kronprinsen
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo_Kronprinsen /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo_Kronprinsen
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo_Kronprinsen 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo_Kronprinsen 2005-04-06 20:57:02.518000272 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -994,9 +1857,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Malmo_Kronprinsen /tmp/dpe
+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-1.1.0/util/scan/dvb-t/se-Molndal_Vasterberget /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Molndal_Vasterberget
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Molndal_Vasterberget /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Molndal_Vasterberget
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Molndal_Vasterberget 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Molndal_Vasterberget 2005-04-06 20:57:02.519000120 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1005,9 +1868,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Molndal_Vasterberget /tmp/
+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-1.1.0/util/scan/dvb-t/se-Mora /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Mora
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Mora /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Mora
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Mora 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Mora 2005-04-06 20:57:02.519000120 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1015,9 +1878,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Mora /tmp/dpep.sjvdCW/linu
+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-1.1.0/util/scan/dvb-t/se-Motala /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Motala
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Motala /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Motala
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Motala 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Motala 2005-04-06 20:57:02.519000120 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1025,9 +1888,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Motala /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/se-Nassjo /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Nassjo
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Nassjo /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Nassjo
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Nassjo 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Nassjo 2005-04-06 20:57:02.519000120 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1035,9 +1898,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Nassjo /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/se-Norrkoping /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrkoping
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrkoping /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrkoping
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrkoping 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrkoping 2005-04-06 20:57:02.519000120 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1046,9 +1909,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrkoping /tmp/dpep.sjvdC
+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-1.1.0/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen 2005-04-06 20:57:02.519000120 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1056,9 +1919,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Norrtalje_Sodra_Bergen /tm
+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-1.1.0/util/scan/dvb-t/se-Orebro /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Orebro
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Orebro /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Orebro
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Orebro 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Orebro 2005-04-06 20:57:02.519999968 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1067,9 +1930,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Orebro /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/se-Ornskoldsvik /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ornskoldsvik
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ornskoldsvik /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ornskoldsvik
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ornskoldsvik 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ornskoldsvik 2005-04-06 20:57:02.519999968 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1077,9 +1940,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ornskoldsvik /tmp/dpep.sjv
+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-1.1.0/util/scan/dvb-t/se-Ostersund /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ostersund
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ostersund /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ostersund
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ostersund 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ostersund 2005-04-06 20:57:02.519999968 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1087,9 +1950,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ostersund /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Osthammar /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Osthammar
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Osthammar /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Osthammar
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Osthammar 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Osthammar 2005-04-06 20:57:02.519999968 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1097,9 +1960,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Osthammar /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Skelleftea /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skelleftea
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skelleftea /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skelleftea
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skelleftea 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skelleftea 2005-04-06 20:57:02.519999968 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1107,9 +1970,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skelleftea /tmp/dpep.sjvdC
+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-1.1.0/util/scan/dvb-t/se-Skovde /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skovde
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skovde /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skovde
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skovde 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skovde 2005-04-06 20:57:02.519999968 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1118,9 +1981,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Skovde /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg 2005-04-06 20:57:02.520999816 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1129,9 +1992,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sodertalje_Ragnhildsborg /
+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-1.1.0/util/scan/dvb-t/se-Stockholm_Marieberg /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Marieberg
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Marieberg /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Marieberg
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Marieberg 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Marieberg 2005-04-06 20:57:02.520999816 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1140,9 +2003,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Marieberg /tmp/d
+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-1.1.0/util/scan/dvb-t/se-Stockholm_Nacka /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Nacka
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Nacka /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Nacka
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Nacka 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Nacka 2005-04-06 20:57:02.520999816 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1151,9 +2014,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Stockholm_Nacka /tmp/dpep.
+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-1.1.0/util/scan/dvb-t/se-Sundsvall /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sundsvall
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sundsvall /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sundsvall
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sundsvall 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sundsvall 2005-04-06 20:57:02.520999816 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1162,9 +2025,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Sundsvall /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Trollhattan /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Trollhattan
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Trollhattan /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Trollhattan
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Trollhattan 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Trollhattan 2005-04-06 20:57:02.520999816 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1172,9 +2035,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Trollhattan /tmp/dpep.sjvd
+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-1.1.0/util/scan/dvb-t/se-Uddevalla /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uddevalla
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uddevalla /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uddevalla
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uddevalla 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uddevalla 2005-04-06 20:57:02.521999664 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1182,9 +2045,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uddevalla /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Uppsala /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uppsala
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uppsala /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uppsala
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uppsala 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uppsala 2005-04-06 20:57:02.521999664 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1193,9 +2056,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Uppsala /tmp/dpep.sjvdCW/l
+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-1.1.0/util/scan/dvb-t/se-Vannas /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vannas
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vannas /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vannas
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vannas 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vannas 2005-04-06 20:57:02.521999664 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1203,9 +2066,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vannas /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/se-Varberg /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Varberg
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Varberg /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Varberg
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Varberg 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Varberg 2005-04-06 20:57:02.521999664 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1213,9 +2076,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Varberg /tmp/dpep.sjvdCW/l
+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-1.1.0/util/scan/dvb-t/se-Vasteras /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vasteras
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vasteras /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vasteras
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vasteras 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vasteras 2005-04-06 20:57:02.521999664 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1224,9 +2087,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vasteras /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/se-Vastervik /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vastervik
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vastervik /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vastervik
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vastervik 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vastervik 2005-04-06 20:57:02.521999664 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1234,9 +2097,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vastervik /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/se-Visby /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Visby
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Visby /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Visby
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Visby 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Visby 2005-04-06 20:57:02.522999512 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1244,9 +2107,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Visby /tmp/dpep.sjvdCW/lin
+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-1.1.0/util/scan/dvb-t/se-Vislanda /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vislanda
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vislanda /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vislanda
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vislanda 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vislanda 2005-04-06 20:57:02.522999512 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1254,9 +2117,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Vislanda /tmp/dpep.sjvdCW/
+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-1.1.0/util/scan/dvb-t/se-Ystad /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ystad
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ystad /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ystad
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ystad 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ystad 2005-04-06 20:57:02.522999512 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1265,9 +2128,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/se-Ystad /tmp/dpep.sjvdCW/lin
+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-1.1.0/util/scan/dvb-t/tw-Taipei /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/tw-Taipei
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/tw-Taipei /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/tw-Taipei
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/tw-Taipei 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/tw-Taipei 2005-04-06 20:57:02.522999512 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1276,9 +2139,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/tw-Taipei /tmp/dpep.sjvdCW/li
+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-1.1.0/util/scan/dvb-t/uk-Angus /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Angus
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Angus /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Angus
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Angus 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Angus 2005-02-21 13:35:57.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Angus 2005-02-21 13:35:57.000000000 +0100
@@ -0,0 +1,9 @@
+# UK Angus (Dundee) Transmitter
+# Note that this transmitter broadcasts incorrect network information (thinks it is Durris)
@@ -1289,37 +2152,173 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Angus /tmp/dpep.sjvdCW/lin
+T 825833000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
+T 834167000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
+T 850000000 8MHz 3/4 1/2 QAM16 2k 1/32 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Bilsdale /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Bilsdale
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Bilsdale /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Bilsdale
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Bilsdale 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Bilsdale 2005-02-21 08:14:23.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Bilsdale 2005-02-21 08:14:23.000000000 +0100
@@ -0,0 +1,3 @@
+# UK Bilsdale Transmitter
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 474000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-EmleyMoor /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-EmleyMoor
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-BluebellHill /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-BluebellHill
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-BluebellHill 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-BluebellHill 2005-04-23 23:45:57.000000000 +0200
+@@ -0,0 +1,16 @@
++# Bluebell Hill (SE), Kent
++# http://www.dtg.org.uk/retailer/tx_lse.html
++# http://www.dtg.org.uk/retailer/dtt_channels.html
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# Multiplex 1 BBC
++T 778000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex 2 ITV/C4
++T 498000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Multiplex A SDN
++T 522000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Multiplex B BBC
++T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex C Crown Castle
++T 642000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex D Crown Castle
++T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Caradon /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Caradon
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Caradon 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Caradon 2005-08-18 09:55:44.000000000 +0200
+@@ -0,0 +1,5 @@
++# uk-Caradon
++# Multiplex 1 BBC1
++
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 474000000 8MHz 1/2 NONE QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-CaradonHill /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-CaradonHill
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-CaradonHill 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-CaradonHill 2005-06-09 22:03:56.000000000 +0200
+@@ -0,0 +1,5 @@
++# Caradon Hill, Cornwall
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++
++# Mux 1: BBC
++T 578000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Craigkelly /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Craigkelly
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Craigkelly 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Craigkelly 2005-08-17 01:23:36.000000000 +0200
+@@ -0,0 +1,9 @@
++# uk Craigkelly
++# gneeki at gmail.com
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 490000000 8MHz 2/3 NONE QAM64 2k 1/4 NONE
++T 514000000 8MHz 2/3 NONE QAM16 2k 1/4 NONE
++T 538000000 8MHz 2/3 NONE QAM64 2k 1/4 NONE
++T 570000000 8MHz 2/3 NONE QAM16 2k 1/4 NONE
++T 618000000 8MHz 2/3 NONE QAM16 2k 1/4 NONE
++T 642000000 8MHz 2/3 NONE QAM16 2k 1/4 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Dover /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Dover
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Dover 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Dover 2005-04-23 23:45:57.000000000 +0200
+@@ -0,0 +1,16 @@
++# Dover (SE), Kent
++# http://www.dtg.org.uk/retailer/tx_lse.html
++# http://www.dtg.org.uk/retailer/dtt_channels.html
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# Multiplex 1 BBC
++T 850000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex 2 ITV/C4
++T 794000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Multiplex A SDN
++T 746000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# Multiplex B BBC
++T 770000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex C Crown Castle
++T 762000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex D Crown Castle
++T 786000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-DoverB /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-DoverB
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-DoverB 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-DoverB 2005-04-23 23:45:57.000000000 +0200
+@@ -0,0 +1,8 @@
++# Dover B (SE), Kent
++# http://www.dtg.org.uk/retailer/tx_lse.html
++# http://www.dtg.org.uk/retailer/dtt_channels.html
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# Multiplex 1 BBC
++T 666000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# Multiplex 2 ITV/C4
++T 642000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Durris /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Durris
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Durris 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Durris 2005-08-17 23:40:03.000000000 +0200
+@@ -0,0 +1,15 @@
++# UK Durris (Aberdeen) Transmitter (used the Angus config file as a template)
++#
++# For more information about UK tuning feequencies see:
++# http://www.ofcom.org.uk/static/reception_advice/index.asp.html
++# and
++# http://www.digitalspy.co.uk/terrestrial/tuning/
++#
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++
++T 546000000 8MHz 3/4 1/2 QAM16 2k 1/32 NONE
++T 578000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
++T 634000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
++T 658000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
++T 713833000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
++T 722167000 8MHz 3/4 1/2 QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-EmleyMoor /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-EmleyMoor
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-EmleyMoor 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-EmleyMoor 2005-04-06 20:57:02.522999512 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/uk-Heathfield /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Heathfield
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Heathfield /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Heathfield
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Heathfield 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Heathfield 2005-04-06 20:57:02.523999360 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/uk-Mendip /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Mendip
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Llanddona /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Llanddona
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Llanddona 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Llanddona 2005-10-24 00:39:37.000000000 +0200
+@@ -0,0 +1,12 @@
++# Location: Llanddona
++# Power: 100kW
++# Grid Ref: SH583810
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++#chan 54
++T 738166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++#chan 58
++T 770000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++#chan 61
++T 794000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++#chan 64
++T 818000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Mendip /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Mendip
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Mendip 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Mendip 2005-04-06 20:57:02.523999360 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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-1.1.0/util/scan/dvb-t/uk-SuttonColdfield /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SuttonColdfield
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SudburyB /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SudburyB
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SudburyB 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SudburyB 2005-05-03 22:36:36.000000000 +0200
+@@ -0,0 +1,14 @@
++# SudburyB, East Anglia
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# D1 - BBC Multiplex
++T 698166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# D2 - ITV Multiplex
++T 754000000 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# DA - Chan 5 Multiplex
++T 690166670 8MHz 2/3 NONE QAM64 2k 1/32 NONE
++# DB - Interactive Multiplex
++T 618000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# DC - Sky Multiplex
++T 738000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# DD - Radio / Audio Multiplex
++T 706166670 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SuttonColdfield /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SuttonColdfield
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SuttonColdfield 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SuttonColdfield 2005-04-06 20:57:02.523999360 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1337,9 +2336,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-SuttonColdfield /tmp/dpep.
+T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
+
+
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekin /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekin
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekin /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekin
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekin 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekin 2005-04-06 20:57:02.523999360 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1355,9 +2354,9 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekin /tmp/dpep.sjvdCW
+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-1.1.0/util/scan/dvb-t/uk-TheWrekinB /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekinB
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekinB /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekinB
--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekinB 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.sjvdCW/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekinB 2005-04-06 20:57:02.523999360 +0200
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/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
@@ -1370,3 +2369,33 @@ diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-TheWrekinB /tmp/dpep.sjvdC
+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
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Waltham /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Waltham
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Waltham 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-Waltham 2005-08-18 21:27:07.000000000 +0200
+@@ -0,0 +1,8 @@
++# Waltham (Melton Mowbray, Leicestershire)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++T 490000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
++T 514000000 8MHz 2/3 1/2 QAM64 2k 1/32 NONE
++T 570000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
++T 642000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
++T 666000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
++T 698000000 8MHz 3/4 3/4 QAM16 2k 1/32 NONE
+diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-WhitehawkHill /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-WhitehawkHill
+--- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-WhitehawkHill 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.gDm0C5/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/uk-WhitehawkHill 2005-11-19 00:36:58.000000000 +0100
+@@ -0,0 +1,14 @@
++# Whitehawk Hill, East Sussex (Brighton)
++# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
++# multiplex 1 BBC
++T 834000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# multiplex 2 Digital 3&4
++T 706000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# multiplex A SDN
++T 746000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# multiplex B BBC
++T 690000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# multiplex C Crown Castle
++T 770000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
++# multiplex D Crown Castle
++T 794000000 8MHz 3/4 NONE QAM16 2k 1/32 NONE
diff --git a/debian/patches/05_scanfile_de-Hamburg.dpatch b/debian/patches/05_scanfile_de-Hamburg.dpatch
deleted file mode 100644
index 8877a87..0000000
--- a/debian/patches/05_scanfile_de-Hamburg.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_scanfile_de-Hamburg.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: new de-Hamburg scanfile from Stephan Poehlsen
-
- at DPATCH@
-diff -urNad linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg /tmp/dpep.DJAhLB/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg
---- linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg 2005-04-06 21:04:54.868192128 +0200
-+++ /tmp/dpep.DJAhLB/linuxtv-dvb-apps-1.1.0/util/scan/dvb-t/de-Hamburg 2005-04-06 21:05:22.741655392 +0200
-@@ -1,8 +1,15 @@
--# 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
-+# DVB-T Hamburg
-+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
-+T 205500000 7MHz 3/4 NONE QAM16 8k 1/8 NONE
-+T 490000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH23: ZDF, Info/3sat, Doku/KiKa
-+T 498000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-+T 530000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-+T 546000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH30: Sat.1, N24, ProSieben, KABEL1
-+T 570000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH33: Das Erste Hamburg, Eins Extra, arte, Phoenix
-+T 602000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-+T 626000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH40: RTL Television, RTL2, Super RTL, VOX
-+T 730000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-+T 754000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE # CH56: NDR, MDR, WDR, hr
-+T 786000000 8MHz 2/3 NONE QAM16 8k 1/4 NONE
-+
-+
diff --git a/debian/patches/06_freeview_channel_numbers.dpatch b/debian/patches/06_freeview_channel_numbers.dpatch
new file mode 100644
index 0000000..7991e18
--- /dev/null
+++ b/debian/patches/06_freeview_channel_numbers.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_vdr.dpatch by <ds at flibble.youmustbejoking.demon.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/scan.c linuxtv-dvb-apps-1.1.0/util/scan/scan.c
+--- linuxtv-dvb-apps-1.1.0~/util/scan/scan.c 2004-04-22 12:09:09.000000000 +0100
++++ linuxtv-dvb-apps-1.1.0/util/scan/scan.c 2005-10-22 16:51:01.161112392 +0100
+@@ -323,7 +323,7 @@
+ buf += 2;
+ for (i = 0; i < n; i++) {
+ service_id = (buf[0]<<8)|(buf[1]&0xff);
+- channel_num = (buf[2]&0x03<<8)|(buf[3]&0xff);
++ channel_num = (buf[2]&0x03)<<8|(buf[3]&0xff);
+ debug("Service ID 0x%x has channel number %d ", service_id, channel_num);
+ list_for_each(p1, &scanned_transponders) {
+ t = list_entry(p1, struct transponder, list);
diff --git a/debian/patches/07_vdr_output.dpatch b/debian/patches/07_vdr_output.dpatch
new file mode 100644
index 0000000..b8ad800
--- /dev/null
+++ b/debian/patches/07_vdr_output.dpatch
@@ -0,0 +1,140 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_vdr_output.dpatch by Darren Salt <linux at youmustbejoking.demon.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a few problems in the VDR output.
+## DP: * Provider names formatting was wrong
+## DP: * Output audio language information
+## DP: * Ensure that the services' TS IDs are always correctly set
+
+ at DPATCH@
+diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/dump-vdr.c linuxtv-dvb-apps-1.1.0/util/scan/dump-vdr.c
+--- linuxtv-dvb-apps-1.1.0~/util/scan/dump-vdr.c 2005-10-22 19:51:02.000000000 +0100
++++ linuxtv-dvb-apps-1.1.0/util/scan/dump-vdr.c 2005-10-22 19:51:03.058914014 +0100
+@@ -115,9 +115,11 @@
+ int video_pid,
+ int pcr_pid,
+ uint16_t *audio_pid,
++ char audio_lang[][4],
+ int audio_num,
+ int teletext_pid,
+ int scrambled,
++ int subtitling_pid,
+ int ac3_pid,
+ int service_id,
+ int network_id,
+@@ -133,26 +135,42 @@
+ int i;
+
+ if ((video_pid || audio_pid[0]) && ((ca_select > 0) || ((ca_select == 0) && (scrambled == 0)))) {
++ if (vdr_version <= 2) {
++ audio_lang = NULL;
++ network_id = 0;
++ transport_stream_id = 0;
++ }
+ if ((dump_channum == 1) && (channel_num > 0))
+ fprintf(f, ":@%i\n", channel_num);
+- if (dump_provider == 1)
+- fprintf (f, "%s - ", provider_name);
+- fprintf (f, "%s:", service_name);
++ if (vdr_version >= 3)
++ fprintf (f, "%s;%s:", service_name, provider_name);
++ else
++ {
++ if (dump_provider == 1)
++ fprintf (f, "%s - ", provider_name);
++ fprintf (f, "%s:", service_name);
++ }
+ vdr_dump_dvb_parameters (f, type, p, polarity, orbital_pos, we_flag);
+ if ((pcr_pid != video_pid) && (video_pid > 0))
+ fprintf (f, "%i+%i:", video_pid, pcr_pid);
+ else
+ fprintf (f, "%i:", video_pid);
+ fprintf (f, "%i", audio_pid[0]);
++ if (audio_lang && audio_lang[0][0])
++ fprintf (f, "=%.4s", audio_lang[0]);
+ for (i = 1; i < audio_num; i++)
++ {
+ fprintf (f, ",%i", audio_pid[i]);
++ if (audio_lang && audio_lang[i][0])
++ fprintf (f, "=%.4s", audio_lang[i]);
++ }
+ if (ac3_pid)
++ {
+ fprintf (f, ";%i", ac3_pid);
++ if (audio_lang && audio_lang[0][0])
++ fprintf (f, "=%.4s", audio_lang[0]);
++ }
+ if (scrambled == 1) scrambled = ca_select;
+- if (vdr_version == 2) {
+- network_id = 0;
+- transport_stream_id = 0;
+- }
+ fprintf (f, ":%d:%d:%d:%d:%d:0", teletext_pid, scrambled,
+ service_id, network_id, transport_stream_id);
+ fprintf (f, "\n");
+diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/dump-vdr.h linuxtv-dvb-apps-1.1.0/util/scan/dump-vdr.h
+--- linuxtv-dvb-apps-1.1.0~/util/scan/dump-vdr.h 2005-10-22 19:51:02.000000000 +0100
++++ linuxtv-dvb-apps-1.1.0/util/scan/dump-vdr.h 2005-10-22 19:51:03.058914014 +0100
+@@ -19,9 +19,11 @@
+ int video_pid,
+ int pcr_pid,
+ uint16_t *audio_pid,
++ char audio_lang[][4],
+ int audio_num,
+ int teletext_pid,
+ int scrambled,
++ int subtitling_pid,
+ int ac3_pid,
+ int service_id,
+ int network_id,
+diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/scan.c linuxtv-dvb-apps-1.1.0/util/scan/scan.c
+--- linuxtv-dvb-apps-1.1.0~/util/scan/scan.c 2005-10-22 19:51:02.000000000 +0100
++++ linuxtv-dvb-apps-1.1.0/util/scan/scan.c 2005-10-22 19:53:29.088734079 +0100
+@@ -237,11 +237,13 @@
+ * (the DVB standards say theay should be unique within one
+ * network, but in real life...)
+ */
+-static struct service *alloc_service(struct transponder *tp, int service_id)
++static struct service *alloc_service(struct transponder *tp, int service_id,
++ int transport_stream_id)
+ {
+ struct service *s = calloc(1, sizeof(*s));
+ INIT_LIST_HEAD(&s->list);
+ s->service_id = service_id;
++ s->transport_stream_id = transport_stream_id;
+ list_add_tail(&s->list, &tp->services);
+ return s;
+ }
+@@ -684,7 +686,7 @@
+ /* SDT might have been parsed first... */
+ s = find_service(current_tp, service_id);
+ if (!s)
+- s = alloc_service(current_tp, service_id);
++ s = alloc_service(current_tp, service_id, transport_stream_id);
+ s->pmt_pid = ((buf[2] & 0x1f) << 8) | buf[3];
+ if (!s->priv && s->pmt_pid) {
+ s->priv = malloc(sizeof(struct section_buf));
+@@ -872,7 +874,7 @@
+ s = find_service(current_tp, service_id);
+ if (!s)
+ /* maybe PAT has not yet been parsed... */
+- s = alloc_service(current_tp, service_id);
++ s = alloc_service(current_tp, service_id, transport_stream_id);
+
+ s->running = (buf[3] >> 5) & 0x7;
+ s->scrambled = (buf[3] >> 4) & 1;
+@@ -1677,11 +1679,11 @@
+ s->video_pid,
+ s->pcr_pid,
+ s->audio_pid,
+- //FIXME: s->audio_lang
++ s->audio_lang,
+ s->audio_num,
+ s->teletext_pid,
+ s->scrambled,
+- //FIXME: s->subtitling_pid
++ s->subtitling_pid,
+ s->ac3_pid,
+ s->service_id,
+ t->network_id,
diff --git a/debian/patches/08_debug_minor_fixes.dpatch b/debian/patches/08_debug_minor_fixes.dpatch
new file mode 100644
index 0000000..a85ef13
--- /dev/null
+++ b/debian/patches/08_debug_minor_fixes.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_debug_minor_fixes.dpatch by Darren Salt <linux at youmustbejoking.demon.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Debug output included "0x0x" in a few places.
+
+ at DPATCH@
+diff -urNad linuxtv-dvb-apps-1.1.0~/util/scan/scan.c linuxtv-dvb-apps-1.1.0/util/scan/scan.c
+--- linuxtv-dvb-apps-1.1.0~/util/scan/scan.c 2004-04-22 12:09:09.000000000 +0100
++++ linuxtv-dvb-apps-1.1.0/util/scan/scan.c 2005-10-22 18:32:32.427298462 +0100
+@@ -381,7 +383,7 @@
+ t->param.inversion = spectral_inversion;
+
+ if (verbosity >= 5) {
+- debug("0x%#04x/0x%#04x ", t->network_id, t->transport_stream_id);
++ debug("%#04x/%#04x ", t->network_id, t->transport_stream_id);
+ dump_dvb_parameters (stderr, t);
+ if (t->scan_done)
+ dprintf(5, " (done)");
+@@ -413,7 +415,7 @@
+ t->we_flag = buf[8] >> 7;
+
+ if (verbosity >= 5) {
+- debug("0x%#04x/0x%#04x ", t->network_id, t->transport_stream_id);
++ debug("%#04x/%#04x ", t->network_id, t->transport_stream_id);
+ dump_dvb_parameters (stderr, t);
+ if (t->scan_done)
+ dprintf(5, " (done)");
+@@ -467,7 +469,7 @@
+ t->other_frequency_flag = (buf[8] & 0x01);
+
+ if (verbosity >= 5) {
+- debug("0x%#04x/0x%#04x ", t->network_id, t->transport_stream_id);
++ debug("%#04x/%#04x ", t->network_id, t->transport_stream_id);
+ dump_dvb_parameters (stderr, t);
+ if (t->scan_done)
+ dprintf(5, " (done)");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/linuxtv-dvb-apps.git
More information about the pkg-vdr-dvb-changes
mailing list