Merge tag 'upstream/0+git20141009.d26b627'

Upstream version 0+git20141009.d26b627

1 files changed, 152 insertions, 19 deletions

diff --git a/dvb-s/Telstar10_C-76.5E b/dvb-s/Telstar10_C-76.5E
index 36b0431..3ea634b 100644
--- a/dvb-s/Telstar10_C-76.5E
+++ b/dvb-s/Telstar10_C-76.5E
@@ -6,58 +6,191 @@
 # freq pol sr fec
 
 # Racing International
-S 3646000 H 5064000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3646000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 5064000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Image Channel
-S 3655000 H 3214000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3655000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3214000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Globe Cast Asia multiplex
-S 3680000 H 27500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3680000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # UBI World TV Multiplex
-S 3760000 H 28066000 2/3
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3760000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 28066000
+	INNER_FEC = 2/3
+	INVERSION = AUTO
+
 
 # UBI World TV Multiplex
-S 3780000 V 28066000 2/3
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3780000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 28066000
+	INNER_FEC = 2/3
+	INVERSION = AUTO
+
 
 # Ekushey TV
-S 3787000 H 4600000 2/3
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3787000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4600000
+	INNER_FEC = 2/3
+	INVERSION = AUTO
+
 
 # Diganta TV
-S 3793000 H 4340000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3793000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4340000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # RRSat Global Network Multiplex
-S 3840000 H 27500000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 3840000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 27500000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Channel 1
-S 4003000 H 4080000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4003000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4080000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Boishakhi TV
-S 4009000 H 4300000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4009000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4300000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # TV Maldives
-S 4030000 V 6312000 1/2
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4030000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 6312000
+	INNER_FEC = 1/2
+	INVERSION = AUTO
+
 
 # Channel I
-S 4034000 H 4300000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4034000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 4300000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Bangla Vision
-S 4049000 H 3600000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4049000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3600000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Kantipur TV
-S 4056000 H 3214000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4056000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3214000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # BBC World Service Multiplex
-S 4073000 H 13020000 1/2
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4073000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13020000
+	INNER_FEC = 1/2
+	INVERSION = AUTO
+
 
 # MNC Indonesia
-S 4105000 H 3125000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4105000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3125000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # NDTV Arabia
-S 4137000 H 2893000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4137000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 2893000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Islamic TV
-S 4146000 H 3600000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4146000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 3600000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
 
 # Bangladesh Multiplex
-S 4173000 H 7400000 3/4
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS
+	FREQUENCY = 4173000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 7400000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+