Merge tag 'upstream/0+git20160503.4f192bd'

Upstream version 0+git20160503.4f192bd

4 files changed, 31 insertions, 83 deletions

diff --git a/dvb-t/ca-AB-Calgary b/dvb-t/ca-AB-Calgary
deleted file mode 100644
index 4602c2a..0000000
--- a/dvb-t/ca-AB-Calgary
+++ /dev/null
@@ -1,48 +0,0 @@
-#------------------------------------------------------------------------------
-# file automatically generated by w_scan
-# (http://wirbel.htpc-forum.de/w_scan/index2.html)
-#! <w_scan> 20110502 1 0 ATSC CA </w_scan>
-#------------------------------------------------------------------------------
-# location and provider: Calgary AB, Canada OTA
-# date (yyyy-mm-dd)    : 2014-01-18
-
-# provided by (opt)    : shadowofdarkness@gmail.com
-#
-# A[2] <freq> <mod> [# comment]
-#------------------------------------------------------------------------------
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 515000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 563000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 581000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 617000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 635000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = ATSC
-	FREQUENCY = 683000000
-	MODULATION = VSB/8
-	INVERSION = AUTO
-
diff --git a/dvb-t/pl-Szczecin b/dvb-t/pl-Szczecin
index 6fff9bb..86db69f 100644
--- a/dvb-t/pl-Szczecin
+++ b/dvb-t/pl-Szczecin
@@ -10,37 +10,37 @@
 #------------------------------------------------------------------------------
 
 [Zachodniopomorskie, Ch.41, Mux1 Szczecin/Kolowo 100kW]
-<------>DELIVERY_SYSTEM = DVBT
-<------>FREQUENCY = 634000000
-<------>BANDWIDTH_HZ = 8000000
-<------>CODE_RATE_HP = 3/4
-<------>CODE_RATE_LP = NONE
-<------>MODULATION = QAM/64
-<------>TRANSMISSION_MODE = 8K
-<------>GUARD_INTERVAL = 1/8
-<------>HIERARCHY = NONE
-<------>INVERSION = AUTO
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 634000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
 
 [Zachodniopomorskie, Ch.34, Mux2 Szczecin/Kolowo 100kW]
-<------>DELIVERY_SYSTEM = DVBT
-<------>FREQUENCY = 578000000
-<------>BANDWIDTH_HZ = 8000000
-<------>CODE_RATE_HP = 3/4
-<------>CODE_RATE_LP = NONE
-<------>MODULATION = QAM/64
-<------>TRANSMISSION_MODE = 8K
-<------>GUARD_INTERVAL = 1/8
-<------>HIERARCHY = NONE
-<------>INVERSION = AUTO
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 578000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
 
 [Zachodniopomorskie, Ch.48, Mux3 Szczecin/Kolowo 100kW]
-<------>DELIVERY_SYSTEM = DVBT
-<------>FREQUENCY = 690000000
-<------>BANDWIDTH_HZ = 8000000
-<------>CODE_RATE_HP = 3/4
-<------>CODE_RATE_LP = NONE
-<------>MODULATION = QAM/64
-<------>TRANSMISSION_MODE = 8K
-<------>GUARD_INTERVAL = 1/8
-<------>HIERARCHY = NONE
-<------>INVERSION = AUTO
+	DELIVERY_SYSTEM = DVBT
+	FREQUENCY = 690000000
+	BANDWIDTH_HZ = 8000000
+	CODE_RATE_HP = 3/4
+	CODE_RATE_LP = NONE
+	MODULATION = QAM/64
+	TRANSMISSION_MODE = 8K
+	GUARD_INTERVAL = 1/8
+	HIERARCHY = NONE
+	INVERSION = AUTO
diff --git a/dvb-t/se-Borgholm_Ramsattra b/dvb-t/se-Borgholm_Ramsattra
index 6cd9efb..04df002 100644
--- a/dvb-t/se-Borgholm_Ramsattra
+++ b/dvb-t/se-Borgholm_Ramsattra
@@ -1,8 +1,4 @@
 # Sweden - Borgholm/Ramsättra
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBT
-	FREQUENCY =
-	BANDWIDTH_HZ = 7000000
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBT
diff --git a/dvb-t/se-Lonneberga b/dvb-t/se-Lonneberga
index 492c6c1..29a8e8f 100644
--- a/dvb-t/se-Lonneberga
+++ b/dvb-t/se-Lonneberga
@@ -1,5 +1,5 @@
 # Sweden - Lönneberga
-CHANNEL]
+[CHANNEL]
 	DELIVERY_SYSTEM = DVBT
 	FREQUENCY = 514000000
 	BANDWIDTH_HZ = 8000000