Package: diogenes
Version: 0.9.20-1
Severity: normal
Tags: patch
Hi,
Attached is the diff for my diogenes 0.9.20-1.1 NMU during the current
BSP which I uploaded 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 diogenes-0.9.20/debian/diogenes.postrm diogenes-0.9.20/debian/diogenes.postrm
--- diogenes-0.9.20/debian/diogenes.postrm
+++ diogenes-0.9.20/debian/diogenes.postrm
@@ -29,23 +29,22 @@
#
# Remove Diogenes from the webserver configuration
#
- . /usr/share/debconf/confmodule
- db_version 2.0
+ if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
#
# Only try to remove Diogenes from the webserver configs if the db key
# diogenes/webservers exists. If not, Diogenes had not been installed
# correctly so we just skip the webserver part
#
- if db_get "diogenes/webservers"; then
- remove_from_webconfig
+ if db_get "diogenes/webservers"; then
+ remove_from_webconfig
+ fi
fi
;;
purge)
- . /usr/share/debconf/confmodule
- db_version 2.0
-
#
# Remove ucf-managed files
#
@@ -54,33 +53,37 @@
rm -f $myfile $myfile.dpkg-dist $myfile.dpkg-new $myfile.dpkg-old
done
+ if [ -f /usr/share/debconf/confmodule ]; then
+ . /usr/share/debconf/confmodule
+ db_version 2.0
#
# If we were asked to, purge Diogenes data
#
- db_get "diogenes/purge_removes_data"
- if [ "$RET" = "true" ]; then
+ db_get "diogenes/purge_removes_data"
+ if [ "$RET" = "true" ]; then
# remove files
- rm -rf /var/spool/diogenes /var/lib/diogenes
+ rm -rf /var/spool/diogenes /var/lib/diogenes
# drop the database if we are Automatic mode
- db_get "diogenes/databasemgr_type"
- if [ "$RET" = "Automatic" ] ; then
- db_get "diogenes/databasemgr_server"
- dbserver="$RET"
- db_get "diogenes/database_name"
- dbname="$RET"
+ db_get "diogenes/databasemgr_type"
+ if [ "$RET" = "Automatic" ] ; then
+ db_get "diogenes/databasemgr_server"
+ dbserver="$RET"
+ db_get "diogenes/database_name"
+ dbname="$RET"
# we use the Diogenes user as the "admin", as he is authorized to do a drop
- db_get "diogenes/database_user"
- dbadmin="$RET"
- db_get "diogenes/database_pass"
- dbadmpass="$RET"
- if [ -f /usr/share/wwwconfig-common/mysql.get ] && [ -x $(which mysql) ] ; then
- . /usr/share/wwwconfig-common/mysql.get
- if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
- status=dropped
- fi
+ db_get "diogenes/database_user"
+ dbadmin="$RET"
+ db_get "diogenes/database_pass"
+ dbadmpass="$RET"
+ if [ -f /usr/share/wwwconfig-common/mysql.get ] && [ -x $(which mysql) ] ; then
+ . /usr/share/wwwconfig-common/mysql.get
+ if eval $mysqlcmd -f -e "\"DROP DATABASE $dbname;\"" ; then
+ status=dropped
+ fi
+ fi
+ fi
fi
- fi
fi
;;
diff -u diogenes-0.9.20/debian/changelog diogenes-0.9.20/debian/changelog
--- diogenes-0.9.20/debian/changelog
+++ diogenes-0.9.20/debian/changelog
@@ -1,3 +1,11 @@
+diogenes (0.9.20-1.1) unstable; urgency=high
+
+ * Non-maintainer upload during BSP.
+ * Fix unconditional use of debconf in postrm (Closes: #416740, #388603).
+ * Add Portuguese debconf translation (Closes: #415489).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Fri, 18 May 2007 12:07:53 +0200
+
diogenes (0.9.20-1) unstable; urgency=low
* New upstream release.
only in patch2:
unchanged:
--- diogenes-0.9.20.orig/debian/po/pt.po
+++ diogenes-0.9.20/debian/po/pt.po
@@ -0,0 +1,272 @@
+# Portuguese translation of diogenes's debconf messages.
+# Copyright (C) 2007
+# This file is distributed under the same license as the diogenes package.
+# Lu??sa Louren??o <[EMAIL PROTECTED]>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: diogenes 0.9.20-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-13 19:01+0100\n"
+"PO-Revision-Date: 2007-03-19 12:01+0000\n"
+"Last-Translator: Lu??sa Louren??o <[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: note
+#. Description
+#: ../diogenes.templates:1001
+msgid "Welcome to the Diogenes setup program"
+msgstr "Bem-vindo ao programa de configura????o do Diogenes"
+
+#. Type: note
+#. Description
+#: ../diogenes.templates:1001
+msgid ""
+"You must have a database server already setup and ready to go if you are "
+"going to have this program configure your database for you. If you are not "
+"comfortable with this, you should tell the debconf process that you do not "
+"have any database server. You will then need to configure Diogenes manually."
+msgstr ""
+"Tem que ter um servidor de base de dados j?? configurado e pronto se vai ter "
+"este programa a configurar a sua base de dados. Se n??o estiver ?? vontade com "
+"isto, deve dizer ao processo debconf que n??o tem um servidor de base de "
+"dados. Ir?? depois precisar de configurar manualmente o Diogenes."
+
+#. Type: note
+#. Description
+#: ../diogenes.templates:1001
+msgid ""
+"If debconf is set up in a way that you will not be asked questions "
+"interactively (i.e. you do not see this note during installation but as a "
+"mail to your root account), Diogenes will assume that your web server is "
+"apache and your database server is MySQL and no MySQL root password is set. "
+"If any of these do not apply, Diogenes will not run unless you configure it "
+"manually by creating its database and editing the files in /etc/diogenes."
+msgstr ""
+"Se o debconf est?? configurado de forma a que n??o lhe ser??o colocadas "
+"perguntas interactivamente (i.e. n??o v?? esta nota durante a instala????o mas "
+"como um mail ?? sua conta de root), o Diogenes ir?? assumir que o seu servidor "
+"web ?? o apache e que o seu servidor de base de dados ?? o MySQL e que nenhuma "
+"palavra-chave de root est?? definida no MySQL. Se nada disto se aplicar, o "
+"Diogenes n??o ir?? ser executado a n??o ser que o configure manualmente ao "
+"criar a sua base de dados e editar os ficheiros em /etc/diogenes."
+
+#. Type: boolean
+#. Description
+#: ../diogenes.templates:2001
+msgid "Remove web site data after \"purging\" the diogenes package?"
+msgstr "Eliminar os dados da p??gina web depois de \"remover\" o pacote diogenes?"
+
+#. Type: boolean
+#. Description
+#: ../diogenes.templates:2001
+msgid ""
+"Should the data that makes up Diogenes's web sites be removed when the "
+"diogenes packages is purged with the \"dpkg --purge diogenes\" command (i.e. "
+"remove everything including the configuration)?"
+msgstr ""
+"Devem os dados que formam os sites web do Diogenes serem removidos quando os "
+"pacotes do diogenes s??o removidos com o comando \"dpkg --purge diogenes\" "
+"(i.e. eliminar tudo inclu??ndo a configura????o)?"
+
+#. Type: multiselect
+#. Choices
+#: ../diogenes.templates:3001
+msgid "apache, apache-ssl, apache-perl, apache2"
+msgstr "apache, apache-ssl, apache-perl, apache2"
+
+#. Type: multiselect
+#. Description
+#: ../diogenes.templates:3002
+msgid "Type of web server:"
+msgstr "Tipo de servidor web:"
+
+#. Type: multiselect
+#. Description
+#: ../diogenes.templates:3002
+msgid ""
+"By default Diogenes supports any web server that php4 does. This config "
+"process currently only supports Apache directly. If you use another one you "
+"will have to handle the web ends manually. If you choose the first option, "
+"this install process will manage the configuration (or attempt to) of the "
+"Apache specific portions necessary to run Diogenes properly."
+msgstr ""
+"Por omiss??o o Diogenes suporta qualquer servidor web que o php4 suporte. "
+"Este processo de configura????o actualmente apenas suporta o Apache "
+"directamente. Se utiliza outro ter?? que lidar manualmente com a "
+"funcionalidade web. Se escolher a primeira opc????o, este processo de "
+"instala????o ir?? gerir a configura????o (ou tentar) das partes especificas do "
+"Apache necess??rias ?? execu????o correcta do Diogenes."
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:4001
+msgid "User your web server runs as:"
+msgstr "Utilizador pelo qual o seu servidor de web corre:"
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:4001
+msgid ""
+"Unable to obtain the user your web server runs as. This is needed in order "
+"to allow the web server to write the files that make up the Diogenes-managed "
+"web sites."
+msgstr ""
+"N??o foi poss??vel obter o utilizador pelo qual o seu servidor de web corre. "
+"Isto ?? necess??rio para permitir que o seu servidor de web possa escrever os "
+"ficheiros que formam as p??ginas web geridas pelo Diogenes."
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:5001
+msgid "Group your web server runs as:"
+msgstr "Grupo pelo qual o seu servidor de web corre:"
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:5001
+msgid ""
+"Unable to obtain the group your web server runs as. This is needed in order "
+"to allow the web server to read Diogenes's configuration files."
+msgstr ""
+"N??o foi poss??vel obter o grupo pelo qual o seu servidor de web corre. Isto ?? "
+"necess??rio para que o servidor de web consiga ler os ficheiros de "
+"configura????o do Diogenes."
+
+#. Type: select
+#. Choices
+#: ../diogenes.templates:6001
+msgid "Automatic, Manual"
+msgstr "Autom??tico, Manual"
+
+#. Type: select
+#. Description
+#: ../diogenes.templates:6002
+msgid "Type of database installation:"
+msgstr "Tipo de instala????o da base de dados:"
+
+#. Type: select
+#. Description
+#: ../diogenes.templates:6002
+msgid ""
+"If you want the setup program to ask you questions and do the database setup "
+"for you, select \"Automatic\". (Recommended)"
+msgstr ""
+"Se quer que o programa de configura????o lhe fa??a perguntas e lhe fa??a a "
+"configura????o da base de dados, seleccione \"Autom??tico\". (Recomendado)"
+
+#. Type: select
+#. Description
+#: ../diogenes.templates:6002
+msgid ""
+"If you want to configure your database by hand, select \"Manual\". In this "
+"case you will have to create the Diogenes database and user by hand and "
+"handle database upgrades manually."
+msgstr ""
+"Se quer configurar a sua base dados ?? m??o, seleccione \"Manual\". Neste caso "
+"ter?? que criar a base de dados e utilizador do Diogenes ?? m??o e lidar com as "
+"actualiza????es da base de dados manualmente."
+
+#. Type: password
+#. Description
+#: ../diogenes.templates:7001
+msgid "Database admin password:"
+msgstr "Palavra chave de administrador da base de dados:"
+
+#. Type: password
+#. Description
+#: ../diogenes.templates:7001
+msgid ""
+"Enter the password for your database admin user to access the database. This "
+"password had been set when installing your database. It is most likely NOT "
+"the same password that your Diogenes manager account will use."
+msgstr ""
+"Insira a palavra-chave para o seu utilizador admin da sua base de dados. Esta "
+"palavra-chave foi atribuida quando instalou a sua base de dados. ?? muito "
+"prov??vel que N??O seja a mesma palavra-chave que o seu gestor de contas do "
+"Diogenes ir?? usar."
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:8001
+msgid "Hostname of the database server:"
+msgstr "Nome da m??quina do servidor da base de dados:"
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:8001
+msgid ""
+"If your database is on another machine besides the one that Diogenes is "
+"running on then you need to change this value to the fully qualified domain "
+"name for that system."
+msgstr ""
+"Se a sua base de dados est?? noutra m??quina para al??m da que o Diogenes est?? "
+"a correr ent??o precisa de mudar este valor para o nome completo e qualificado "
+"do dominiio para esse sistema."
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:9001
+msgid "Name for the Diogenes database:"
+msgstr "Nome para a base de dados do Diogenes:"
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:9001
+msgid ""
+"By default this will be \"diogenes\". This is where all the Diogenes "
+"related database items will be setup and stored."
+msgstr ""
+"Por omiss??o este ser?? \"diogenes\". Aqui ?? onde todos os itens relacionados "
+"com a base de dados do Diogenes ir??o ser configurados e guardados."
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:10001
+msgid "Database username:"
+msgstr "Utilizador da base de dados:"
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:10001
+msgid ""
+"What username will access the database for Diogenes? By default this is "
+"it's own user \"diogenes\" so that permissions can be tightened down."
+msgstr ""
+"Qual o utilizador que ir?? aceder ?? base de dados do Diogenes? Por omiss??o "
+"este ser?? \"diogenes\" para que as permiss??es possam ser relaxadas."
+
+#. Type: password
+#. Description
+#: ../diogenes.templates:11001
+msgid "Password for the Diogenes user:"
+msgstr "Palavra chave para o utilizador do Diogenes:"
+
+#. Type: password
+#. Description
+#: ../diogenes.templates:11001
+msgid ""
+"Enter a password for the database user which will be used along with the "
+"database user name you have already supplied to connect to the database."
+msgstr ""
+"Insira uma palavra chave para o utilizador da base de dados que ir?? ser usada "
+"juntamente com o utilizador da base de dados que j?? indicou."
+
+#. Type: password
+#. Description
+#: ../diogenes.templates:11001
+msgid ""
+"If you wish to leave the password empty, type \"none\". If you wish to use "
+"an automatically generated random password type \"auto\"."
+msgstr ""
+"Se quiser deixar a palavra chave vazia, escreva \"none\". Se desejar utilizar "
+"uma palavra chave gerada aleat??riamente escreva \"auto\"."
+
+#. Type: string
+#. Description
+#: ../diogenes.templates:12001
+msgid "MySQL administrator username:"
+msgstr "Nome de utilizador do administrador do MySQL:"
