[vdr] 07/21: merged changes from debian branch to make then debian and e-tobi branches more equal
Tobias Grimm
tiber-guest at moszumanska.debian.org
Wed Mar 25 00:19:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
tiber-guest pushed a commit to branch e-tobi
in repository vdr.
commit 0a3c16c3db22cad5db3901ddf064ea0355b9c59a
Author: etobi <git at e-tobi.net>
Date: Sun Mar 22 13:31:24 2015 +0100
merged changes from debian branch to make then debian and e-tobi branches more equal
---
debian/TODO.Debian | 6 +-
debian/patches/04_newplugin.patch | 4 +-
debian/patches/06_default_svdrp_port_0.patch | 4 +-
debian/patches/12_osdbase-maxitems.patch | 4 +-
debian/patches/99_ncursesw-include.patch | 4 +-
debian/po/POTFILES.in | 1 +
debian/po/cs.po | 78 ++++++++++++++++++++++
debian/po/da.po | 71 ++++++++++++++++++++
debian/po/de.po | 82 +++++++++++++++++++++++
debian/po/es.po | 98 ++++++++++++++++++++++++++++
debian/po/fr.po | 82 +++++++++++++++++++++++
debian/po/gl.po | 71 ++++++++++++++++++++
debian/po/it.po | 71 ++++++++++++++++++++
debian/po/ja.po | 69 ++++++++++++++++++++
debian/po/nl.po | 77 ++++++++++++++++++++++
debian/po/pt.po | 72 ++++++++++++++++++++
debian/po/ru.po | 73 +++++++++++++++++++++
debian/po/sv.po | 77 ++++++++++++++++++++++
debian/po/templates.pot | 65 ++++++++++++++++++
debian/vdr.config | 18 +++++
debian/vdr.install | 2 -
debian/vdr.postinst | 79 +++++++---------------
debian/vdr.postrm | 3 -
debian/vdr.templates | 16 +++++
debian/vdraptrefresh | 14 ----
25 files changed, 1052 insertions(+), 89 deletions(-)
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index b35c86b..5d984ab 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,8 +1,4 @@
-TODO: Make runvdr more equal to official Debian version
TODO: When plugin could not be loaded, log stderr output somewhere
TODO: Get rid of bash in init script
TODO: The runvdr module (re)loading stuff is weird - it was introduced to workaround driver bugs and can probably be removed
-
-PLUGIN_DIR, PLUGIN_CFG_DIR, PLUGIN_PREFIX, CMDHOOKSDIR und REC_CMD rausschmeissen
-
-order.recmds/commands.conf rausschmeissen.
+TODO: Get rid of configuraable PLUGIN_DIR, PLUGIN_CFG_DIR, PLUGIN_PREFIX, CMDHOOKSDIR and REC_CMD
diff --git a/debian/patches/04_newplugin.patch b/debian/patches/04_newplugin.patch
index 76f0fc5..3754626 100644
--- a/debian/patches/04_newplugin.patch
+++ b/debian/patches/04_newplugin.patch
@@ -4,8 +4,8 @@ Author: Thomas Schmidt <tschmidt at debian.org>
Index: vdr/newplugin
===================================================================
---- vdr.orig/newplugin 2013-03-31 13:46:30.000000000 +0200
-+++ vdr/newplugin 2013-03-31 13:47:42.000000000 +0200
+--- vdr.orig/newplugin 2013-03-06 22:17:53.000000000 +0100
++++ vdr/newplugin 2013-03-10 18:36:53.000000000 +0100
@@ -24,7 +24,7 @@
$PLUGIN_DESCRIPTION = "Enter description for '$PLUGIN_NAME' plugin";
$PLUGIN_MAINENTRY = $PLUGIN_CLASS;
diff --git a/debian/patches/06_default_svdrp_port_0.patch b/debian/patches/06_default_svdrp_port_0.patch
index f313af5..6d48847 100644
--- a/debian/patches/06_default_svdrp_port_0.patch
+++ b/debian/patches/06_default_svdrp_port_0.patch
@@ -5,8 +5,8 @@ Author: Thomas Schmidt <tschmidt at debian.org>
Index: vdr/vdr.c
===================================================================
---- vdr.orig/vdr.c 2015-02-07 11:22:57.558226734 +0100
-+++ vdr/vdr.c 2015-02-07 11:22:57.554225440 +0100
+--- vdr.orig/vdr.c 2015-02-12 18:35:32.103236816 +0100
++++ vdr/vdr.c 2015-02-12 18:35:32.103236816 +0100
@@ -187,7 +187,7 @@
// Command line options:
diff --git a/debian/patches/12_osdbase-maxitems.patch b/debian/patches/12_osdbase-maxitems.patch
index 5737e38..8665773 100644
--- a/debian/patches/12_osdbase-maxitems.patch
+++ b/debian/patches/12_osdbase-maxitems.patch
@@ -4,8 +4,8 @@ Origin: http://vdrportal.de/board/thread.php?postid=343665#post343665
Index: vdr/osdbase.c
===================================================================
---- vdr.orig/osdbase.c 2015-02-07 11:23:03.947667560 +0100
-+++ vdr/osdbase.c 2015-02-07 11:23:03.947667560 +0100
+--- vdr.orig/osdbase.c 2015-02-12 18:35:37.923369859 +0100
++++ vdr/osdbase.c 2015-02-12 18:35:37.919369768 +0100
@@ -332,6 +332,7 @@
void cOsdMenu::CursorUp(void)
diff --git a/debian/patches/99_ncursesw-include.patch b/debian/patches/99_ncursesw-include.patch
index 59977d6..588b5db 100644
--- a/debian/patches/99_ncursesw-include.patch
+++ b/debian/patches/99_ncursesw-include.patch
@@ -3,8 +3,8 @@ Author: Tobias Grimm <tg at e-tobi.net>
Index: vdr/PLUGINS/src/skincurses/skincurses.c
===================================================================
---- vdr.orig/PLUGINS/src/skincurses/skincurses.c 2015-02-19 12:30:20.889081631 +0100
-+++ vdr/PLUGINS/src/skincurses/skincurses.c 2015-02-19 12:30:20.889081631 +0100
+--- vdr.orig/PLUGINS/src/skincurses/skincurses.c 2015-02-21 11:33:20.023435359 +0100
++++ vdr/PLUGINS/src/skincurses/skincurses.c 2015-02-21 11:33:20.023435359 +0100
@@ -6,7 +6,7 @@
* $Id: skincurses.c 3.3 2015/02/17 13:13:17 kls Exp $
*/
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 0000000..8bf7330
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
+[type: gettext/rfc822deb] vdr.templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 0000000..9f33c25
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,78 @@
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2004-05-15 11:10+0200\n"
+"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
+"Language-Team: Czech <provoz at debian.cz>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satelitn�"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Pozemn�"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Kabelov�"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "Typ DVB karty:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR mus� zn�t typ va�� DVB karty. Na z�klad� va�� odpov�di se do /var/lib/"
+"vdr nainstaluje soubor channels.conf. Tento soubor m��ete pozd�ji upravit "
+"dle sv�ch pot�eb."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "Vytvo�it /var/lib/video?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Implicitn� je VDR nastaveno pro ukl�d�n� nahr�vek do /var/lib/video. "
+"Tento adres�� se nyn� m��e vytvo�it automaticky. Jeho um�st�n� m��ete "
+"pozd�ji upravit zm�nou prom�nn� VIDEO_DIR v souboru /etc/default/vdr."
diff --git a/debian/po/da.po b/debian/po/da.po
new file mode 100644
index 0000000..888729d
--- /dev/null
+++ b/debian/po/da.po
@@ -0,0 +1,71 @@
+# Danish translation vdr.
+# Copyright (C) 2010 vdr & nedenstående oversættere.
+# This file is distributed under the same license as the vdr package.
+# Joe Hansen (joedalton2 at yahoo.dk), 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2010-08-08 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satellit"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Terrestrisk"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Kabel"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "DVB-korttype:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR skal kende din DVB-korttype for at fungere korrekt. Filen channels.conf "
+"vil med dine valg blive installeret i /var/lib/vdr. Du skal måske ændre denne "
+"fil afhængig af din opsætning."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "Opret /var/lib/video?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Som standard er VDR konfigureret til at bruge /var/lib/video til at gemme "
+"optagelser. Du kan enten oprette denne mappe nu, eller ændre denne opførsel "
+"senere ved at ændre variablen VIDEO_DIR i /etc/default/vdr."
+
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 0000000..98c28fd
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,82 @@
+# translation of de.po to German
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+# Developers do not need to manually edit POT or PO files.
+# Jens Nachtigall <nachtigall at web.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: de\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2004-09-27 16:00+0200\n"
+"Last-Translator: Jens Nachtigall <nachtigall at web.de>\n"
+"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satellit"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Terrestrisch"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Kabel"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "DVB-Karten-Typ:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR muss den Typ Ihrer DVB-Karte kennen, um korrekt zu funktionieren. Mit "
+"Hilfe ihrer Auswahl wird eine channels.conf-Datei in /var/lib/vdr "
+"installiert. Eventuell werden Sie diese Datei an Ihre Umgebung anpassen "
+"müssen. "
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "Soll /var/lib/video erstellt werden?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Standardmäßig ist VDR so konfiguriert, dass Aufnahmen in /var/lib/video "
+"gespeichert werden. Sie können dieses Verzeichnis entweder jetzt erstellen, "
+"oder diese Konfiguration später ändern, indem Sie die Variable VIDEO_DIR in /"
+"etc/default/vdr anpassen."
diff --git a/debian/po/es.po b/debian/po/es.po
new file mode 100644
index 0000000..0796f86
--- /dev/null
+++ b/debian/po/es.po
@@ -0,0 +1,98 @@
+# vdr po-debconf translation to Spanish.
+# Copyright (C) 2009 Software in the Public Interest.
+# This file is distributed under the same license as the vdrpackage.
+#
+# Changes:
+# - Initial translation
+# Fernando González de Requena <fgrequena at gmail.com>, 2009.
+#
+#
+# Traductores, si no conoce el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas y normas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Si tiene dudas o consultas sobre esta traducción consulte con el último
+# traductor (campo Last-Translator) y ponga en copia a la lista de
+# traducción de Debian al español (<debian-l10n-spanish at lists.debian.org>)
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.6.0-8\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2009-04-26 19:29+0200\n"
+"Last-Translator: Fernando González de Requena <fgrequena at gmail.com>\n"
+"Language-Team: Spanish <debian-l10n-spanish at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satélite"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Terrestre"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Cable"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "Tipo de tarjeta DVB:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR necesita saber el tipo de la tarjeta DVB para funcionar correctamente. "
+"Utilizando su selección, se instalará un archivo «channels.conf» en «/var/lib/"
+"vdr». Puede que necesite cambiar este archivo dependiendo de su "
+"configuración."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "¿Desea crear «/var/lib/video»?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"VDR se configura por omisión para utilizar «/var/lib/video» para almacenar "
+"las grabaciones. Puede crear ahora este directorio, o cambiar más tarde este "
+"comportamiento modificando la variable VIDEO_DIR en «/etc/default/vdr»."
diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 0000000..9b97333
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,82 @@
+# translation of fr.po to French
+#
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans#
+# Developers do not need to manually edit POT or PO files.
+# Emmanuel le Chevoir <mms at debian.org>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr_1.2.6-3\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2004-03-18 10:42+0100\n"
+"Last-Translator: Emmanuel le Chevoir <mms at debian.org>\n"
+"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3.1\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satellite"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Terrestre"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "C�ble"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "Type de carte DVB�:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR a besoin de conna�tre le type de votre carte DVB pour fonctionner "
+"correctement. Un fichier channels.conf correspondant au type que vous "
+"choisirez sera install� dans le r�pertoire /var/lib/vdr. En fonction de "
+"votre configuration, il est possible que vous ayez besoin de modifier ce "
+"fichier par la suite."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "Cr�er le r�pertoire /var/lib/video�?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Par d�faut, VDR sauvegarde les enregistrements dans le r�pertoire /var/lib/"
+"video. Vous pouvez changer ce r�pertoire en modifiant la variable "
+"VIDEO_DIR dans le fichier /etc/default/vdr, ou cr�er ce r�pertoire "
+"maintenant."
diff --git a/debian/po/gl.po b/debian/po/gl.po
new file mode 100644
index 0000000..f0384b4
--- /dev/null
+++ b/debian/po/gl.po
@@ -0,0 +1,71 @@
+# Galician translation of vdr's debconf templates
+# This file is distributed under the same license as the vdr package.
+# Jacobo Tarrio <jtarrio at debian.org>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2008-05-20 23:07+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
+"Language-Team: Galician <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satélite"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Terrestre"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Cable"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "Tipo de tarxeta de TV dixital:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR precisa de coñecer o tipo de tarxeta de TV dixital para funcionar "
+"correctamente. Segundo o que escolla, hase instalar un ficheiro channels."
+"conf en /var/lib/vdr. Pode ter que modificar este ficheiro dependendo da súa "
+"configuración."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "¿Crear /var/lib/video?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Por defecto, VDR está configurado para empregar /var/lib/video para "
+"armacenar as gravacións. Pode crear este directorio agora, ou cambiar este "
+"comportamento máis adiante modificando a variable VIDEO_DIR en /etc/default/"
+"vdr."
diff --git a/debian/po/it.po b/debian/po/it.po
new file mode 100644
index 0000000..3ccaeb9
--- /dev/null
+++ b/debian/po/it.po
@@ -0,0 +1,71 @@
+# Italian translation of vdr.
+# COPYRIGHT (C) 2009 THE VDR'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the vdr package.
+# Luca Monducci <luca.mo at tiscali.it>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.6.0 italian debconf templates\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2009-09-28 22:36+0200\n"
+"Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satellite"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Terrestre"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Cavo"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "Tipo di scheda DVB:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"Per funzionare correttamente è necessario indicare a VDR il tipo di scheda "
+"DVB. In base a questa scelta verrà creato un file channels.conf che verrà "
+"installato in /var/lib/vdr. Potrebbe essere necessario adattare questo file "
+"al sistema in uso."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "Creare /var/lib/video?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Con la configurazione predefinita, VDR usa /var/lib/video per memorizzare "
+"le registrazioni. È possibile creare questa directory adesso oppure cambiare "
+"questo comportamento modificando la variabile VIDEO_DIR in /etc/default/vdr."
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 0000000..66a99d2
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,69 @@
+# Japanese translation of vdr debconf templates.
+# Copyright (C) 2009 Hideki Yamane <henrich at debian.or.jp>
+# This file is distributed under the same license as vdr package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.6.0-12\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2009-10-29 06:26+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <henrich at debian.or.jp>\n"
+"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "衛星放送"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "地上デジタル放送"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "ケーブル放送"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "DVB カードの種類:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR は正常に動作するために DVB カードの種類を知っている必要があります。ここで"
+"の選択を元にして、/var/lib/vdr に channels.conf ファイルがインストールされま"
+"す。設定によってはこのファイルを変更する必要があるかもしれません。"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "/var/lib/video を作成しますか?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"デフォルトでは VDR は録画を保存するのに /var/lib/video を使うように設定さ"
+"れています。このディレクトリをすぐに作成する、あるいは後ほど /etc/default/"
+"vdr 内の VIDEO_DIR 変数の設定にて、保存するディレクトリの指定を変更できます。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..3e94804
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,77 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+# Developers do not need to manually edit POT or PO files.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.2.6-4\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2004-05-18 08:40+0100\n"
+"Last-Translator: Luk Claes <luk.claes at ugent.be>\n"
+"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satelliet"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Aards"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Kabel"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "DVB-kaarttype:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR moet uw DVB-kaarttype weten om correct te werken. Gebruikmakend van uw "
+"selectie, zal een channels.conf-bestand worden ge�nstalleerd in /var/lib/"
+"vdr. U moet dit bestand misschien aanpassen afhankelijk van uw configuratie."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "/var/lib/video aanmaken?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Standaard is VDR geconfigureerd om /var/lib/video te gebruiken om opnames "
+"te bewaren. U kunt deze map nu aanmaken of dit gedrag later wijzigen door de "
+"VIDEO_DIR-variabele aan te passen in /etc/default/vdr."
diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644
index 0000000..a545370
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,72 @@
+# Portuguese translation of vdr's debconf messages.
+# Copyright (C) 2007
+# This file is distributed under the same license as the vdr package.
+# Luísa Lourenço <kikentai at gmail.com>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.4.4-1\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2007-03-19 12:24+0000\n"
+"Last-Translator: Luísa Lourenço <kikentai at gmail.com>\n"
+"Language-Team: Portuguese <traduz at debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satélite"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Terrestre"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Cabo"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "Tipo de placa DVB:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"O VDR precisa de saber qual o tipo da sua placa DVB para funcionar "
+"correctamente. Usando a sua escolha, o ficheiro channels.conf irá ser "
+"instalado para /var/lib/vdr. Poderá ter que modificar este ficheiro "
+"dependendo da sua configuração."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "Criar /var/lib/video?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Por omissão o VDR é configurado para usar o /var/lib/video para guardar "
+"as gravações. Poderá tanto criar agora este directório, ou modificar este "
+"comportamento mais tarde modificando a variável VIDEO_DIR em /etc/default/"
+"vdr."
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 0000000..e259405
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,73 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray at komyakino.ru>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.6.0-8\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2009-07-02 21:17+0400\n"
+"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Спутниковая"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Эфирная"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Кабельная"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "Тип карты DVB:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"Для корректной работы VDR требуется указать тип карты DVB. На основе вашего "
+"выбора в каталог /var/lib/vdr будет помещён подходящий файл channels.conf. В "
+"зависимости от установки вам может потребоваться изменить этот файл."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "Создать /var/lib/video?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"По умолчанию для хранения записей VDR использует /var/lib/video. Вы "
+"можете создать этот каталог сейчас, или изменить эту настройку позже, "
+"отредактировав значение переменной VIDEO_DIR в /etc/default/vdr."
diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644
index 0000000..87becda
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,77 @@
+# Translators, if you are not familiar with the PO format, gettext
+# documentation is worth reading, especially sections dedicated to
+# this format, e.g. by running:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+# Some information specific to po-debconf are available at
+# /usr/share/doc/po-debconf/README-trans
+# or http://www.debian.org/intl/l10n/po-debconf/README-trans
+# Developers do not need to manually edit POT or PO files.
+# , fuzzy
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: vdr 1.3.31-2\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: 2005-09-30 23:31-0700\n"
+"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
+"Language-Team: Swedish <sv at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr "Satellit"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr "Marks�nd"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr "Kabel"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr "DVB-korttyp:"
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+"VDR beh�ver veta om din DVB-korttyp f�r att fungera korrekt. Baserat p� ditt "
+"val kommer en channels.conf fil att installeras i /var/lib/vdr. Du kanske "
+"m�ste �ndra i denna fil beroende p� din konfiguration."
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr "Skapa /var/lib/video?"
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
+"Som standard �r VDR konfigurerad att anv�nda /var/lib/video f�r att lagra "
+"inspelningar. Du kan antingen skapa denna mapp nu eller �ndra detta senare "
+"genom att modifiera variabeln VIDEO_DIR i /etc/default/vdr."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 0000000..bc76b34
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: vdr at packages.debian.org\n"
+"POT-Creation-Date: 2010-03-04 22:58+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Satellite"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Terrestrial"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../vdr.templates:1001
+msgid "Cable"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid "DVB card type:"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../vdr.templates:1002
+msgid ""
+"VDR needs to know your DVB card type to work correctly. Using your "
+"selection, a channels.conf file will be installed to /var/lib/vdr. You may "
+"have to change this file depending on your setup."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid "Create /var/lib/video?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../vdr.templates:2001
+msgid ""
+"By default VDR is configured to use /var/lib/video to store recordings. "
+"You can either create this directory now, or change this behavior later by "
+"modifying the VIDEO_DIR variable in /etc/default/vdr."
+msgstr ""
diff --git a/debian/vdr.config b/debian/vdr.config
new file mode 100644
index 0000000..882eb85
--- /dev/null
+++ b/debian/vdr.config
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+set -e
+
+# source debconf lib
+. /usr/share/debconf/confmodule
+
+# ask about creating /var/lib/video
+if [ ! -e /var/lib/video -a ! -L /var/lib/video ]; then
+ db_input high vdr/create_video_dir || true
+ db_go
+fi
+
+# ask about dvb card type
+db_input high vdr/select_dvb_card || true
+db_go
+
+exit 0
diff --git a/debian/vdr.install b/debian/vdr.install
index 5afe6cf..b7b64d8 100644
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@ -34,5 +34,3 @@ debian/themes/*.theme var/lib/vdr/themes/
var/lib/vdr/channels.conf.sat usr/share/vdr/channels.conf-examples/
channels.conf.* usr/share/vdr/channels.conf-examples/
debian/migrate-old-config.sh usr/share/vdr/
-
-debian/vdraptrefresh usr/sbin/
diff --git a/debian/vdr.postinst b/debian/vdr.postinst
index 07304d4..69b21af 100644
--- a/debian/vdr.postinst
+++ b/debian/vdr.postinst
@@ -1,7 +1,20 @@
-#!/bin/sh
-
-# Peter Siering <ps at ctmagazin.de>, 10/2/2003
-
+#! /bin/sh
+# postinst script for vdr
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
#
# quoting from the policy:
# Any necessary prompting should almost always be confined to the
@@ -29,11 +42,6 @@ TryCreateVideoDir() {
fi
}
-
-ACTION=$1
-
-# Upgrade <= 1.2.6-26 to a more FHS-conform directory structure
-#
InstallChannelsConf() {
[ -e /var/lib/vdr/channels.conf ] && return
case "$1" in
@@ -116,54 +124,11 @@ case "$1" in
abort-upgrade|abort-remove|abort-deconfigure)
;;
-if [ "$ACTION" = "configure" ] ; then
- TryCreateVideoDir
-
- # copy example channels.conf file into config dir
- if [ ! -e /var/lib/vdr/channels.conf ]; then
- cp /usr/share/doc/vdr/examples/channels.conf-examples/channels.conf.sat /var/lib/vdr/channels.conf
- fi
-
- # ensure that user and group 'vdr' exist
- USER=vdr
- GROUP=vdr
- if ! getent group | grep -q "^$GROUP:" ; then
- echo -n "Adding group $GROUP.."
- addgroup --quiet --system $GROUP
- echo "..done"
- fi
- if ! getent passwd | grep -q "^$USER:"; then
- echo -n "Adding user $USER.."
- adduser --system --home /var/lib/vdr --shell /bin/false \
- --gecos "VDR user" --no-create-home \
- --disabled-login --disabled-password \
- --ingroup $GROUP \
- $USER
- echo "...done"
- fi
-
- # put vdr in group video so that it can access the DVB device nodes
- adduser $USER video > /dev/null || true
-
- # ensure that vdr's config and recording files are correctly owned
- [ -e /var/lib/video ] && chown -R $USER:$GROUP /var/lib/video/
- [ -e /var/lib/video.00 ] && chown -R $USER:$GROUP /var/lib/video.00/
- [ -e /var/lib/video.01 ] && chown -R $USER:$GROUP /var/lib/video.01/
- if [ -e /var/lib/vdr ] ; then
- chown -R $USER:$GROUP /var/lib/vdr
- chown $USER:$GROUP /var/lib/vdr/* > /dev/null 2>&1 || true
- fi
- if [ -e /var/cache/vdr ] ; then
- chown $USER:$GROUP /var/cache/vdr
- chown $USER:$GROUP /var/cache/vdr/* > /dev/null 2>&1|| true
- fi
-
- # make /usr/lib/vdr/vdr-shutdown.wrapper setuid/setgid (owner root:vdr, mode 6750)
- if [ -e /usr/lib/vdr/vdr-shutdown.wrapper ] ; then
- chown root:$GROUP /usr/lib/vdr/vdr-shutdown.wrapper && \
- chmod a=,u+srwx,g+srx /usr/lib/vdr/vdr-shutdown.wrapper
- fi
-fi
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
db_stop
diff --git a/debian/vdr.postrm b/debian/vdr.postrm
index 7f40872..8b74bc1 100644
--- a/debian/vdr.postrm
+++ b/debian/vdr.postrm
@@ -25,11 +25,8 @@ case "$1" in
rm -f /var/cache/vdr/reccmds.conf > /dev/null 2>&1 || true
rm -f /var/cache/vdr/epg.data > /dev/null 2>&1 || true
rm -f /var/lib/vdr/channels.conf > /dev/null 2>&1 || true
- rm -f /var/lib/vdr/channels.conf.terr > /dev/null 2>&1 || true
- rm -f /var/lib/vdr/channels.conf.cable > /dev/null 2>&1 || true
rm -rf /var/lib/vdr/themes > /dev/null 2>&1 || true
rm -f /var/lib/vdr/remote.conf > /dev/null 2>&1 || true
- rm -f /var/lib/vdr/remote.*.conf > /dev/null 2>&1 || true
rm -f /var/lib/vdr/setup.conf > /dev/null 2>&1 || true
rm -f /var/lib/vdr/timers.conf > /dev/null 2>&1 || true
rm -rf /etc/vdr/conf.d
diff --git a/debian/vdr.templates b/debian/vdr.templates
new file mode 100644
index 0000000..a3ada3c
--- /dev/null
+++ b/debian/vdr.templates
@@ -0,0 +1,16 @@
+Template: vdr/select_dvb_card
+Type: select
+__Choices: Satellite, Terrestrial, Cable
+Default: Satellite
+_Description: DVB card type:
+ VDR needs to know your DVB card type to work correctly.
+ Using your selection, a channels.conf file will be installed to /var/lib/vdr.
+ You may have to change this file depending on your setup.
+
+Template: vdr/create_video_dir
+Type: boolean
+Default: false
+_Description: Create /var/lib/video?
+ By default VDR is configured to use /var/lib/video to store recordings.
+ You can either create this directory now, or change this behavior later
+ by modifying the VIDEO_DIR variable in /etc/default/vdr.
diff --git a/debian/vdraptrefresh b/debian/vdraptrefresh
deleted file mode 100644
index 2dfb662..0000000
--- a/debian/vdraptrefresh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# This script helps to automate a repository change.
-# It just reinstalls all plugins that have been installed
-# after changing sources.list to point to a new repository.
-# After calling apt-get update, you can call this script
-# to refresh vdr and any plugins
-#
-if [ "$#" != "0" ] && [ "$1" != "--dry-run" ]; then
- echo "just knows --dry-run or nothing"
- exit 1
-fi
-(apt-get clean; apt-get $1 install --reinstall vdr ; apt-get $1 install --reinstall `(export COLUMNS=512; dpkg -l | tee /tmp/test.lst | grep "ii vdr-plugin" | cut -d" " -f3)`)
-/etc/init.d/vdr restart
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git
More information about the pkg-vdr-dvb-changes
mailing list