[Dbconfig-common-changes] [dbconfig-common] r291 - in
branches/sqlite: . debian debian/po doc dpkg examples internal
Matt Brown
mattb-guest at costa.debian.org
Wed Aug 9 14:27:14 CEST 2006
Author: mattb-guest
Date: 2006-08-09 12:26:26 +0000 (Wed, 09 Aug 2006)
New Revision: 291
Added:
branches/sqlite/debian/dbconfig-common.lintian
branches/sqlite/dpkg/frontend.config
branches/sqlite/dpkg/frontend.config.mysql
branches/sqlite/dpkg/frontend.config.pgsql
branches/sqlite/dpkg/frontend.postinst
branches/sqlite/dpkg/frontend.postinst.mysql
branches/sqlite/dpkg/frontend.postinst.pgsql
branches/sqlite/dpkg/frontend.postrm
branches/sqlite/dpkg/frontend.postrm.mysql
branches/sqlite/dpkg/frontend.postrm.pgsql
branches/sqlite/dpkg/frontend.preinst
branches/sqlite/dpkg/frontend.preinst.mysql
branches/sqlite/dpkg/frontend.preinst.pgsql
branches/sqlite/dpkg/frontend.prerm
branches/sqlite/dpkg/frontend.prerm.mysql
branches/sqlite/dpkg/frontend.prerm.pgsql
branches/sqlite/examples/db-test-mysql-frontend-2.0/
branches/sqlite/examples/db-test-pgsql-migration-1.9/
branches/sqlite/examples/db-test-pgsql-migration-2.0/
Removed:
branches/sqlite/debian/TODO
Modified:
branches/sqlite/TODO
branches/sqlite/dbconfig-generate-include
branches/sqlite/dbconfig-load-include
branches/sqlite/debian/changelog
branches/sqlite/debian/control
branches/sqlite/debian/dbconfig-common.templates
branches/sqlite/debian/po/ca.po
branches/sqlite/debian/po/cs.po
branches/sqlite/debian/po/da.po
branches/sqlite/debian/po/de.po
branches/sqlite/debian/po/es.po
branches/sqlite/debian/po/eu.po
branches/sqlite/debian/po/fr.po
branches/sqlite/debian/po/it.po
branches/sqlite/debian/po/nl.po
branches/sqlite/debian/po/pt.po
branches/sqlite/debian/po/pt_BR.po
branches/sqlite/debian/po/sv.po
branches/sqlite/debian/po/templates.pot
branches/sqlite/debian/po/vi.po
branches/sqlite/debian/rules
branches/sqlite/doc/dbconfig-common.sgml
branches/sqlite/dpkg/common
branches/sqlite/dpkg/config
branches/sqlite/dpkg/postinst
branches/sqlite/dpkg/prerm
branches/sqlite/examples/README
branches/sqlite/examples/buildpackages.sh
branches/sqlite/internal/common
branches/sqlite/internal/pgsql
Log:
Merge changes from trunk (265:287) into the SQLite branch
Modified: branches/sqlite/TODO
===================================================================
--- branches/sqlite/TODO 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/TODO 2006-08-09 12:26:26 UTC (rev 291)
@@ -2,15 +2,15 @@
example, if a something goes wrong and the user selects "retry", they
should get all questions in case they needed to change something that
they missed.
+
- the code is "in the process of" getting a cleanup. there are still a
few globally scoped variables that ought to be removed and/or replaced
by local scoped variables.
+
- testing various corner cases:
- errors dumping during upgrade
- errors dumping during purge
-further ahead:
-
- test suite for testing new versions of dbconfig-common. ideally it
could just be a shell script that:
- builds the dbc package
@@ -26,3 +26,21 @@
like /etc/dbconfig-common/package_instance.conf etc. most of dbconfig's
code could escape needing a rewrite then, as we could internally "trick"
the code into thinking that was the actual package name.
+
+- provide a normal-user-accessible script for setting up databases
+ (for running out of public_html type directories etc).
+
+- support for other database types (sqlite, others?)
+
+- think about how this should tie in with the webapps-common.
+
+- begin discussion on having the "best-practices" document incorporated
+ in some form as debian policy.
+
+- ask if the user is to be completely deleted or only have privileges
+ revoked in mysql. this is the default in pgsql, but in pgsql the drop
+ will fail if the user owns other databases (not so in mysql).
+
+- mysql does not support ssl for the time being (see bug #291945)
+
+- should we remove users completely at purge?
Modified: branches/sqlite/dbconfig-generate-include
===================================================================
--- branches/sqlite/dbconfig-generate-include 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/dbconfig-generate-include 2006-08-09 12:26:26 UTC (rev 291)
@@ -238,7 +238,6 @@
## database access settings in /bin/sh format
## automatically generated from $inputfile
## by $0
-## `date -R`
##
## by default this file is managed via ucf, so you shouldn't have to
## worry about manual changes being silently discarded. *however*,
@@ -279,7 +278,6 @@
[ "$use_dbport" ] && echo "${comment_dbport}\$$dbport_varname='$dbc_dbport';"
[ "$use_dbtype" ] && echo "${comment_dbtype}\$$dbtype_varname='$dbc_dbtype';"
cat << EOF
-?>
EOF
;;
Modified: branches/sqlite/dbconfig-load-include
===================================================================
--- branches/sqlite/dbconfig-load-include 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/dbconfig-load-include 2006-08-09 12:26:26 UTC (rev 291)
@@ -165,18 +165,28 @@
case $format in
sh)
- . $inputfile
- [ "$use_dbuser" ] && cat << EOF
-$dbuser_varname='$dbc_dbuser'
+ cat << EOF | sh
+. $inputfile
+use_dbuser="$use_dbuser";
+use_dbpass="$use_dbpass";
+use_basepath="$use_basepath";
+use_dbname="$use_dbname";
+use_dbserver="$use_dbserver";
+use_dbport="$use_dbport";
+use_dbtype="$use_dbtype";
+
+[ "$use_dbuser" ] && cat << FOO
+dbc_dbuser='\$$dbuser_varname'
+FOO
+[ "$use_dbpass" ] && cat << FOO
+dbc_dbpass='\$$dbpass_varname'
+FOO
+ [ "$use_basepath" ] && echo "dbc_basepath='\$$basepath_varname'"
+ [ "$use_dbname" ] && echo "dbc_dbname='\$$dbname_varname'"
+ [ "$use_dbserver" ] && echo "dbc_dbserver='\$$dbserver_varname'"
+ [ "$use_dbport" ] && echo "dbc_dbport='\$$dbport_varname'"
+ [ "$use_dbtype" ] && echo "dbc_dbtype='\$$dbtype_varname'"
EOF
- [ "$use_dbpass" ] && cat << EOF
-$dbpass_varname='$dbc_dbpass'
-EOF
- [ "$use_basepath" ] && echo "$basepath_varname='$dbc_basepath'"
- [ "$use_dbname" ] && echo "$dbname_varname='$dbc_dbname'"
- [ "$use_dbserver" ] && echo "$dbserver_varname='$dbc_dbserver'"
- [ "$use_dbport" ] && echo "$dbport_varname='$dbc_dbport'"
- [ "$use_dbtype" ] && echo "$dbtype_varname='$dbc_dbtype'"
;;
php)
@@ -210,7 +220,6 @@
echo "dbc_dbport='\$$dbport_varname';\n";
if(!empty(\$use_dbtype) && isset(\$$dbtype_varname))
echo "dbc_dbtype='\$$dbtype_varname';\n";
-?>
EOF
;;
Deleted: branches/sqlite/debian/TODO
===================================================================
--- branches/sqlite/debian/TODO 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/TODO 2006-08-09 12:26:26 UTC (rev 291)
@@ -1,30 +0,0 @@
-this is the general state of things. below is a list of either unfinished
-or planned work for the present and future of dbconfig-common
-
-- bugs
- - i suspect the "back" functionality doesn't quite work
-
-- database support
- - general
- - some kind of support for multi-db applications
- - provide a normal-user-accessible script for setting up databases
- (for running out of public_html type directories etc).
- - support for other database types (sqlite3, others?)
-
-- general
- - think about how this should tie in with the webapps-common.
- - begin discussion on having the "best-practices" document incorporated
- in some form as debian policy.
- - how we handle admin passwords should differ based on remote/local.
- - ask if the user is to be completely deleted or only have privileges
- revoked in mysql. this is the default in pgsql, but in pgsql the drop
- will fail if the user owns other databases (not so in mysql).
- - a test harness for testing all the features of this package for
- qa purposes.
- - support for other package formats, such as rpm.
- - should we still depend on debconf or extract the debconf questions
- manually?
-
-- unresolved issues
- - mysql does not support ssl for the time being (see bug #291945)
- - should we remove users completely at purge?
Modified: branches/sqlite/debian/changelog
===================================================================
--- branches/sqlite/debian/changelog 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/changelog 2006-08-09 12:26:26 UTC (rev 291)
@@ -1,16 +1,54 @@
-dbconfig-common (1.8.18) UNRELEASED; urgency=low
+dbconfig-common (1.8.19) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ [ sean finney ]
+ * incorporate the "frontend" feature for read-only packages, where
+ someone may want to ask the questions but not take the actions.
+ see docs for details. thanks to Thomas Huriaux and Michael
+ Ablassmeier for the prompting on this one. closes: #373188.
+ * when doing upgrades, only ask for the administrative password
+ if there are upgrades to be applied. thanks to Michael Ablassmeier
+ for pointing this out. closes: #379730.
+ * merge debian/TODO and TODO into just TODO.
- -- sean finney <sean at localhost.localdomain> Tue, 13 Jun 2006 19:39:03 +0200
+ -- sean finney <seanius at debian.org> Fri, 04 Aug 2006 23:01:01 -0700
+dbconfig-common (1.8.18) unstable; urgency=low
+
+ [ sean finney ]
+ * no longer end php-style generated files with a ?>, as it's
+ superfluous and can reportedly cause problems (closes: #379979).
+ thanks to Thijs Kinkhorst for pointing this out.
+ * other changes/fixes from Thijs Kinkhorst:
+ - utf8 fix in changelog
+ - update standards version to 3.7.2
+ - lintian overrides for false-positives due to the example packages
+ closes: #380353
+ * updated danish debconf translations from Claus Hindsgaul, thanks.
+ closes: #378769
+ * fixed/improved pgsql authentication method autodetection.
+ * new db-test-pgsql-migration-{1.9,2.0} packages to both show and
+ test how to migrate from previous non-dbc packaging.
+ * fix for sh-format include files from dbconfig-load-include. thanks
+ to Torsten Werner for finding this problem.
+ * remove import-oldsettings template, i don't think the need
+ merits having it.
+ * packages that migrate to dbconfig-common no longer get the confusing
+ installation question.
+ * remove date from the d-g-i generated config files, to reduce
+ any ucf noise.
+
+ [ Bart Cornelis (cobaco) ]
+ * Updated Dutch translation
+
+ -- sean finney <seanius at debian.org> Wed, 02 Aug 2006 17:08:29 -0700
+
dbconfig-common (1.8.17) unstable; urgency=low
[ sean finney ]
* now provide a global configuration option which affects the priority of
questions related to remote database configuration.
* updated spanish debconf translations, thanks to
- Javier Fernández-Sanguino Peña (closes: #372650).
+ Javier Fernández-Sanguino Peña (closes: #372650).
* provide a fix for over-zealous sanity-checking breakage with packages that
support multiple database types. this should remove the need for any
ugly workarounds. thanks to David Gil (closes: #372948).
Modified: branches/sqlite/debian/control
===================================================================
--- branches/sqlite/debian/control 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/control 2006-08-09 12:26:26 UTC (rev 291)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: sean finney <seanius at debian.org>
Build-Depends: debhelper (>= 4.0.0), debiandoc-sgml, tetex-extra, gs
-Standards-Version: 3.6.2
+Standards-Version: 3.7.2
Package: dbconfig-common
Architecture: all
Copied: branches/sqlite/debian/dbconfig-common.lintian (from rev 287, trunk/debian/dbconfig-common.lintian)
Modified: branches/sqlite/debian/dbconfig-common.templates
===================================================================
--- branches/sqlite/debian/dbconfig-common.templates 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/dbconfig-common.templates 2006-08-09 12:26:26 UTC (rev 291)
@@ -421,14 +421,7 @@
Type: note
_Description: PostgreSQL does not support empty passwords.
-Template: dbconfig-common/import-oldsettings
-Type: note
-_Description: dbconfig-common will attempt to load existing settings
- dbconfig-common will now attempt to load the pre-existing settings of
- ${pkg}. Later, these settings will be validated, and if there is
- any problem with loading or using them you will be given the option to
- enter them again later.
-
Template: dbconfig-common/internal/reconfiguring
Type: boolean
Default: false
+Description: for internal use.
Modified: branches/sqlite/debian/po/ca.po
===================================================================
--- branches/sqlite/debian/po/ca.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/ca.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -17,7 +17,7 @@
msgstr ""
"Project-Id-Version: dbconfigcommon1.8.6\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2005-10-19 22:16+0200\n"
"Last-Translator: Miguel Gea Milvaques\n"
"Language-Team: <ca at li.org>\n"
@@ -1004,22 +1004,16 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL no suporta contrassenyes buides."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "dbconfig-common intentarà carregar els parà metres existents"
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr "dbconfig-common intentarà carregar els parà metres existents"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"El dbconfig-common intentarà ara carregar els parà metres preexistents de "
-"${pkg}. Després, aquests parà metres seran validats, i si hi ha cap problema "
-"amb la carrega o utilitzant-los, tindreu l'opció de introduir-los altra "
-"vegada."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "El dbconfig-common intentarà ara carregar els parà metres preexistents de "
+#~ "${pkg}. Després, aquests parà metres seran validats, i si hi ha cap "
+#~ "problema amb la carrega o utilitzant-los, tindreu l'opció de introduir-"
+#~ "los altra vegada."
Modified: branches/sqlite/debian/po/cs.po
===================================================================
--- branches/sqlite/debian/po/cs.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/cs.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: dbconfig-common\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2006-05-06 18:25+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -970,24 +970,18 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL nepodporuje prázdná hesla."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "dbconfig-common se pokusà nahrát stávajÃcà nastavenÃ"
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr "dbconfig-common se pokusà nahrát stávajÃcà nastavenÃ"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"dbconfig-common se nynà pokusà nahrát existujÃcà nastavenà ${pkg}. PozdÄ›ji "
-"budou tato nastavenà ověřena a pokud se v nich vyskytne nějaký problém, "
-"dostanete možnost je zadat znovu."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "dbconfig-common se nynà pokusà nahrát existujÃcà nastavenà ${pkg}. "
+#~ "Později budou tato nastavenà ověřena a pokud se v nich vyskytne nějaký "
+#~ "problém, dostanete možnost je zadat znovu."
#~ msgid ""
#~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
Modified: branches/sqlite/debian/po/da.po
===================================================================
--- branches/sqlite/debian/po/da.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/da.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -8,26 +8,27 @@
# /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.
-# Claus Hindsgaul <claus_h at image.dk>, 2005.
#
+# Claus Hindsgaul <claus_h at image.dk>, 2005.
+# Claus Hindsgaul <claus.hindsgaul at gmail.com>, 2006.
msgid ""
msgstr ""
"Project-Id-Version: dbconfig-common\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
-"PO-Revision-Date: 2005-12-16 12:49+0100\n"
-"Last-Translator: Claus Hindsgaul <claus_h at image.dk>\n"
-"Language-Team: Danish <dansk at klid.dk>\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"PO-Revision-Date: 2006-07-18 21:44+0200\n"
+"Last-Translator: Claus Hindsgaul <claus.hindsgaul at gmail.com>\n"
+"Language-Team: Danish\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:4
msgid "Will this server be used to access remote databases?"
-msgstr ""
+msgstr "Skal denne server bruges til at tilgå fjerne databaser?"
#. Type: boolean
#. Description
@@ -38,6 +39,10 @@
"database via dbconfig-common, the questions related to remote configuration "
"are asked with a priority such that they are skipped for most systems."
msgstr ""
+"For databasetyper, der understøtter dette, understøtter dbconfig-common "
+"opsætning af databaser på fjerne systemer. Når pakkens database installeres "
+"via dbconfig-common, stilles spørgsmål om fjernopsætning med en prioritet, "
+"der gør at de springes over på de fleste systemer."
#. Type: boolean
#. Description
@@ -47,13 +52,14 @@
"questions related to remote database configuration when you install new "
"packages."
msgstr ""
+"Hvis du vælger denne indstilling, vil du som udgangspunkt blive stillet "
+"spørgsmålene om opsætning af fjerne databaser, når du installerer nye pakker."
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:4
-#, fuzzy
msgid "If you are unsure, you should not select this option."
-msgstr "Ellers bør du vælge denne valgmulighed."
+msgstr "Hvis du er usikker, bør du ikke vælge denne indstilling."
#. Type: boolean
#. Description
@@ -140,34 +146,30 @@
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:53
-#, fuzzy
msgid "Re-install database for ${pkg}?"
-msgstr "Fejl under installationen af ${pkg}'s database. Forsøg igen?"
+msgstr "Geninstallér databaserne for ${pkg}?"
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:53
-#, fuzzy
msgid ""
"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
"database which it uses."
msgstr ""
-"Da du er ved at afinstallere ${pkg}, er det muligt at du ikke længere har "
-"brug for den underliggende database, som den har klargjort og brugt."
+"Da du er ved at sætte ${pkg} op igen, er det muligt at du også ønsker at "
+"geninstallere den database, den benytter."
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:53
-#, fuzzy
msgid ""
"If you wish to re-install the database for ${pkg}, you should select this "
"option. If you do not wish to do so (if you are reconfiguring the package "
"for unrelated reasons), you should not select this option."
msgstr ""
-"Hvis du ikke længere har brug for de data, der opbevares af ${pkg}, bør du "
-"vælge denne valgmulighed. Hvis du vil beholde disse data til en anden gang, "
-"eller hvis du hellere vil håndtere denne proces selv, skal du afvise denne "
-"valgmulighed."
+"Hvis du ønsker at geninstallere databasen til ${pkg}, bør du vælge denne "
+"valgmulighed. Hvis du ikke ønsker at gøre dette (hvis du sætter pakken op "
+"igen af andre grunde), bør du ikke vælge denne indstilling."
#. Type: boolean
#. Description
@@ -730,16 +732,15 @@
#. Type: password
#. Description
#: ../dbconfig-common.templates:305
-#, fuzzy
msgid ""
"If you are using \"ident\" based authentication, the supplied password will "
"not be used and can be left blank. Otherwise, PostgreSQL access may need to "
"be reconfigured to allow password-authenticated access."
msgstr ""
-"Angiv en adgangskode, som ${pkg} kan registrere sig med på databaseserveren. "
-"Hvis du lader den stå tom, vil der blive genereret en tilfældig adgangskode "
-"for dig. PostgreSQL-adgangen skal muligvis omkonfigureres for at tillade "
-"adgang med adgangskode."
+"Hvis du benytter \"ident\"-baseret autentificering, vil den angivne "
+"adgangskode ikke blive benyttet, og du kan lade den stå tom. Ellers kan det "
+"være nødvendigt at sætte PostgreSQL-adgangen op igen, for at tillade adgang "
+"med adgangskode."
#. Type: string
#. Description
@@ -981,25 +982,20 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL understøtter ikke tomme adgangskoder."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "dbconfig-common vil forsøge at indlæse de eksisterende indstillinger"
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr ""
+#~ "dbconfig-common vil forsøge at indlæse de eksisterende indstillinger"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"Nu vil dbconfig-common prøve at indlæse ${pkg}s eksisterende indstillinger. "
-"Disse indstillinger vil senere blive valideret, og hvis er er nogen "
-"problemer med at indlæse eller benytte dem, vil du senere få mulighed for at "
-"angive dem igen."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "Nu vil dbconfig-common prøve at indlæse ${pkg}s eksisterende "
+#~ "indstillinger. Disse indstillinger vil senere blive valideret, og hvis er "
+#~ "er nogen problemer med at indlæse eller benytte dem, vil du senere få "
+#~ "mulighed for at angive dem igen."
#~ msgid ""
#~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
Modified: branches/sqlite/debian/po/de.po
===================================================================
--- branches/sqlite/debian/po/de.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/de.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: dbconfig-common 0.9\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2005-04-10 20:30+0100\n"
"Last-Translator: Andreas Tille <tille at debian.org>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -1011,22 +1011,17 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL unterstützt keine leeren Passwörter."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "dbconfig-common wird versuchen, existierende Einstellungen zu setzen."
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr ""
+#~ "dbconfig-common wird versuchen, existierende Einstellungen zu setzen."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"dbconfig-common wird nun versuchen, die bereits existierenden Einstellungen "
-"voen ${pkg} zu laden. Diese Einstellungen werden später validiert. Falls "
-"ein Problem beim Laden auftritt, so wird die Möglichkeit sie dann zu "
-"korrigieren."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "dbconfig-common wird nun versuchen, die bereits existierenden "
+#~ "Einstellungen voen ${pkg} zu laden. Diese Einstellungen werden später "
+#~ "validiert. Falls ein Problem beim Laden auftritt, so wird die "
+#~ "Möglichkeit sie dann zu korrigieren."
Modified: branches/sqlite/debian/po/es.po
===================================================================
--- branches/sqlite/debian/po/es.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/es.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -35,8 +35,8 @@
msgstr ""
"Project-Id-Version: dbconfig-common\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
-"PO-Revision-Date: 2005-04-01 13:03+0200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"PO-Revision-Date: 2006-06-10 23:46+0200\n"
"Last-Translator: Javier Fernandez-Sanguino <jfs at debian.org>\n"
"Language-Team: Debian Spanish <debian-l10n-spanish at lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -996,21 +996,20 @@
msgid "PostgreSQL does not support empty passwords."
msgstr ""
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr ""
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr ""
+#~ "dbconfig-common intentará cargar los valores de configuración existentes"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "dbconfig-common intentará cargar los valores de la configuración de "
+#~ "${pkg}. Estos valores se validarán más adelante y si se encuentra algún "
+#~ "problema al cargarlas o utilizarlas se le dará la opción de introducirlas "
+#~ "de nuevo."
#~ msgid ""
#~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
Modified: branches/sqlite/debian/po/eu.po
===================================================================
--- branches/sqlite/debian/po/eu.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/eu.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: dbconfig-common-templates-eu\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2005-04-01 00:08+0200\n"
"Last-Translator: \n"
"Language-Team: <eu at li.org>\n"
@@ -956,22 +956,6 @@
msgid "PostgreSQL does not support empty passwords."
msgstr ""
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-
#~ msgid ""
#~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
#~ "configuration of PostgreSQL has to be changed. It is suggested that this "
Modified: branches/sqlite/debian/po/fr.po
===================================================================
--- branches/sqlite/debian/po/fr.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/fr.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -11,27 +11,28 @@
# or http://www.debian.org/intl/l10n/po-debconf/README-trans
#
# Developers do not need to manually edit POT or PO files.
-# Christian Perrier <bubulle at debian.org>, 2005.
#
+# Christian Perrier <bubulle at debian.org>, 2005, 2006.
msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
-"PO-Revision-Date: 2005-11-09 23:35+0100\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"PO-Revision-Date: 2006-06-18 10:58+0200\n"
"Last-Translator: Christian Perrier <bubulle 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-15\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-SourceCharset: iso-8859-1\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.2\n"
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:4
msgid "Will this server be used to access remote databases?"
msgstr ""
+"Ce serveur sera-t-il utilisé pour accéder à des bases de données distantes ?"
#. Type: boolean
#. Description
@@ -42,6 +43,12 @@
"database via dbconfig-common, the questions related to remote configuration "
"are asked with a priority such that they are skipped for most systems."
msgstr ""
+"Pour les gestionnaires de bases de données qui le permettent, dbconfig-"
+"common gère la configuration des bases de données sur des systèmes distants. "
+"Lorsque dbconfig-common crée des bases de données pour un paquet, les "
+"questions relatives à la configuration de bases de données distantes sont "
+"posées avec une priorité qui les rendra invisibles sur la plupart des "
+"systèmes."
#. Type: boolean
#. Description
@@ -51,13 +58,15 @@
"questions related to remote database configuration when you install new "
"packages."
msgstr ""
+"Si vous choisissez cette option, les questions relatives à la configuration "
+"de bases de données distantes vous seront posées lors de l'installation de "
+"nouveaux paquets."
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:4
-#, fuzzy
msgid "If you are unsure, you should not select this option."
-msgstr "Autrement, vous devriez choisir cette option."
+msgstr "Dans le doute, vous ne devriez pas choisir cette option."
#. Type: boolean
#. Description
@@ -149,35 +158,30 @@
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:53
-#, fuzzy
msgid "Re-install database for ${pkg}?"
-msgstr ""
-"Erreur lors de l'installation de la base de données pour ${pkg}. Action "
-"suivante :"
+msgstr "Faut-il réinstaller la base de données pour ${pkg} ?"
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:53
-#, fuzzy
msgid ""
"Since you are reconfiguring ${pkg}, you may also want to reinstall the "
"database which it uses."
msgstr ""
-"Comme vous supprimez ${pkg}, il est possible que vous ne vouliez plus "
-"utiliser la base de données qui lui était liée."
+"Comme vous reconfigurez ${pkg}, il est possible que vous vouliez réinstaller "
+"la base de données qu'il utilise."
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:53
-#, fuzzy
msgid ""
"If you wish to re-install the database for ${pkg}, you should select this "
"option. If you do not wish to do so (if you are reconfiguring the package "
"for unrelated reasons), you should not select this option."
msgstr ""
-"Si vous n'avez plus besoin des données enregistrées par ${pkg}, vous pouvez "
-"choisir cette option. Si vous souhaitez conserver ces données, ou si vous "
-"préférez gérer vous-même ce processus, vous pouvez refuser cette option."
+"Si vous souhaitez réinstaller la base de données de ${pkg}, vous "
+"devriezchoisir cette option. Dans le cas contraire, ou si vous reconfigurez "
+"le paquet pour d'autres raisons, ne la choisissez pas."
#. Type: boolean
#. Description
@@ -759,16 +763,16 @@
#. Type: password
#. Description
#: ../dbconfig-common.templates:305
-#, fuzzy
msgid ""
"If you are using \"ident\" based authentication, the supplied password will "
"not be used and can be left blank. Otherwise, PostgreSQL access may need to "
"be reconfigured to allow password-authenticated access."
msgstr ""
-"Veuillez indiquer un mot de passe pour ${pkg}, destiné à la connexion au "
-"serveur de base de données. Si vous laissez ce champ vide, un mot de passe "
-"aléatoire sera établi. L'accès à PostgreSQL nécessite peut-être une "
-"reconfiguration afin de permettre l'authentification par mot de passe."
+"Si vous utilisez l'authentification basée sur « ident », le mot de passe "
+"fourni ne sera pas utilisé et peut être laissé vide. Si vous ne souhaitez "
+"pas utiliser l'authentification basée sur « ident », l'accès à PostgreSQL "
+"nécessite peut-être une reconfiguration afin de permettre l'authentification "
+"par mot de passe."
#. Type: string
#. Description
@@ -1012,22 +1016,16 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL n'accepte pas les mots de passe vides."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "Tentative de récupération des réglages actuels"
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr "Tentative de récupération des réglages actuels"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"Le programme de configuration dbconfig-common va tenter de charger les "
-"réglages actuels de ${pkg}. Ces réglages seront ensuite validés et si leur "
-"chargement ou leur utilisation posent problème, ils vous seront demandés à "
-"nouveau."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "Le programme de configuration dbconfig-common va tenter de charger les "
+#~ "réglages actuels de ${pkg}. Ces réglages seront ensuite validés et si "
+#~ "leur chargement ou leur utilisation posent problème, ils vous seront "
+#~ "demandés à nouveau."
Modified: branches/sqlite/debian/po/it.po
===================================================================
--- branches/sqlite/debian/po/it.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/it.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: dbconfig-common 1.6\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2005-07-22 11:23+0200\n"
"Last-Translator: Giuseppe Sacco <eppesuig at debian.org>\n"
"Language-Team: italian <tp at lists.linux.it>\n"
@@ -960,25 +960,19 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL non permette le password vuote."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "dbconfig-common cercherà di carica le impostazioni esistenti"
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr "dbconfig-common cercherà di carica le impostazioni esistenti"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"dbconfig-common cercherà di caricare le impostazioni preesistenti per "
-"${pkg}. Successivamente queste impostazioni verranno controllate e se ci "
-"fossero dei problemi, anche durante il successivo utilizzo, verrà chiesto di "
-"modificarle successivamente."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "dbconfig-common cercherà di caricare le impostazioni preesistenti per "
+#~ "${pkg}. Successivamente queste impostazioni verranno controllate e se ci "
+#~ "fossero dei problemi, anche durante il successivo utilizzo, verrà chiesto "
+#~ "di modificarle successivamente."
#~ msgid ""
#~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
Modified: branches/sqlite/debian/po/nl.po
===================================================================
--- branches/sqlite/debian/po/nl.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/nl.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -15,9 +15,9 @@
msgstr ""
"Project-Id-Version: dbconfig-common\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
-"PO-Revision-Date: 2006-02-19 19:12+0100\n"
-"Last-Translator: Bart Cornelis <cobaco at linux.be>\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
+"PO-Revision-Date: 2006-07-03 14:59+0100\n"
+"Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\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-15\n"
@@ -29,6 +29,8 @@
#: ../dbconfig-common.templates:4
msgid "Will this server be used to access remote databases?"
msgstr ""
+"Zal deze server gebruikt worden om toegang te verkrijgen op databases op "
+"andere systemen?"
#. Type: boolean
#. Description
@@ -39,6 +41,11 @@
"database via dbconfig-common, the questions related to remote configuration "
"are asked with a priority such that they are skipped for most systems."
msgstr ""
+"Voor de databasetypes die dit toelaten ondersteund dbconfig-comon het "
+"instellen van databases op andere systemen. Tijdens de installatie van de "
+"databases van pakketten via dbconfig-common worden de vragen omtrent "
+"configureren van databases op andere systemen gesteld met een zodanige "
+"prioriteit dat ze op de meeste systemen overgeslagen worden."
#. Type: boolean
#. Description
@@ -48,13 +55,15 @@
"questions related to remote database configuration when you install new "
"packages."
msgstr ""
+"Als u deze optie kiest, dan wordt u bij het installeren van nieuwe pakketten "
+"standaard vragen gesteld omtrent de instelling van de databases op andere "
+"systemen. "
#. Type: boolean
#. Description
#: ../dbconfig-common.templates:4
-#, fuzzy
msgid "If you are unsure, you should not select this option."
-msgstr "Als u dit automatisch wilt laten doen dient u hier te aanvaarden."
+msgstr "Als u niet zeker bent, kunt u hier best weigeren."
#. Type: boolean
#. Description
@@ -1024,25 +1033,19 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL ondersteunt geen lege wachtwoorden."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "dbconfig-common zal proberen bestaande instellingen te laden"
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr "dbconfig-common zal proberen bestaande instellingen te laden"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"dbconfig-common zal nu proberen om de bestaande instellingen voor ${pkg} te "
-"laden. Later zullen deze instellingen worden geverifieerd. en als er een "
-"probleem is met het laden of gebruiken hiervan, zult u de mogelijkheid "
-"krijgen ze later opnieuw in te voeren."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "dbconfig-common zal nu proberen om de bestaande instellingen voor ${pkg} "
+#~ "te laden. Later zullen deze instellingen worden geverifieerd. en als er "
+#~ "een probleem is met het laden of gebruiken hiervan, zult u de "
+#~ "mogelijkheid krijgen ze later opnieuw in te voeren."
#~ msgid ""
#~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
Modified: branches/sqlite/debian/po/pt.po
===================================================================
--- branches/sqlite/debian/po/pt.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/pt.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: dbconfig-common 1.6\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2006-02-21 23:13+0000\n"
"Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -989,25 +989,19 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "O PostgreSQL não suporta passwords vazias."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "o dbconfig-common irá tentar carregar as definições existentes"
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr "o dbconfig-common irá tentar carregar as definições existentes"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"O dbconfig-common irá agora tentar carregar as definições pré-existentes de "
-"${pkg}. Posteriormente, estas definições serão validadas, e se existir "
-"qualquer problema ao carrega-las ou ao utiliza-las ser-lhe-á novamente dada "
-"a opção de as intrduzir."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "O dbconfig-common irá agora tentar carregar as definições pré-existentes "
+#~ "de ${pkg}. Posteriormente, estas definições serão validadas, e se "
+#~ "existir qualquer problema ao carrega-las ou ao utiliza-las ser-lhe-á "
+#~ "novamente dada a opção de as intrduzir."
#~ msgid ""
#~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
Modified: branches/sqlite/debian/po/pt_BR.po
===================================================================
--- branches/sqlite/debian/po/pt_BR.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/pt_BR.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: dbconfig-common 1.5.1\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2005-04-13 18:51-0300\n"
"Last-Translator: Gustavo Noronha Silva <kov at debian.org>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
@@ -965,22 +965,6 @@
msgid "PostgreSQL does not support empty passwords."
msgstr ""
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-
#~ msgid ""
#~ "To enable bootstrapping the PostgreSQL database for ${pkg}, the "
#~ "configuration of PostgreSQL has to be changed. It is suggested that this "
Modified: branches/sqlite/debian/po/sv.po
===================================================================
--- branches/sqlite/debian/po/sv.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/sv.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: dbconfig-common 1.8.5\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2005-12-01 22:10+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -973,23 +973,17 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL har inte stöd för blanka lösenord."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr ""
-"dbconfig-common kommer att försöka att läsa in existerande inställningar"
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr ""
+#~ "dbconfig-common kommer att försöka att läsa in existerande inställningar"
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"dbconfig-common kommer nu att försöka läsa in redan existerande "
-"inställningar för ${pkg}. Senare kommer dessa inställningar att valideras "
-"och om det är några problem med inläsning eller användning av dom, kommer du "
-"få möjligheten att ange dom igen senare."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "dbconfig-common kommer nu att försöka läsa in redan existerande "
+#~ "inställningar för ${pkg}. Senare kommer dessa inställningar att "
+#~ "valideras och om det är några problem med inläsning eller användning av "
+#~ "dom, kommer du få möjligheten att ange dom igen senare."
Modified: branches/sqlite/debian/po/templates.pot
===================================================================
--- branches/sqlite/debian/po/templates.pot 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/templates.pot 2006-08-09 12:26:26 UTC (rev 291)
@@ -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: 2006-06-17 19:42+1200\n"
+"Report-Msgid-Bugs-To: seanius at debian.org\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\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"
@@ -823,19 +815,3 @@
#: ../dbconfig-common.templates:422
msgid "PostgreSQL does not support empty passwords."
msgstr ""
-
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
Modified: branches/sqlite/debian/po/vi.po
===================================================================
--- branches/sqlite/debian/po/vi.po 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/po/vi.po 2006-08-09 12:26:26 UTC (rev 291)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: dbconfig-common 1.8.5\n"
"Report-Msgid-Bugs-To: seanius at debian.org\n"
-"POT-Creation-Date: 2006-06-17 19:42+1200\n"
+"POT-Creation-Date: 2006-08-01 22:33-0700\n"
"PO-Revision-Date: 2005-12-05 15:20+1030\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -970,21 +970,15 @@
msgid "PostgreSQL does not support empty passwords."
msgstr "PostgreSQL không há»— trợ máºt khẩu rá»—ng."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid "dbconfig-common will attempt to load existing settings"
-msgstr "Trình dbconfig-common sẽ cố tải thiết láºp đã có."
+#~ msgid "dbconfig-common will attempt to load existing settings"
+#~ msgstr "Trình dbconfig-common sẽ cố tải thiết láºp đã có."
-#. Type: note
-#. Description
-#: ../dbconfig-common.templates:426
-msgid ""
-"dbconfig-common will now attempt to load the pre-existing settings of "
-"${pkg}. Later, these settings will be validated, and if there is any "
-"problem with loading or using them you will be given the option to enter "
-"them again later."
-msgstr ""
-"Trình dbconfig-common sẽ ngay bây giá» cố tải các thiết láºp « ${pkg} » đã có. "
-"Sau nà y, các thiết láºp nà y sẽ được hợp lệ hóa, và nếu gặp lá»—i nà o khi tải "
-"hoặc sá» dụng chúng, bạn sẽ có dịp nháºp lại chúng lần sau."
+#~ msgid ""
+#~ "dbconfig-common will now attempt to load the pre-existing settings of "
+#~ "${pkg}. Later, these settings will be validated, and if there is any "
+#~ "problem with loading or using them you will be given the option to enter "
+#~ "them again later."
+#~ msgstr ""
+#~ "Trình dbconfig-common sẽ ngay bây giá» cố tải các thiết láºp « ${pkg} » đã "
+#~ "có. Sau nà y, các thiết láºp nà y sẽ được hợp lệ hóa, và nếu gặp lá»—i nà o khi "
+#~ "tải hoặc sá» dụng chúng, bạn sẽ có dịp nháºp lại chúng lần sau."
Modified: branches/sqlite/debian/rules
===================================================================
--- branches/sqlite/debian/rules 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/debian/rules 2006-08-09 12:26:26 UTC (rev 291)
@@ -20,7 +20,7 @@
build: build-stamp
- make -C doc
+ if test -z "$$dbc_debug"; then make -C doc; fi
build-stamp: configure-stamp
dh_testdir
@@ -39,7 +39,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- dh_installdocs
+ if test -z "$$dbc_debug"; then dh_installdocs; fi
debian/credit-xlators > ${DOC}/TRANSLATORS
install -m 644 AFL debian/dbconfig-common/usr/share/doc/dbconfig-common/
mkdir -p debian/dbconfig-common/etc/dbconfig-common
@@ -47,7 +47,11 @@
cp -Pr internal debian/dbconfig-common/usr/share/dbconfig-common/
cp -P dbconfig-generate-include debian/dbconfig-common/usr/sbin/
cp -P dbconfig-load-include debian/dbconfig-common/usr/sbin/
+ mkdir -p debian/dbconfig-common/usr/share/lintian/overrides
+ cp -a debian/dbconfig-common.lintian \
+ debian/dbconfig-common/usr/share/lintian/overrides/dbconfig-common
+
# Build architecture-independent files here.
binary-indep: build install
Modified: branches/sqlite/doc/dbconfig-common.sgml
===================================================================
--- branches/sqlite/doc/dbconfig-common.sgml 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/doc/dbconfig-common.sgml 2006-08-09 12:26:26 UTC (rev 291)
@@ -347,6 +347,32 @@
# ... rest of your code ...
</example>
+ <sect1 id="frontends">Packages that connect to but should not create databases (read-only frontends)
+ <p>
+ some packages provide multiple frontend packages
+ to a single backend package. furthermore, sometimes these
+ frontend packages are installed on a seperate system from
+ the actual database application, and should not manage the
+ databases on their own.
+
+ <p>
+ for example, if the frontend were to be installed
+ on multiple servers (perhaps load balancing
+ or similar), it would not be wise to attempt
+ to install/upgrade the database on each client. instead,
+ it would be wiser to simply prompt for the information and
+ leave the database management to the single central package.
+
+ <p>
+ if the above scenario matches one of
+ your packages, there are a seperate
+ set of maintainer hooks for you to use.
+ for example, <file>frontend.config</file>
+ or <file>frontend.config.mysql</file>. using these
+ hooks, <package>dbconfig-common</package> will know enough
+ to not take any actions apart from prompting the local
+ administrator for the pertinent information.
+
<sect1 id="defaults">Hinting defaults and advanced control of configuration/installation
<p>
<package>dbconfig-common</package> has a set of pre-defined default
Modified: branches/sqlite/dpkg/common
===================================================================
--- branches/sqlite/dpkg/common 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/dpkg/common 2006-08-09 12:26:26 UTC (rev 291)
@@ -31,7 +31,7 @@
### some internal variables
###
# templates common to all database types
- dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove dbconfig-reinstall password-confirm app-password-confirm purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error import-oldsettings internal/reconfiguring"
+ dbc_standard_templates="database-type dbconfig-install dbconfig-upgrade dbconfig-remove dbconfig-reinstall password-confirm app-password-confirm purge upgrade-backup passwords-do-not-match install-error upgrade-error remove-error internal/reconfiguring"
# templates common to mysql database types
dbc_mysql_templates="mysql/method remote/host remote/newhost mysql/app-pass mysql/admin-user mysql/admin-pass remote/port db/dbname db/app-user"
@@ -143,6 +143,17 @@
;;
esac
+ # but if this is a frontend-only app, reset some of the above to noops
+ if [ "$dbc_frontend" ]; then
+ dbc_createuser_cmd=true
+ dbc_checkuser_cmd=true
+ dbc_createdb_cmd=true
+ dbc_dropdb_cmd=true
+ dbc_dropuser_cmd=true
+ dbc_sqlexec_cmd=true
+ dbc_sqlfile_cmd=true
+ dbc_dump_cmd=true
+ fi
}
@@ -339,6 +350,24 @@
fi
;;
esac
+
+ if [ "$dbc_debug" ]; then
+ dbc_debug "settings determined from dbc_read_package_debconf:"
+ dbc_debug "\tdbc_install=$dbc_install"
+ dbc_debug "\tdbc_upgrade=$dbc_upgrade"
+ dbc_debug "\tdbc_remove=$dbc_remove"
+ dbc_debug "\tdbc_dbtype=$dbc_dbtype"
+ dbc_debug "\tdbc_dbuser=$dbc_dbuser"
+ dbc_debug "\tdbc_dbpass=$dbc_dbpass"
+ dbc_debug "\tdbc_dbadmin=$dbc_dbadmin"
+ dbc_debug "\tdbc_dbadmpass=$dbc_dbadmpass"
+ dbc_debug "\tdbc_dbserver=$dbc_dbserver"
+ dbc_debug "\tdbc_dbport=$dbc_dbport"
+ dbc_debug "\tdbc_dbname=$dbc_dbname"
+ dbc_debug "\tdbc_authmethod_admin=$dbc_authmethod_admin"
+ dbc_debug "\tdbc_authmethod_user=$dbc_authmethod_user"
+ dbc_debug "\tdbc_ssl=$dbc_ssl"
+ fi
}
###
Modified: branches/sqlite/dpkg/config
===================================================================
--- branches/sqlite/dpkg/config 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/dpkg/config 2006-08-09 12:26:26 UTC (rev 291)
@@ -3,7 +3,7 @@
###
dbc_go(){
- local f db happy default_dbtype host newhost port oldhosts authmethod_admin do_config _preconf_list _s _t STATEiformat ifile install_question
+ local f db happy default_dbtype host newhost port oldhosts authmethod_admin do_config _preconf_list _s _t STATE iformat ifile install_question migrating userdb_prio
. /usr/share/dbconfig-common/dpkg/common
dbc_debug "(config) dbc_go() $@"
@@ -26,6 +26,30 @@
dbc_read_package_config
dbc_preseed_package_debconf
+ # check out if they're migrating from a non-dbc version
+ if [ "$dbc_oldversion" ] && [ "$dbc_first_version" ] && \
+ dpkg --compare-versions "$dbc_first_version" gt "$dbc_oldversion"; then
+ migrating="yes"
+ fi
+
+ # if this is a frontend app, then the user/db type questions get
+ # a raised priority
+ userdb_prio="low"
+ if [ "$dbc_frontend" ]; then
+ userdb_prio="medium"
+ need_adminpw="false"
+ else
+ userdb_prio="low"
+ fi
+
+ # and if they're upgrading from any previous version, we *may*
+ # not need to ask for an admin password. we can't tell at this
+ # point because the upgrade files are likely not unpacked at
+ # this point, so we will instead ask later in the postinst.
+ if [ "$dbc_oldversion" ]; then
+ need_adminpw="false"
+ fi
+
# the first question we ask will differ depending on how we're invoked
if [ "$dbc_command" = "configure" ]; then
install_question="$dbc_package/dbconfig-install"
@@ -38,7 +62,14 @@
fi
# and start our beautiful state-machine
- STATE=1
+ # we start in STATE=1 (install_question) in all but two situations:
+ # - we're migrating from a previous non-dbc version
+ # - we're installing a frontend/readonly app
+ if [ ! "$migrating" ] && [ ! "$dbc_frontend" ]; then
+ STATE=1
+ else
+ STATE=2
+ fi
while true; do
case "$STATE" in
# state 1 - ask if they want our help at all
@@ -57,25 +88,36 @@
##
## start new dbc upgrade section
##
+ # if there is a previously existing version already installed
+ # *and* the maintainer has provided the first version that used
+ # dbconfig-common *and* this version is newer than the
+ # previously installed version... do the dbc import stuff.
+ if [ "$migrating" ]; then
+ # if dbc_load_include is set, determine the format
+ # and location of the old config file
+ if [ "$dbc_load_include" ]; then
+ iformat=`echo $dbc_load_include | cut -d: -f1`
+ ifile=`echo $dbc_load_include | cut -d: -f2-`
+ fi
- # if dbc_load_include is set but the file doesn't exist
- # then let's silently exit because that would imply
- # we're running before the file is from the latest
- # version of the package which has not yet been unpacked
- if [ "$dbc_load_include" ]; then
- iformat=`echo $dbc_load_include | cut -d: -f1`
- ifile=`echo $dbc_load_include | cut -d: -f2-`
- fi
-
- if dpkg --compare-versions "$dbc_first_version" gt "$dbc_oldversion"; then
##
## if they want to import settings from a previous
## non-dbc version, do that and mark the questions
## skipped
##
- if [ "$dbc_load_include" ] && [ -f "$ifile" ]; then
- db_input high $dbc_package/import-oldsettings || true
+ if [ "$ifile" ] && [ -f "$ifile" ]; then
+ dbc_logpart "migrating old settings into dbconfig-common: "
+ if [ "$dbc_debug" ]; then
+ dbc_debug "dbconfig-load-include $dbc_load_include_args -f $iformat $ifile"
+ dbconfig-load-include $dbc_load_include_args -f $iformat $ifile
+ fi
eval `dbconfig-load-include $dbc_load_include_args -f $iformat $ifile`
+ # if the dbtype is hardcoded, reset it no matter what
+ # dbconfig-load-include tells us
+ if [ "$dbc_hardcoded_dbtype" ]; then
+ dbc_dbtype="$dbc_hardcoded_dbtype"
+ fi
+
for f in database-type $dbc_dbtype/method db/dbname; do
db_fset $dbc_package/$f seen true || true
done
@@ -92,11 +134,17 @@
db_fset $dbc_package/$f seen true || true
done
db_set $dbc_package/remote/host "$dbc_dbserver"
+ db_set $dbc_package/remote/newhost "$dbc_dbserver"
db_set $dbc_package/remote/port "$dbc_dbport"
+ if [ "$dbc_dbserver" ]; then
+ db_set $dbc_package/$dbc_dbtype/method "tcp/ip"
+ fi
fi
db_set $dbc_package/database-type $dbc_dbtype
db_set $dbc_package/db/dbname "$dbc_dbname"
+
+ dbc_logline "done"
fi
fi
@@ -298,7 +346,7 @@
;;
# state 7 - pgsql specific auth stuff, part 1
7)
- if [ "$dbc_dbtype" = "pgsql" ]; then
+ if [ "$dbc_dbtype" = "pgsql" ] && [ ! "$dbc_frontend" ]; then
# postgresql provides multiple auth types, and ssl
# get the admin auth method
db_input low $dbc_package/pgsql/authmethod-admin || true
@@ -306,7 +354,7 @@
;;
# state 8 - pgsql auth stuff, part 2
8)
- if [ "$dbc_dbtype" = "pgsql" ]; then
+ if [ "$dbc_dbtype" = "pgsql" ] && [ ! "$dbc_frontend" ]; then
db_get $dbc_package/pgsql/authmethod-admin && authmethod_admin="$RET"
# if we are using ident, we don't need passwords
if [ "$authmethod_admin" = "ident" ]; then
@@ -324,14 +372,14 @@
9)
if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
- # who's the admin user (is there any reason to even ask this?)
- # TODO: should there be a difference between the local and
- # remote admin?
- db_input low $dbc_package/$dbc_dbtype/admin-user || true
- if [ "$need_adminpw" != "false" ]; then
- dbc_get_admin_pass
+ # who's the admin user
+ if [ ! "$dbc_frontend" ]; then
+ db_input $userdb_prio $dbc_package/$dbc_dbtype/admin-user || true
+ if [ "$need_adminpw" != "false" ]; then
+ dbc_get_admin_pass
+ fi
fi
- db_input low $dbc_package/db/app-user || true
+ db_input $userdb_prio $dbc_package/db/app-user || true
dbc_get_app_pass
fi
@@ -344,7 +392,7 @@
fi
# get the name of the database to use
- db_input low $dbc_package/db/dbname || true
+ db_input $userdb_prio $dbc_package/db/dbname || true
;;
# * - end state
*)
Copied: branches/sqlite/dpkg/frontend.config (from rev 287, trunk/dpkg/frontend.config)
Copied: branches/sqlite/dpkg/frontend.config.mysql (from rev 287, trunk/dpkg/frontend.config.mysql)
Copied: branches/sqlite/dpkg/frontend.config.pgsql (from rev 287, trunk/dpkg/frontend.config.pgsql)
Copied: branches/sqlite/dpkg/frontend.postinst (from rev 287, trunk/dpkg/frontend.postinst)
Copied: branches/sqlite/dpkg/frontend.postinst.mysql (from rev 287, trunk/dpkg/frontend.postinst.mysql)
Copied: branches/sqlite/dpkg/frontend.postinst.pgsql (from rev 287, trunk/dpkg/frontend.postinst.pgsql)
Copied: branches/sqlite/dpkg/frontend.postrm (from rev 287, trunk/dpkg/frontend.postrm)
Copied: branches/sqlite/dpkg/frontend.postrm.mysql (from rev 287, trunk/dpkg/frontend.postrm.mysql)
Copied: branches/sqlite/dpkg/frontend.postrm.pgsql (from rev 287, trunk/dpkg/frontend.postrm.pgsql)
Copied: branches/sqlite/dpkg/frontend.preinst (from rev 287, trunk/dpkg/frontend.preinst)
Copied: branches/sqlite/dpkg/frontend.preinst.mysql (from rev 287, trunk/dpkg/frontend.preinst.mysql)
Copied: branches/sqlite/dpkg/frontend.preinst.pgsql (from rev 287, trunk/dpkg/frontend.preinst.pgsql)
Copied: branches/sqlite/dpkg/frontend.prerm (from rev 287, trunk/dpkg/frontend.prerm)
Copied: branches/sqlite/dpkg/frontend.prerm.mysql (from rev 287, trunk/dpkg/frontend.prerm.mysql)
Copied: branches/sqlite/dpkg/frontend.prerm.pgsql (from rev 287, trunk/dpkg/frontend.prerm.pgsql)
Modified: branches/sqlite/dpkg/postinst
===================================================================
--- branches/sqlite/dpkg/postinst 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/dpkg/postinst 2006-08-09 12:26:26 UTC (rev 291)
@@ -2,7 +2,7 @@
### load up common variables and functions
###
dbc_go(){
- local prev_dbc_upgrade importing_from_non_dbc upgrading reconfiguring f tsubstfile upgrades_pending dumpfile _dbc_asuser reinstall
+ local importing_from_non_dbc upgrading reconfiguring f tsubstfile upgrades_pending dumpfile _dbc_asuser reinstall
. /usr/share/dbconfig-common/dpkg/common
dbc_debug "(postinst) dbc_go() $@"
@@ -139,7 +139,6 @@
# if there are any upgrades to be applied
if [ "$upgrades_pending" ]; then
# ask if they want our help in the process at all
- prev_dbc_upgrade="$dbc_upgrade"
db_set $dbc_package/dbconfig-upgrade $dbc_upgrade
db_fset $dbc_package/dbconfig-upgrade seen false
db_input high $dbc_package/dbconfig-upgrade || true
@@ -149,9 +148,12 @@
# and if they don't want our help, we'll go away
if [ "$dbc_upgrade" != "true" ]; then return 0; fi
- ###
- ### perform a few sanity checks on the data
- ###
+ # get the admin password if it's needed
+ if [ ! "$dbc_frontend" ]; then
+ if [ ! "$dbc_dbtype" = "pgsql" ] || [ ! "$dbc_authmethod_admin" = "ident" ]; then
+ dbc_get_admin_pass
+ fi
+ fi
# this is the file into which upgrade backups go
dumpfile=/var/cache/dbconfig-common/backups/${dbc_package}_${dbc_oldversion}.$dbc_dbtype
Modified: branches/sqlite/dpkg/prerm
===================================================================
--- branches/sqlite/dpkg/prerm 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/dpkg/prerm 2006-08-09 12:26:26 UTC (rev 291)
@@ -22,7 +22,7 @@
need_admin_pw=""
fi
- if [ "$dbc_command" = "remove" ]; then
+ if [ "$dbc_command" = "remove" ] && [ ! "$dbc_frontend" ]; then
###
### ask the admin if we should help with removal
###
Modified: branches/sqlite/examples/README
===================================================================
--- branches/sqlite/examples/README 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/examples/README 2006-08-09 12:26:26 UTC (rev 291)
@@ -13,10 +13,21 @@
setup code, the information is gathered and passed to a
maintainer-provided or upstream-provided script.
+- db-test-mysql-frontend
+
+ a "read-only frontend" package. this package prompts for all the
+ pertinent information, but performs no database-modifying actions.
+
- db-test-pgsql
like db-test-mysql, but for applications that work with postgres.
+- db-test-pgsql-migration
+
+ the same as above, but provided with a "1.9" version that doesn't
+ use dbconfig-common, which illustrates how in the "2.0" version
+ dbconfig-common can migrate previously existing settings.
+
- db-test-multidbtype
this package shows how dbconfig-common can be used to configure
Modified: branches/sqlite/examples/buildpackages.sh
===================================================================
--- branches/sqlite/examples/buildpackages.sh 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/examples/buildpackages.sh 2006-08-09 12:26:26 UTC (rev 291)
@@ -1,7 +1,9 @@
#!/bin/sh
-packages="db-test-mysql-2.0 db-test-mysql-2.1 db-test-mysql-perl-2.0 \
- db-test-pgsql-2.0 db-test-sqlite-2.0 db-test-multidbtype-2.0"
+packages="db-test-mysql-2.0 db-test-mysql-2.1 db-test-mysql-frontend-2.0 \
+ db-test-mysql-perl-2.0 db-test-pgsql-2.0 \
+ db-test-pgsql-migration-1.9 db-test-pgsql-migration-2.0 \
+ db-test-multidbtype-2.0 db-test-sqlite-2.0 "
echo -n "building packages:"
for f in $packages; do
Copied: branches/sqlite/examples/db-test-mysql-frontend-2.0 (from rev 287, trunk/examples/db-test-mysql-frontend-2.0)
Copied: branches/sqlite/examples/db-test-pgsql-migration-1.9 (from rev 287, trunk/examples/db-test-pgsql-migration-1.9)
Copied: branches/sqlite/examples/db-test-pgsql-migration-2.0 (from rev 287, trunk/examples/db-test-pgsql-migration-2.0)
Modified: branches/sqlite/internal/common
===================================================================
--- branches/sqlite/internal/common 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/internal/common 2006-08-09 12:26:26 UTC (rev 291)
@@ -11,7 +11,7 @@
dbc_logpart(){
# for the time being, at least, let's default to verbose
#if [ "$dbc_debug" ]; then
- echo -n "$@ " > /dev/stderr
+ echo -ne "$@ " > /dev/stderr
#fi
if [ "$dbc_log" ]; then
dbc_log="$dbc_log $@"
@@ -26,7 +26,7 @@
dbc_logline(){
# for the time being, at least, let's default to verbose
#if [ "$dbc_debug" ]; then
- echo "$@." > /dev/stderr
+ echo -e "$@." > /dev/stderr
#fi
if [ "$dbc_log" ]; then
dbc_log="$dbc_log $@."
Modified: branches/sqlite/internal/pgsql
===================================================================
--- branches/sqlite/internal/pgsql 2006-08-09 11:58:18 UTC (rev 290)
+++ branches/sqlite/internal/pgsql 2006-08-09 12:26:26 UTC (rev 291)
@@ -42,16 +42,14 @@
}
_dbc_psql_cmd_setup(){
- local localuser method remoteuser remotepass
+ local localuser remoteuser remotepass
localuser=`_dbc_psql_local_username`
remoteuser=`_dbc_psql_remote_username`
_dbc_pgsql_tmpdir=`mktemp -dt dbconfig-common.psql_home.XXXXXX`
if [ $? -ne 0 ]; then return 1; fi
if [ "$remoteuser" = "$dbc_dbadmin" ]; then
- method="$dbc_authmethod_admin"
remotepass="$dbc_dbadmpass"
else
- method="$dbc_authmethod_user"
remotepass="$dbc_dbpass"
fi
touch "${_dbc_pgsql_tmpdir}/.pgpass"
@@ -64,6 +62,26 @@
fi
}
+_dbc_psql_cmd_args(){
+ local extra remoteuser
+
+ # if a dbserver is specified, use it
+ if [ "$dbc_dbserver" ]; then
+ extra="-h '$dbc_dbserver'";
+ # but if they specify a password, we should add the host explictly too
+ elif [ "$_dbc_asuser" ] && [ "$dbc_dbpass" ]; then
+ extra="-h localhost";
+ elif [ "$dbc_dbadmpass" ]; then
+ extra="-h localhost";
+ fi
+ # add port settings if nonempty
+ if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
+ # determine the database user name
+ extra="$extra -U '`_dbc_psql_remote_username`'"
+
+ echo $extra
+}
+
_dbc_psql_cmd_cleanup(){
if [ "$_dbc_pgsql_tmpdir" -a -d "$_dbc_pgsql_tmpdir" ]; then
rm -f ${_dbc_pgsql_tmpdir}/.pgpass
@@ -72,16 +90,14 @@
}
_dbc_psql(){
- local extra retval PGSSLMODE localuser remoteuser
+ local extra retval PGSSLMODE localuser
localuser=`_dbc_psql_local_username`
- remoteuser=`_dbc_psql_remote_username`
PGSSLMODE="prefer"
retval=0
_dbc_psql_cmd_setup
- extra="$extra -U '$remoteuser'"
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
- if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
- if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
+ extra=`_dbc_psql_cmd_args`
+ dbc_debug "su -s /bin/sh $localuser -c \"env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' psql --set \"ON_ERROR_STOP=1\" -q $extra $*\" 2>&1"
dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' psql --set "ON_ERROR_STOP=1" -q $extra $*" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
@@ -94,9 +110,7 @@
retval=0
_dbc_psql_cmd_setup
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
- if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
- if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
+ extra=`_dbc_psql_cmd_args`
if [ "$dbc_pgsql_createdb_encoding" ]; then
extrasql=" WITH ENCODING = '$dbc_pgsql_createdb_encoding'";
fi
@@ -114,9 +128,8 @@
retval=0
_dbc_psql_cmd_setup
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
- if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
- if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
+ extra=`_dbc_psql_cmd_args`
+ dbc_debug "su -s /bin/sh $localuser -c \"env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' dropdb -q $extra $*\" 2>&1"
dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' dropdb -q $extra $*" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
@@ -133,9 +146,7 @@
retval=0
_dbc_psql_cmd_setup
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
- if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
- if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
+ extra=`_dbc_psql_cmd_args`
dbc_dbname="template1"
_dbc_pgsql_exec_command "CREATE USER \"$dbc_dbuser\" WITH PASSWORD '$dbc_dbpass'" || retval=$?
_dbc_psql_cmd_cleanup
@@ -149,9 +160,8 @@
retval=0
_dbc_psql_cmd_setup
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
- if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
- if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
+ extra=`_dbc_psql_cmd_args`
+ dbc_debug "su -s /bin/sh $localuser -c \"env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' dropuser -q $extra $*\" 2>&1"
dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' dropuser -q $extra $*" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
@@ -167,9 +177,8 @@
retval=0
_dbc_psql_cmd_setup
if [ "$dbc_ssl" ]; then PGSSLMODE="require"; fi
- if [ "$dbc_dbserver" ]; then extra="$extra -h '$dbc_dbserver'"; fi
- if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
- if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
+ extra=`_dbc_psql_cmd_args`
+ dbc_debug "su -s /bin/sh $localuser -c \"env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' pg_dump $extra $dbc_dbname\" 2>&1"
dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGPASSFILE='$_dbc_pgsql_tmpdir/.pgpass' PGSSLMODE='$PGSSLMODE' pg_dump $extra $dbc_dbname" 2>&1` || retval=$?
_dbc_psql_cmd_cleanup
return $retval
@@ -180,7 +189,6 @@
##
_dbc_pgsql_check_connect(){
local constat extra _dbc_asuser
- if [ "$dbc_dbadmin" ]; then extra="-U '$dbc_dbadmin'"; fi
constat="bad"
if ! _dbc_psql $extra template1 < /dev/null; then
dbc_logline "unable to connect to postgresql server"
@@ -232,7 +240,6 @@
_dbc_pgsql_check_database(){
local dbc_dbname _dbc_asuser extra
dbc_dbname=$1
- if [ "$dbc_dbadmin" ]; then extra="-U '$dbc_dbadmin'"; fi
_dbc_psql $extra $dbc_dbname </dev/null 2>/dev/null
return $?
}
@@ -246,7 +253,6 @@
dbc_pgsql_check_user(){
local dbc_dbname l_retval _dbc_asuser extra
dbc_dbname="template1"
- if [ "$dbc_dbadmin" ]; then extra="-U '$dbc_dbadmin'"; fi
_dbc_pgsql_exec_command "ALTER USER \"$dbc_dbuser\""
l_retval=$?
return $l_retval
More information about the Dbconfig-common-changes
mailing list