r3103 - in vdr/vdr-xxv/trunk/debian: . patches po
Tobias Grimm
tiber-guest at costa.debian.org
Sun Jul 2 19:52:51 UTC 2006
Author: tiber-guest
Date: 2006-07-02 19:52:50 +0000 (Sun, 02 Jul 2006)
New Revision: 3103
Added:
vdr/vdr-xxv/trunk/debian/patches/02_disable-restart.dpatch
Modified:
vdr/vdr-xxv/trunk/debian/TODO.Debian
vdr/vdr-xxv/trunk/debian/changelog
vdr/vdr-xxv/trunk/debian/control
vdr/vdr-xxv/trunk/debian/patches/00list
vdr/vdr-xxv/trunk/debian/po/de.po
vdr/vdr-xxv/trunk/debian/po/templates.pot
vdr/vdr-xxv/trunk/debian/templates
Log:
* Disabled restart command, because xxv does not run as root and therefore
can't call the init script
* Fixed debconf templates by adding ":" to prompts
Modified: vdr/vdr-xxv/trunk/debian/TODO.Debian
===================================================================
--- vdr/vdr-xxv/trunk/debian/TODO.Debian 2006-06-29 22:35:17 UTC (rev 3102)
+++ vdr/vdr-xxv/trunk/debian/TODO.Debian 2006-07-02 19:52:50 UTC (rev 3103)
@@ -17,39 +17,6 @@
* Maybe only suggest libnet-xmpp-perl?
* What happens if Version A gets installed ( but not enabled and threrfore
no db-tables created) and then an update B is installed?
-* Macht der USRCFGFILE-Parameter Sinn? ("$ENV{HOME}/.xxvd.cfg")
-
-DONE:
-
-* Import database configuration from xxvd.cfg and pass it to dbconfig-common
-* doc is generated, should be under /var
-* Delete logs on purge
-* Bug: password gets deleted, when upgrading
-* Dependency to mplayer?
-* convert all tabs to spaces
-* html/preview should be in /var/lib/xxv/preview or better /var/cache ???
-* Ask whether to drop db or not on purge, not configure
-* what to do with the doc/*.pod-files? pod2man?
- -> used for online help only. They can stay in cache
-* should vdr-plugin-mp3 be suggested?
- -> not needed at all
-* dont' ask admin/adminpass and userpass questions, on upgrading
-* more informative error messages in postinst/postrm on db errors (give
- hint to make it manually)
-* make mplayer optional?
-* should vdr-plugin-teletext or osdteletext be suggested?
-* is xxv a good name for the package? (see discussion on Alioth list)
-* write manpage for xxvd.pl -> done and forwarded to upstream
-* make debian vdr packaging team the maintainer
-* Are there any other config-Options that should be covered by debconf?
- (ports !)
-* Make debconf translatable (po-debconf)
-* Make german debconf translation
-* Check that logrotate works!
-* Use dbconfig-common by Sean Finney, as soon as it is available in Debian
-* Is it ok to use scripts from /usr/share/xxv/debconf in postinst?
-* Is there a clean way to share the common code in postinst and postrm?
-* where should the wml/ -dir be located? (see xxvd.cfg)
-* Are the debconf-password-questions descriptive enough?
-* Make note in debconf and/or README.Debian about default user xxv:xxv after
- initial installation
+* Does the USRCFGFILE-Parameter makes sense? ("$ENV{HOME}/.xxvd.cfg")
+* Do something about the disable-restart patch. May a restart should be done
+ by a HUP signal?
Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog 2006-06-29 22:35:17 UTC (rev 3102)
+++ vdr/vdr-xxv/trunk/debian/changelog 2006-07-02 19:52:50 UTC (rev 3103)
@@ -1,3 +1,11 @@
+vdr-xxv (0.80-2) unstable; urgency=low
+
+ * Disabled restart command, because xxv does not run as root and therefore
+ can't call the init script
+ * Fixed debconf templates by adding ":" to prompts
+
+ -- Tobias Grimm <tg at e-tobi.net> Sun, 2 Jul 2006 21:23:44 +0200
+
vdr-xxv (0.80-1) unstable; urgency=low
* Tobias Grimm <tg at e-tobi.net>
Modified: vdr/vdr-xxv/trunk/debian/control
===================================================================
--- vdr/vdr-xxv/trunk/debian/control 2006-06-29 22:35:17 UTC (rev 3102)
+++ vdr/vdr-xxv/trunk/debian/control 2006-07-02 19:52:50 UTC (rev 3103)
@@ -8,7 +8,7 @@
Package: vdr-xxv
Architecture: all
-Depends: ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (> 1.8.12), vdr (>= 1.4.0-1), mysql-client, ttf-bitstream-vera, libdbi-perl, libconfig-tiny-perl, libtemplate-perl, libproc-process-perl, libterm-readline-gnu-perl, libwww-mechanize-perl, libwww-mechanize-formfiller-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libdate-manip-perl, txt2html, libio-zlib-perl, libxml-simple-perl, libgd-graph-perl, libtext-asciitable-perl, libdigest-hmac-perl, libxml-rss-perl, libnet-xmpp-perl, libevent-perl, libterm-readline-perl-perl, libsoap-lite-perl, liblog-log4perl-perl
+Depends: ${perl:Depends}, debconf (>= 0.5.00), dbconfig-common (>= 1.8.12), vdr (>= 1.4.0-1), mysql-client, ttf-bitstream-vera, libdbi-perl, libconfig-tiny-perl, libtemplate-perl, libproc-process-perl, libterm-readline-gnu-perl, libwww-mechanize-perl, libwww-mechanize-formfiller-perl, libgd-gd2-noxpm-perl | libgd-gd2-perl, libdate-manip-perl, txt2html, libio-zlib-perl, libxml-simple-perl, libgd-graph-perl, libtext-asciitable-perl, libdigest-hmac-perl, libxml-rss-perl, libnet-xmpp-perl, libevent-perl, libterm-readline-perl-perl, libsoap-lite-perl, liblog-log4perl-perl
Recommends: mysql-server
Suggests: mplayer, vdr-plugin-osdteletext | vdr-plugin-teletext
Description: Provides a central service to administer VDR
Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list 2006-06-29 22:35:17 UTC (rev 3102)
+++ vdr/vdr-xxv/trunk/debian/patches/00list 2006-07-02 19:52:50 UTC (rev 3103)
@@ -1,2 +1,3 @@
01_libpath
+02_disable-restart
03_defaults
Added: vdr/vdr-xxv/trunk/debian/patches/02_disable-restart.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/02_disable-restart.dpatch 2006-06-29 22:35:17 UTC (rev 3102)
+++ vdr/vdr-xxv/trunk/debian/patches/02_disable-restart.dpatch 2006-07-02 19:52:50 UTC (rev 3103)
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_disable-restart.dpatch by Tobias Grimm <tg at e-tobi.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable restart, because xxv does not run as root and therefore
+## DP: can't run the init script
+
+ at DPATCH@
+--- vdr-xxv-0.80.orig/bin/xxvd
++++ vdr-xxv-0.80/bin/xxvd
+@@ -130,12 +130,12 @@
+ callback => sub{ more(@_) },
+ Level => 'user',
+ },
+- restart => {
+- description => gettext('Call initialization script to restart xxv system.'),
+- short => 'restart',
+- callback => sub{ restart(@_) },
+- Level => 'admin',
+- },
++# restart => {
++# description => gettext('Call initialization script to restart xxv system.'),
++# short => 'restart',
++# callback => sub{ restart(@_) },
++# Level => 'admin',
++# },
+ },
+ };
+ return $args;
Modified: vdr/vdr-xxv/trunk/debian/po/de.po
===================================================================
--- vdr/vdr-xxv/trunk/debian/po/de.po 2006-06-29 22:35:17 UTC (rev 3102)
+++ vdr/vdr-xxv/trunk/debian/po/de.po 2006-07-02 19:52:50 UTC (rev 3103)
@@ -11,12 +11,11 @@
#
# Developers do not need to manually edit POT or PO files.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-22 14:21+0200\n"
+"Report-Msgid-Bugs-To: pkg-vdr-dvb-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-07-02 21:45+0200\n"
"PO-Revision-Date: 2005-02-27 17:40+0100\n"
"Last-Translator: Tobias Grimm <tg at e-tobi.net>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,119 +44,29 @@
#. Type: string
#. Description
#: ../templates:12
-msgid "Port for XXV's http server"
-msgstr "Port des HTTP-Servers von XXV"
+msgid "Port for XXV's http server:"
+msgstr "Port des HTTP-Servers von XXV:"
#. Type: string
#. Description
#: ../templates:17
-msgid "Port for XXV's telnet interface"
-msgstr "Port des Telnet-Servers von XXV"
+msgid "Port for XXV's telnet interface:"
+msgstr "Port des Telnet-Servers von XXV:"
#. Type: string
#. Description
#: ../templates:22
-msgid "Port for XXV's telnet-like but xml based interface"
-msgstr "Port des Telnet-ähnlichen, xml-basierenden Interfaces von XXV"
+msgid "Port for XXV's telnet-like but xml based interface:"
+msgstr "Port des Telnet-ähnlichen, xml-basierenden Interfaces von XXV:"
#. Type: string
#. Description
#: ../templates:27
-msgid "Port for XXV's icecast server"
-msgstr "Port des Icecast-Servers von XXV"
+msgid "Port for XXV's icecast server:"
+msgstr "Port des Icecast-Servers von XXV:"
#. Type: string
#. Description
#: ../templates:32
-msgid "Port for XXV's WAP server"
-msgstr "Port des WAP-Servers von XXV"
-
-#~ msgid "Automatically manage db settings and create XXV database?"
-#~ msgstr "Automatisches Anlegen und Verwalten der XXV Datenbank?"
-
-#~ msgid ""
-#~ "With this option enabled, Debian will manage the MySQL database and user "
-#~ "required by XXV. You will need a MySQL-Server installed on the local or a "
-#~ "remote machine and you need the database administrator login name and "
-#~ "password."
-#~ msgstr ""
-#~ "Durch das Aktivieren dieser Einstellung wird Debian das Anlegen der MySQL-"
-#~ "Datenbank und des Datenbank-Benutzers für XXV übernehmen. Hierzumuss "
-#~ "lokal oder auf einem anderen Rechner im Netz MySQL installiert sein.Login-"
-#~ "Name und Passwort des Datenbankadministrators müssen bekannt sein."
-
-#~ msgid "Unselect this option, if you prefer to create the database yourself."
-#~ msgstr "Um die Datenbank von Hand anzulegen, deaktivieren Sie diese Option."
-
-#~ msgid "Database server for XXV's database"
-#~ msgstr "Datenbank-Server für die XXV-Datenbank"
-
-#~ msgid "On what port does the database server listen?"
-#~ msgstr "Port des Datenbankservers"
-
-#~ msgid "XXV database name"
-#~ msgstr "Name der XXV-Datenbank"
-
-#~ msgid "Database server administrator on ${host}:${port}"
-#~ msgstr "Login-Name des Datenbankadministrators auf ${host}:${port}"
-
-#~ msgid "The administrator username will not be stored anywhere permanently."
-#~ msgstr "Der Login-Name wird nirgendwo dauerhaft gespeichert."
-
-#~ msgid "Password for database server administrator on ${host}:${port}"
-#~ msgstr "Passwort des Datenbankadministrators auf ${host}:${port}"
-
-#~ msgid "The administrator password will not be stored anywhere permanently."
-#~ msgstr "Das Passwort wird nirgendwo dauerhaft gespeichert."
-
-#~ msgid "XXV database owner username"
-#~ msgstr "Benutzername für den Besitzer der XXV-Datenbank"
-
-#~ msgid "This username will be used by XXV to connect to the database server."
-#~ msgstr ""
-#~ "XXV wird diesen Benutzernamen für den Zugriff auf die Datenbank verwenden."
-
-#~ msgid "XXV database owner password"
-#~ msgstr "Passwort für den Besitzer der XXV-Datenbank"
-
-#~ msgid ""
-#~ "If no password is specified here, a random password will be generated."
-#~ msgstr "Wird kein Passwort angegeben, wird eines generiert."
-
-#~ msgid "The password will not be stored anywhere permanently."
-#~ msgstr "Das Passwort wird nirgendwo permanent gespeichert."
-
-#~ msgid "Purge XXV database and remove database user?"
-#~ msgstr "Die XXV-Datenbank löschen und den Datenbank-Benutzer entfernen?"
-
-#~ msgid ""
-#~ "Confirm this, if you want the database to be removed automatically. "
-#~ "Otherwise you have to do this manually."
-#~ msgstr ""
-#~ "Bestätigen Sie dies, um die Datenbank automatisch löschen zu lassen."
-
-#~ msgid "Purging the database or user failed!"
-#~ msgstr "Das Löschen der Datenbank oder des Benutzers ist fehlgeschlagen."
-
-#~ msgid "You may try again or do the purging manually."
-#~ msgstr "Sie können es erneut versuchen oder die Datenbank manuell löschen."
-
-#~ msgid "Setting up the database failed!"
-#~ msgstr "Das Einrichten der Datenbank ist fehlgeschlagen."
-
-#~ msgid ""
-#~ "The database could not be set up successfully. Check that you have "
-#~ "installed a MySQL server on your local or a remote machine. In order to "
-#~ "setup the database, you must provide a valid administrator account and "
-#~ "password."
-#~ msgstr ""
-#~ "Die Datenbank konnte nicht erstellet werden. Prüfen Sie, ob MySQL lokal "
-#~ "oder im Netz installiert ist. Um die Datenbank einzurichten müssen Name "
-#~ "und Passwort des Datenbankadministrators eingegeben werden."
-
-#~ msgid ""
-#~ "You can try again with \"dpkg-reconfigure vdr-xxv\". Otherwise you will "
-#~ "have to configure the database for xxv manually."
-#~ msgstr ""
-#~ "Sie können es mit \"dpkg-reconfigure vdr-xxv\" erneut versuchen oder die "
-#~ "Datenbank von Hand einrichten."
+msgid "Port for XXV's WAP server:"
+msgstr "Port des WAP-Servers von XXV:"
Modified: vdr/vdr-xxv/trunk/debian/po/templates.pot
===================================================================
--- vdr/vdr-xxv/trunk/debian/po/templates.pot 2006-06-29 22:35:17 UTC (rev 3102)
+++ vdr/vdr-xxv/trunk/debian/po/templates.pot 2006-07-02 19:52:50 UTC (rev 3103)
@@ -1,22 +1,14 @@
+# 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.
#
-# 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-22 14:21+0200\n"
+"Report-Msgid-Bugs-To: pkg-vdr-dvb-devel at lists.alioth.debian.org\n"
+"POT-Creation-Date: 2006-07-02 21:45+0200\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"
@@ -42,29 +34,29 @@
#. Type: string
#. Description
#: ../templates:12
-msgid "Port for XXV's http server"
+msgid "Port for XXV's http server:"
msgstr ""
#. Type: string
#. Description
#: ../templates:17
-msgid "Port for XXV's telnet interface"
+msgid "Port for XXV's telnet interface:"
msgstr ""
#. Type: string
#. Description
#: ../templates:22
-msgid "Port for XXV's telnet-like but xml based interface"
+msgid "Port for XXV's telnet-like but xml based interface:"
msgstr ""
#. Type: string
#. Description
#: ../templates:27
-msgid "Port for XXV's icecast server"
+msgid "Port for XXV's icecast server:"
msgstr ""
#. Type: string
#. Description
#: ../templates:32
-msgid "Port for XXV's WAP server"
+msgid "Port for XXV's WAP server:"
msgstr ""
Modified: vdr/vdr-xxv/trunk/debian/templates
===================================================================
--- vdr/vdr-xxv/trunk/debian/templates 2006-06-29 22:35:17 UTC (rev 3102)
+++ vdr/vdr-xxv/trunk/debian/templates 2006-07-02 19:52:50 UTC (rev 3103)
@@ -9,24 +9,24 @@
Template: vdr-xxv/port_http
Type: string
Default: 8080
-_Description: Port for XXV's http server
+_Description: Port for XXV's http server:
Template: vdr-xxv/port_telnet
Type: string
Default: 8005
-_Description: Port for XXV's telnet interface
+_Description: Port for XXV's telnet interface:
Template: vdr-xxv/port_interface
Type: string
Default: 8002
-_Description: Port for XXV's telnet-like but xml based interface
+_Description: Port for XXV's telnet-like but xml based interface:
Template: vdr-xxv/port_icecast
Type: string
Default: 8100
-_Description: Port for XXV's icecast server
+_Description: Port for XXV's icecast server:
Template: vdr-xxv/port_wap
Type: string
Default: 8085
-_Description: Port for XXV's WAP server
+_Description: Port for XXV's WAP server:
More information about the pkg-vdr-dvb-changes
mailing list