[Dbconfig-common-changes] [dbconfig-common] r462 - in trunk: debian debian/po doc examples/db-test-multidbtype-2.0/debian examples/db-test-mysql-2.0/debian examples/db-test-mysql-2.1/debian examples/db-test-mysql-frontend-2.0/debian examples/db-test-mysql-perl-2.0/debian examples/db-test-pgsql-2.0/debian examples/db-test-pgsql-migration-1.9/debian examples/db-test-pgsql-migration-2.0/debian internal
Sean Finney
seanius at alioth.debian.org
Mon Sep 8 16:35:53 UTC 2008
tags 498226 pending
thanks
Author: seanius
Date: 2008-09-08 16:35:53 +0000 (Mon, 08 Sep 2008)
New Revision: 462
Modified:
trunk/debian/changelog
trunk/debian/po/nl.po
trunk/doc/dbconfig-common.sgml
trunk/examples/db-test-multidbtype-2.0/debian/control
trunk/examples/db-test-mysql-2.0/debian/control
trunk/examples/db-test-mysql-2.1/debian/control
trunk/examples/db-test-mysql-frontend-2.0/debian/control
trunk/examples/db-test-mysql-perl-2.0/debian/control
trunk/examples/db-test-pgsql-2.0/debian/control
trunk/examples/db-test-pgsql-migration-1.9/debian/control
trunk/examples/db-test-pgsql-migration-2.0/debian/control
trunk/internal/common
Log:
fixes for #498226
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/debian/changelog 2008-09-08 16:35:53 UTC (rev 462)
@@ -1,8 +1,12 @@
dbconfig-common (1.8.40) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * Fixes from Thijs Kinkhorst:
+ - fix for spelling error in debian/po/nl.po
+ - fix for typo in internal/common
+ - update documentation and examples to be more explicit about dependencies,
+ recommends, and suggests (closes: #498226).
- -- Sean Finney <seanius at debian.org> Sat, 05 Jul 2008 01:20:22 +0200
+ -- Sean Finney <seanius at debian.org> Mon, 08 Sep 2008 18:36:54 +0200
dbconfig-common (1.8.39) unstable; urgency=high
Modified: trunk/debian/po/nl.po
===================================================================
--- trunk/debian/po/nl.po 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/debian/po/nl.po 2008-09-08 16:35:53 UTC (rev 462)
@@ -382,7 +382,7 @@
"help, this was the error encountered:"
msgstr ""
"Er is een fout opgetreden tijdens het opwaarderen van de database. Mocht u "
-"geïnteresseerd zijnj, dit is de tegengekomen foutmelding:"
+"geïnteresseerd zijn, dit is de tegengekomen foutmelding:"
#. Type: select
#. Description
Modified: trunk/doc/dbconfig-common.sgml
===================================================================
--- trunk/doc/dbconfig-common.sgml 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/doc/dbconfig-common.sgml 2008-09-08 16:35:53 UTC (rev 462)
@@ -75,6 +75,12 @@
creation, upgrade/remove/purge logic, et c. after all,
the goal of <package>dbconfig-common</package> is to make life easier for
both the local admin <em>and</em> the package maintainer :)
+ <sect1 id="depends">update package dependencies
+ <p>
+ Your package needs to depend on <package>dbconfig-common</package>.
+ Also you should add Recommends for the command line client packages
+ of the database types you support, e.g. <package>mysql-client</package> or
+ <package>postgresql-client</package>.
<sect1 id="hooks">putting hooks into the maintainer scripts
<p>
in the <var>config</var>, <var>postinst</var>,
Modified: trunk/examples/db-test-multidbtype-2.0/debian/control
===================================================================
--- trunk/examples/db-test-multidbtype-2.0/debian/control 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/examples/db-test-multidbtype-2.0/debian/control 2008-09-08 16:35:53 UTC (rev 462)
@@ -8,7 +8,8 @@
Package: db-test-multidbtype
Architecture: all
Depends: dbconfig-common
-Recommends: mysql-server | postgresql
+Recommends: mysql-client | postgresql-client | sqlite | sqlite3
+Suggests: mysql-server | postgresql
Description: a package to test dbconfig-common (generic version)
this is a package to test the dbconfig-common package.
.
Modified: trunk/examples/db-test-mysql-2.0/debian/control
===================================================================
--- trunk/examples/db-test-mysql-2.0/debian/control 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/examples/db-test-mysql-2.0/debian/control 2008-09-08 16:35:53 UTC (rev 462)
@@ -8,7 +8,8 @@
Package: db-test-mysql
Architecture: all
Depends: dbconfig-common
-Recommends: mysql-server
+Recommends: mysql-client
+Suggests: mysql-server
Description: a package to test dbconfig-common (mysql version)
this is a package to test the dbconfig-common package.
.
Modified: trunk/examples/db-test-mysql-2.1/debian/control
===================================================================
--- trunk/examples/db-test-mysql-2.1/debian/control 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/examples/db-test-mysql-2.1/debian/control 2008-09-08 16:35:53 UTC (rev 462)
@@ -8,7 +8,8 @@
Package: db-test-mysql
Architecture: all
Depends: dbconfig-common
-Recommends: mysql-server
+Recommends: mysql-client
+Suggests: mysql-server
Description: a package to test dbconfig-common (mysql version)
this is a package to test the dbconfig-common package.
.
Modified: trunk/examples/db-test-mysql-frontend-2.0/debian/control
===================================================================
--- trunk/examples/db-test-mysql-frontend-2.0/debian/control 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/examples/db-test-mysql-frontend-2.0/debian/control 2008-09-08 16:35:53 UTC (rev 462)
@@ -8,7 +8,8 @@
Package: db-test-mysql-frontend
Architecture: all
Depends: dbconfig-common
-Recommends: mysql-server
+Recommends: mysql-client
+Suggests: mysql-server
Description: a package to test dbconfig-common (mysql version)
this is a package to test the dbconfig-common package.
.
Modified: trunk/examples/db-test-mysql-perl-2.0/debian/control
===================================================================
--- trunk/examples/db-test-mysql-perl-2.0/debian/control 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/examples/db-test-mysql-perl-2.0/debian/control 2008-09-08 16:35:53 UTC (rev 462)
@@ -8,7 +8,8 @@
Package: db-test-mysql-perl
Architecture: all
Depends: dbconfig-common, libdbd-mysql-perl
-Recommends: mysql-server
+Recommends: mysql-client
+Suggests: mysql-server
Description: a package to test dbconfig-common (mysql+perl version)
this is a package to test the dbconfig-common package.
.
Modified: trunk/examples/db-test-pgsql-2.0/debian/control
===================================================================
--- trunk/examples/db-test-pgsql-2.0/debian/control 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/examples/db-test-pgsql-2.0/debian/control 2008-09-08 16:35:53 UTC (rev 462)
@@ -7,8 +7,9 @@
Package: db-test-pgsql
Architecture: all
-Recommends: postgresql
Depends: dbconfig-common
+Recommends: postgresql-client
+Suggests: postgresql
Description: a package to test dbconfig-common (pgsql version)
this is a package to test the dbconfig-common package.
.
Modified: trunk/examples/db-test-pgsql-migration-1.9/debian/control
===================================================================
--- trunk/examples/db-test-pgsql-migration-1.9/debian/control 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/examples/db-test-pgsql-migration-1.9/debian/control 2008-09-08 16:35:53 UTC (rev 462)
@@ -7,7 +7,8 @@
Package: db-test-pgsql-migration
Architecture: all
-Recommends: postgresql
+Recommends: postgresql-client
+Suggests: postgresql
Description: a package to test dbconfig-common (migration version)
this is a package to test the dbconfig-common package.
.
Modified: trunk/examples/db-test-pgsql-migration-2.0/debian/control
===================================================================
--- trunk/examples/db-test-pgsql-migration-2.0/debian/control 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/examples/db-test-pgsql-migration-2.0/debian/control 2008-09-08 16:35:53 UTC (rev 462)
@@ -7,8 +7,9 @@
Package: db-test-pgsql-migration
Architecture: all
-Recommends: postgresql
Depends: dbconfig-common
+Recommends: postgresql-client
+Suggests: postgresql
Description: a package to test dbconfig-common (migration version)
this is a package to test the dbconfig-common package.
.
Modified: trunk/internal/common
===================================================================
--- trunk/internal/common 2008-07-04 23:22:49 UTC (rev 461)
+++ trunk/internal/common 2008-09-08 16:35:53 UTC (rev 462)
@@ -135,7 +135,7 @@
"mysql"|"psql"|"sqlite"|"sqlite3")
if ! _dbc_detect_installed_dbtype $1; then
dbc_error="No $1 client to execute. (have
- you installed the ${dbc_dbclientpackage:-$1} package?"
+ you installed the ${dbc_dbclientpackage:-$1} package?)"
dbc_logline "sanity check failed for $1"
return 1
fi
More information about the Dbconfig-common-changes
mailing list