Package: mediamate
Version: 0.9.3.6-4.2
Severity: normal
Tags: patch
Hi,
Attached is the diff for my mediamate 0.9.3.6-4.3 NMU during the current
BSP which I'll upload to delayed-0.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u mediamate-0.9.3.6/debian/changelog mediamate-0.9.3.6/debian/changelog
--- mediamate-0.9.3.6/debian/changelog
+++ mediamate-0.9.3.6/debian/changelog
@@ -1,3 +1,14 @@
+mediamate (0.9.3.6-4.3) unstable; urgency=high
+
+ * Non-maintainer upload during BSP.
+ * Fix unconditional use of debconf in postrm (Closes: #416948).
+ * Add php5 alternative dependencies (Closes: #424796).
+ * Add German debconf translation (Closes: #413274).
+ * Add Portuguese debconf translation (Closes: #415224).
+ * Add alternative dependency on apache2.
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sat, 19 May 2007 16:22:28 +0200
+
mediamate (0.9.3.6-4.2) unstable; urgency=low
* Non-maintainer upload to fix another l10n-related issue.
diff -u mediamate-0.9.3.6/debian/mediamate.postinst mediamate-0.9.3.6/debian/mediamate.postinst
--- mediamate-0.9.3.6/debian/mediamate.postinst
+++ mediamate-0.9.3.6/debian/mediamate.postinst
@@ -121,7 +121,7 @@
for server in $servers; do
- if [ $server == 'apache2' ]; then
+ if [ $server = 'apache2' ]; then
# apache2 support is currently a rather bad (but
# functional) hack
diff -u mediamate-0.9.3.6/debian/mediamate.preinst mediamate-0.9.3.6/debian/mediamate.preinst
--- mediamate-0.9.3.6/debian/mediamate.preinst
+++ mediamate-0.9.3.6/debian/mediamate.preinst
@@ -14,8 +14,10 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-# source the debconf wrapper functions
-. /usr/share/debconf/confmodule
+if [ -f /usr/share/debconf/confmodule ]; then
+ # source the debconf wrapper functions
+ . /usr/share/debconf/confmodule
+fi
case "$1" in
install)
diff -u mediamate-0.9.3.6/debian/mediamate.postrm mediamate-0.9.3.6/debian/mediamate.postrm
--- mediamate-0.9.3.6/debian/mediamate.postrm
+++ mediamate-0.9.3.6/debian/mediamate.postrm
@@ -4,93 +4,95 @@
set -e
-# source the debconf wrapper functions
-. /usr/share/debconf/confmodule
-
-case "$1" in
- purge)
-
- db_get mediamate/mysql/configure
- if [ "$RET" = true ]; then
+if [ -f /usr/share/debconf/confmodule ]; then
+ # source the debconf wrapper functions
+ . /usr/share/debconf/confmodule
+
+ case "$1" in
+ purge)
- db_get mediamate/purge
+ db_get mediamate/mysql/configure
if [ "$RET" = true ]; then
+
+ db_get mediamate/purge
+ if [ "$RET" = true ]; then
+
+ db_get mediamate/mysql/dbserver
+ dbserver=$RET
+ db_get mediamate/mysql/dbadmin
+ dbadmin=$RET
+ db_input critical mediamate/mysql/dbadmpass || true
+ db_go || true
- db_get mediamate/mysql/dbserver
- dbserver=$RET
- db_get mediamate/mysql/dbadmin
- dbadmin=$RET
- db_input critical mediamate/mysql/dbadmpass || true
- db_go || true
+ db_get mediamate/mysql/dbadmpass || true
+ dbadmpass=$RET
- db_get mediamate/mysql/dbadmpass || true
- dbadmpass=$RET
+ # remove the user
+ db_get mediamate/mysql/dbuser
+ dbuser=$RET
+ . /usr/share/wwwconfig-common/mysql-dropuser.sh
- # remove the user
- db_get mediamate/mysql/dbuser
- dbuser=$RET
- . /usr/share/wwwconfig-common/mysql-dropuser.sh
-
- # remove the database
- db_get mediamate/mysql/dbname
- dbname=$RET
- . /usr/share/wwwconfig-common/mysql-dropdb.sh
-
- # remove cover art
- rm -fr /var/lib/mediamate
+ # remove the database
+ db_get mediamate/mysql/dbname
+ dbname=$RET
+ . /usr/share/wwwconfig-common/mysql-dropdb.sh
+
+ # remove cover art
+ rm -fr /var/lib/mediamate
+ fi
fi
- fi
-
- # remove configuration directory
- rm -fr /etc/mediamate
-
- ;;
- remove)
-
- db_get mediamate/webserver_type
- webtype="$RET"
-
- # Allows us to loop and substitute in one pass
- case $webtype in
- Apache)
- servers="apache"
- ;;
- Apache-SSL)
- servers="apache-ssl"
- ;;
- Both)
- servers="apache apache-ssl"
+
+ # remove configuration directory
+ rm -fr /etc/mediamate
+
+ ;;
+ remove)
+
+ db_get mediamate/webserver_type
+ webtype="$RET"
+
+ # Allows us to loop and substitute in one pass
+ case $webtype in
+ Apache)
+ servers="apache"
+ ;;
+ Apache-SSL)
+ servers="apache-ssl"
+ ;;
+ Both)
+ servers="apache apache-ssl"
+ ;;
+ *)
+ servers=""
+ ;;
+ esac
+
+ for server in $servers; do
+
+ if [ -d /etc/$server ]; then
+
+ conffile="/etc/$server/httpd.conf"
+ includefile="/etc/mediamate/apache.conf"
+ . /usr/share/wwwconfig-common/apache-cominclude.sh
+ if [ "$status" = "comment" ]; then
+ restart="$server $restart"
+ fi
+ fi
+ done
+ . /usr/share/wwwconfig-common/restart.sh
;;
- *)
- servers=""
+ upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
- esac
-
- for server in $servers; do
-
- if [ -d /etc/$server ]; then
-
- conffile="/etc/$server/httpd.conf"
- includefile="/etc/mediamate/apache.conf"
- . /usr/share/wwwconfig-common/apache-cominclude.sh
- if [ "$status" = "comment" ]; then
- restart="$server $restart"
- fi
- fi
- done
- . /usr/share/wwwconfig-common/restart.sh
- ;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-db_stop
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ esac
+
+ # dh_installdeb will replace this with shell code automatically
+ # generated by other debhelper scripts.
+
+ #DEBHELPER#
+
+ db_stop
+fi
exit 0
diff -u mediamate-0.9.3.6/debian/control mediamate-0.9.3.6/debian/control
--- mediamate-0.9.3.6/debian/control
+++ mediamate-0.9.3.6/debian/control
@@ -7,7 +7,7 @@
Package: mediamate
Architecture: all
-Depends: httpd, php4-mysql, php4, wwwconfig-common, libphp-adodb, ${misc:Depends}
+Depends: apache2 | httpd, php5-mysql | php4-mysql, php5 | php4, wwwconfig-common, libphp-adodb, ${misc:Depends}
Conflicts: moviemate (<< 0.9.3)
Suggests: mysql-server
Description: web-based movie database and tracker
only in patch2:
unchanged:
--- mediamate-0.9.3.6.orig/debian/po/de.po
+++ mediamate-0.9.3.6/debian/po/de.po
@@ -0,0 +1,176 @@
+# Translation of mediamate debconf templates to German
+# Copyright (C) Stefan Bauer <[EMAIL PROTECTED]>, 2007.
+# This file is distributed under the same license as the mediamate package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mediamate 0.9.3.6-4\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2006-10-19 01:06+0200\n"
+"PO-Revision-Date: 2007-03-02 22:56+0100\n"
+"Last-Translator: Stefan Bauer <[EMAIL PROTECTED]>\n"
+"Language-Team: German <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache, Apache-SSL, Both, Apache2, Other"
+msgstr "Apache, Apache-SSL, Beides, Apache2, Andere"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid "What type of Web Server are you running?"
+msgstr "Welche Art Webserver betreiben Sie?"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid ""
+"By default Media Mate supports any web server that PHP4 does. This "
+"configuration process currently only supports Apache, Apache-SSL, and "
+"Apache2 directly. If you use another type you will have to handle the "
+"configuration of the web server manually. If you chose one of the first "
+"four options, this install process will manage the configuration (or "
+"attempt to) of the Apache specific portions necessary to run Media Mate "
+"properly. If you do not wish this to happen, please chose the Other option."
+msgstr "Standardm??ig unterst?tzt Media Mate jeden von PHP4 unterst?tzen "
+"Webserver. Dieser Konfigurationsvorgang unterst?tzt im Moment nur Apache, "
+"Apache-SSL und Apache2 direkt. Sollten Sie einen anderen Webserver verwenden, "
+"m?ssen Sie die Konfiguration des Webservers manuell durchf?hren. Wenn Sie eine "
+"der ersten vier Optionen ausgew?hlt haben, wird der Installationsprozess "
+"die f?r Apache n?tigen Optionen zum Einsatz von Media Mate vornehmen (bzw. "
+"es versuchen)."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Configure MySQL?"
+msgstr "Konfiguriere MySQL?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please choose whether the mediamate package configuration scripts should "
+"attempt to configure MySQL automatically. If you refuse this option, you "
+"should read the instructions in the README file."
+msgstr "Bitte w?hlen Sie, ob das Konfigurationsskript des mediamate-Pakets "
+"versuchen soll, die Konfiguration von MySQL automatisch durchzuf?hren. Falls "
+"Sie diese Option ablehnen, sollten Sie die Anweisungen in der README-Datei "
+"lesen."
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid "MySQL Host:"
+msgstr "MySQL-Rechner:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid ""
+"Please enter the name or IP address of the MySQL database host that will "
+"store the Media Mate database."
+msgstr "Bitte geben Sie den Rechnernamen oder die IP-Adresse des MySQL-"
+"Datenbank-Rechners ein, auf welchem die Media Mate-Datenbank hinterlegt wird."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Database administrator user:"
+msgstr "Datenbank-Administrator-Benutzer:"
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid ""
+"Please enter the name of a database user who is allowed to create new "
+"databases."
+msgstr "Bitte geben Sie den Datenbank-Benutzer an, welcher berechtigt ist, "
+"neue Datenbanken anzulegen."
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Delete database and cover art files on purge?"
+msgstr "L?sche Datenbank und ?Cover Art?-Dateien bei vollst?ndiger "
+"Entfernung (purge)?"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid ""
+"Please choose whether the database and all cover art files should be removed "
+"when tha Media Mate package is purged."
+msgstr "Bitte w?hlen Sie, ob die Datenbank und alle ?Cover Art?-Dateien "
+"entfernt werden sollen, wenn das Media Mate-Paket vollst?ndig entfernt "
+"(purged) wird."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Media Mate database name:"
+msgstr "Media Mate Datenbank-Name:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Please enter the name for the database used by Media Mate."
+msgstr "Bitte geben Sie den Namen der Datenbank an, welche f?r Media Mate "
+"verwendet werden soll."
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Media Mate database owner:"
+msgstr "Media Mate Datenbank-Besitzer:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Please enter the username of the Media Mate database owner."
+msgstr "Bitte geben Sie den Namen des Media Mate-Datenbankbesitzers an."
+
+#. Type: password
+#. Description
+#: ../templates:8001
+msgid "Media Mate database owner password:"
+msgstr "Media Mate-Datenbankbesitzer-Passwort:"
+
+#. Type: password
+#. Description
+#: ../templates:8001
+msgid "Please enter the password for the Media Mate database owner."
+msgstr "Bitte geben Sie das Passwort f?r den Media Mate-Datenbankbesitzer ein."
+
+#. Type: password
+#. Description
+#: ../templates:9001
+msgid "Database administrator password:"
+msgstr "Datenbank-Hauptbenutzer-Passwort:"
+
+#. Type: password
+#. Description
+#: ../templates:9001
+msgid "Please enter the password for the database administrator."
+msgstr "Bitte geben Sie das Passwort f?r den Datenbank-Hauptbesitzer ein."
+
+#. Type: boolean
+#. Description
+#: ../templates:10001
+msgid "Upgrade old Movie Mate to Media Mate?"
+msgstr "Upgrade vom alten Movie Mate zu Media Mate durchf?hren?"
+
+#. Type: boolean
+#. Description
+#: ../templates:10001
+msgid ""
+"There appears to be an old Movie Mate configuration. Please choose whether "
+"you like to upgrade it to Media Mate."
+msgstr "Es scheint eine alte Movie Mate-Konfiguration zu bestehen. Bitte "
+"w?hlen Sie, ob Sie ein Upgrade auf Media Mate durchf?hren wollen."
+
only in patch2:
unchanged:
--- mediamate-0.9.3.6.orig/debian/po/pt.po
+++ mediamate-0.9.3.6/debian/po/pt.po
@@ -0,0 +1,179 @@
+# Portuguese translation for mediamate's debconf messages
+# Copyright (C) 2007 Miguel Figueiredo
+# This file is distributed under the same license as the mediamate package.
+# Miguel Figueiredo <[EMAIL PROTECTED]>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mediamate 0.9.3.6-4.2\n"
+"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
+"POT-Creation-Date: 2007-02-12 20:09+0100\n"
+"PO-Revision-Date: 2007-03-14 22:43+0000\n"
+"Last-Translator: Miguel Figueiredo <[EMAIL PROTECTED]>\n"
+"Language-Team: Portuguese <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: select
+#. Choices
+#: ../templates:1001
+msgid "Apache, Apache-SSL, Both, Apache2, Other"
+msgstr "Apache, Apache-SSL, Ambos, Apache2, Outro"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid "What type of Web Server are you running?"
+msgstr "Que tipo de servidor Web tem a correr?"
+
+#. Type: select
+#. Description
+#: ../templates:1002
+msgid ""
+"By default Media Mate supports any web server that PHP4 does. This "
+"configuration process currently only supports Apache, Apache-SSL, and "
+"Apache2 directly. If you use another type you will have to handle the "
+"configuration of the web server manually. If you chose one of the first "
+"four options, this install process will manage the configuration (or attempt "
+"to) of the Apache specific portions necessary to run Media Mate properly. "
+"If you do not wish this to happen, please chose the Other option."
+msgstr ""
+"Por omiss??o o Media Mate suporta qualquer servidor web que o PHP4 tamb??m "
+"suporte. Este processo de configura????o actualmente apenas suporta "
+"directamente o Apache, Apache-SSL e Apache2. Se utilizar outro tipo ter?? de "
+"manipular a configura????o do servidor web manualmente. Se escolheu uma das "
+"primeiras quatro op????es, este processo de instala????o ir?? gerir a configura????o "
+"(ou tentar) de partes espec??ficas do Apache necess??rias para correr "
+"devidamente o Media Mate. Se n??o desejar que isto aconte??a, por favor "
+"escolha a op????o Outro."
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Configure MySQL?"
+msgstr "Configurar o MySQL?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"Please choose whether the mediamate package configuration scripts should "
+"attempt to configure MySQL automatically. If you refuse this option, you "
+"should read the instructions in the README file."
+msgstr ""
+"Por favor escolha se os scripts de configura????o do pacote mediamate devem "
+"tentar configurar automaticamente o MySQL. Se recusar esta op????o, voc?? deve "
+"ler as instru????es no ficheiro README."
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid "MySQL Host:"
+msgstr "M??quina com MySQL:"
+
+#. Type: string
+#. Description
+#: ../templates:3001
+msgid ""
+"Please enter the name or IP address of the MySQL database host that will "
+"store the Media Mate database."
+msgstr ""
+"Por favor introduza o nome ou endere??o IP da m??quina com a base de dados "
+"MySQL que ir?? armazenar a base de dados Media Mate."
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid "Database administrator user:"
+msgstr "Utilizador administrador da base de dados:"
+
+#. Type: string
+#. Description
+#: ../templates:4001
+msgid ""
+"Please enter the name of a database user who is allowed to create new "
+"databases."
+msgstr ""
+"Por favor introduza o nome de um utilizador de base de dados que ?? autorizado "
+"a criar novas bases de dados."
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid "Delete database and cover art files on purge?"
+msgstr "Apagar base de dados e ficheiros art??sticos das capas ao fazer 'purge'?'"
+
+#. Type: boolean
+#. Description
+#: ../templates:5001
+msgid ""
+"Please choose whether the database and all cover art files should be removed "
+"when the Media Mate package is purged."
+msgstr ""
+"Por favor escolhe se a base de dados e todos os ficheiros art??sticos de capas "
+"devem ser removidos quando for feito 'purge' ao pacote Media Mate."
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Media Mate database name:"
+msgstr "Nome da base de dados Media Mate:"
+
+#. Type: string
+#. Description
+#: ../templates:6001
+msgid "Please enter the name for the database used by Media Mate."
+msgstr "Por favor introduza o nome da base de dados utilizada pelo Media Mate."
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Media Mate database owner:"
+msgstr "Propriet??rio da base de dados Media Mate:"
+
+#. Type: string
+#. Description
+#: ../templates:7001
+msgid "Please enter the username of the Media Mate database owner."
+msgstr "Por favor introduza o nome de utilizador do propriet??ria da base de dados Media Mate."
+
+#. Type: password
+#. Description
+#: ../templates:8001
+msgid "Media Mate database owner password:"
+msgstr "Palavra-chave do propriet??rio da base de dados Media Mate:"
+
+#. Type: password
+#. Description
+#: ../templates:8001
+msgid "Please enter the password for the Media Mate database owner."
+msgstr "Por favor introduza a palavra-chave para o propriet??rio da base de dados Media Mate."
+
+#. Type: password
+#. Description
+#: ../templates:9001
+msgid "Database administrator password:"
+msgstr "Palavra-chave do administrador da base de dados:"
+
+#. Type: password
+#. Description
+#: ../templates:9001
+msgid "Please enter the password for the database administrator."
+msgstr "Por favor introduza a palavra-chave para o administrador da base de dados."
+
+#. Type: boolean
+#. Description
+#: ../templates:10001
+msgid "Upgrade old Movie Mate to Media Mate?"
+msgstr "Actualizar o antigo Movie Mate para Media Mate?"
+
+#. Type: boolean
+#. Description
+#: ../templates:10001
+msgid ""
+"There appears to be an old Movie Mate configuration. Please choose whether "
+"you like to upgrade it to Media Mate."
+msgstr ""
+"Parece existir uma configura????o do antigo Movie Mate. Por favor escolha se "
+"quer actualizar para o Media Mate."
