Merge tag 'upstream/0+git20150208.f2053b3'

Upstream version 0+git20150208.f2053b3

1 files changed, 115 insertions, 78 deletions

diff --git a/dvb-s/Sirius-5.0E b/dvb-s/Sirius-5.0E
index e5d47b7..9f93c38 100644
--- a/dvb-s/Sirius-5.0E
+++ b/dvb-s/Sirius-5.0E
@@ -1,34 +1,59 @@
 # Sirius 5.0E
-# freq pol sr fec
+# automatically generated from kingofsat.net ini file 0048.ini
+# http://en.kingofsat.net/satellites.php
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11215000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11265000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11265000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = 1/2
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11227000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11305000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11247000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11305000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 11420000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11345000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 23145000
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11345000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 11385000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
@@ -217,7 +242,7 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12169000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
@@ -225,18 +250,28 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12188000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
-	INNER_FEC = 7/8
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 10
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12188000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
+	INNER_FEC = 3/4
+	INVERSION = AUTO
+	STREAM_ID = 20
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12207000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
@@ -285,23 +320,33 @@
 	FREQUENCY = 12322000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
+	INNER_FEC = 7/8
+	INVERSION = AUTO
+
+[CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12341000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 30
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12341000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 27500000
+	SYMBOL_RATE = 30000000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
+	STREAM_ID = 40
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12360000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 7/8
+	INNER_FEC = 2/3
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -317,7 +362,7 @@
 	FREQUENCY = 12399000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
@@ -329,15 +374,15 @@
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12437000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 27500000
-	INNER_FEC = 2/3
+	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
+	DELIVERY_SYSTEM = DVBS2
 	FREQUENCY = 12456000
 	POLARIZATION = HORIZONTAL
 	SYMBOL_RATE = 27500000
@@ -353,6 +398,14 @@
 	INVERSION = AUTO
 
 [CHANNEL]
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12575000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 13922000
+	INNER_FEC = 1/2
+	INVERSION = AUTO
+
+[CHANNEL]
 	DELIVERY_SYSTEM = DVBS
 	FREQUENCY = 12608000
 	POLARIZATION = HORIZONTAL
@@ -370,113 +423,97 @@
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12668000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6666000
-	INNER_FEC = 1/2
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12672000
+	FREQUENCY = 12670000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3300000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 2600000
+	INNER_FEC = 2/3
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12674000
-	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 10000000
+	FREQUENCY = 12680000
+	POLARIZATION = HORIZONTAL
+	SYMBOL_RATE = 9404000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12678000
+	FREQUENCY = 12682000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 13333000
+	SYMBOL_RATE = 6888000
 	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12680000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12687000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 9404000
+	SYMBOL_RATE = 5600000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12685000
+	FREQUENCY = 12687000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 4444000
-	INNER_FEC = 3/4
-	INVERSION = AUTO
-
-[CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12690000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 6667000
+	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12693000
+	FREQUENCY = 12694000
 	POLARIZATION = VERTICAL
 	SYMBOL_RATE = 3333000
 	INNER_FEC = 5/6
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12701000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12702000
 	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 6111000
+	SYMBOL_RATE = 2100000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12715000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 3330000
+	FREQUENCY = 12703000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 2963000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12718000
+	FREQUENCY = 12719000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 23500000
+	SYMBOL_RATE = 2960000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12724000
-	POLARIZATION = HORIZONTAL
-	SYMBOL_RATE = 1772000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12722000
+	POLARIZATION = VERTICAL
+	SYMBOL_RATE = 1600000
 	INNER_FEC = 3/4
 	INVERSION = AUTO
 
 [CHANNEL]
-	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12728000
+	DELIVERY_SYSTEM = DVBS2
+	FREQUENCY = 12725000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 19720000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 1480000
+	INNER_FEC = 8/9
 	INVERSION = AUTO
 
 [CHANNEL]
 	DELIVERY_SYSTEM = DVBS
-	FREQUENCY = 12737000
+	FREQUENCY = 12728000
 	POLARIZATION = VERTICAL
-	SYMBOL_RATE = 6150000
-	INNER_FEC = 3/4
+	SYMBOL_RATE = 1600000
+	INNER_FEC = 2/3
 	INVERSION = AUTO