added /etc/skel/.channels from package grml-etc-core

diff --git a/debian/changelog b/debian/changelog
index c4daf3d..725ed74 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc (0.9-10) unstable; urgency=low
+
+  * Added /etc/skel/.channels, moved from package grml-etc-core.
+    - fix usage example in channels.conf-files
+
+ -- Michael Prokop <mika@grml.org>  Thu,  1 Mar 2007 15:01:23 +0100
+
 grml-etc (0.9-9) unstable; urgency=low
 
   * /etc/skel/.idesktop/irssi.lnk: run with LANG=en_US.iso885915

diff --git a/debian/control b/debian/control
index 54811fa..554c620 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Replaces: automount-knoppix
 Suggests: grml-shlib, grml-files, grml-docs, grml-sectools, grml-templates, grml-x, policyrcd-script-zg2
 Recommends: dillo, eterm, python, vim (>= 7.0)
 Depends: grml-autoconfig, grml-scripts (>= 0.9), grml-etc-core (>= 0.2)
-Conflicts: smbconf-pfeifle
+Conflicts: smbconf-pfeifle, grml-etc-core (<= 0.2.25)
 Description: ecetera files for the grml system
  This package includes some /etc files for the
  grml system.

diff --git a/etc/skel/.channels/at-austria b/etc/skel/.channels/at-austria
new file mode 100644 (file)
index 0000000..b58694a
--- /dev/null
+++ b/etc/skel/.channels/at-austria
@@ -0,0 +1,10 @@
+## Information for DVB-T in Austria, for use with scan of dvb-utils
+## See also http://www.vdr-wiki.de/wiki/index.php/DVB-T_channels.conf
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 754000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #K56, Eisenstadt (Burgenland)
+T 794000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #K61, Wien
+T 802000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #K62, Graz (Steiermark)
+T 818000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #K64, Linz (Oeber-Oe), Innsbruck (Tirol)
+T 826000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #K65, Salzburg, Bregenz (Vorarlberg)
+T 850000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #K68, St. Poelzen (Nieder-Oe)
+T 858000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #K69, Klagenfurt (Kaerten), Graz (Steiermark)

diff --git a/etc/skel/.channels/at-graz b/etc/skel/.channels/at-graz
new file mode 100644 (file)
index 0000000..8df437a
--- /dev/null
+++ b/etc/skel/.channels/at-graz
@@ -0,0 +1,11 @@
+# DVB-T Graz
+# ==========
+# * Schöckl
+# * Griesplatz - Telekom Austria
+#
+# http://www.the-media-channel.com/dvb-t/oesterreich/dvb-t-oesterreich-index.html
+#
+# Configuration successfully tested on Sam Feb 24 11:57:01 CET 2007 by mika
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 802000000 8MHz 3/4 NONE QAM16 8k 1/4 NONE #K62, Graz (Steiermark)

diff --git a/etc/skel/.channels/at-klagenfurt b/etc/skel/.channels/at-klagenfurt
new file mode 100644 (file)
index 0000000..0da2bf5
--- /dev/null
+++ b/etc/skel/.channels/at-klagenfurt
@@ -0,0 +1,11 @@
+# DVB-T Klagenfurt
+# ================
+# * Klagenfurt (Dobratsch - Villacher Alpe)
+# * Viktring (Stifterkogel)
+#
+# http://www.the-media-channel.com/dvb-t/oesterreich/dvb-t-oesterreich-index.html
+#
+# Configuration successfully tested on Sam Feb 14 14:23:02 CET 2007 by mika
+#
+# T freq bw fec_hi fec_lo mod transmission-mode guard-interval hierarchy
+T 858000000 8MHz 2/3 NONE QAM16 8k 1/8 NONE

diff --git a/etc/skel/.channels/channels.conf-AT-graz b/etc/skel/.channels/channels.conf-AT-graz
new file mode 100644 (file)
index 0000000..649c17a
--- /dev/null
+++ b/etc/skel/.channels/channels.conf-AT-graz
@@ -0,0 +1,14 @@
+# Filename:      channels.conf-AT-graz
+# Purpose:       channel configuration file for DVB-T in Graz/Austria.
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2.
+# Latest change: Sam Feb 24 12:00:47 CET 2007 [mika]
+################################################################################
+# Usage example: 'ln -s ~/.channels/channels.conf-AT-graz ~/.mplayer/channels.conf'
+################################################################################
+ORF1:802000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_3_4:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5010:5011:10101
+ORF2 St:802000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_3_4:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5020:5021:10112
+ATV+:802000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_3_4:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5040:5041:10120
+ORF2 B:802000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_3_4:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:5020:5021:10132
+## END OF FILE #################################################################

diff --git a/etc/skel/.channels/channels.conf-AT-klagenfurt b/etc/skel/.channels/channels.conf-AT-klagenfurt
new file mode 100644 (file)
index 0000000..9359606
--- /dev/null
+++ b/etc/skel/.channels/channels.conf-AT-klagenfurt
@@ -0,0 +1,14 @@
+# Filename:      channels.conf-AT-klagenfurt
+# Purpose:       channel configuration file for DVB-T in Klagenfurt/Austria.
+# Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2.
+# Latest change: Sam Feb 24 12:01:39 CET 2007 [mika]
+################################################################################
+# Usage example: 'ln -s ~/.channels/channels.conf-AT-klagenfurt ~/.mplayer/channels.conf'
+################################################################################
+ORF1:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_3_4:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:6010:6011:10101
+ORF2-K:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_3_4:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:6020:6021:10116
+ATV:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_3_4:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:6040:6041:10120
+ORF2-T:858000000:INVERSION_AUTO:BANDWIDTH_8_MHZ:FEC_3_4:FEC_3_4:QAM_16:TRANSMISSION_MODE_8K:GUARD_INTERVAL_1_4:HIERARCHY_NONE:6020:6021:10136
+## END OF FILE #################################################################