[Dbconfig-common-devel] dbconfig-common/debian changelog,1.15,1.16 control,1.4,1.5 dbconfig-common.templates,1.10,1.11

[seanius@haydn.debian.org]

Update of /cvsroot/dbconfig-common/dbconfig-common/debian
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv640/debian

Modified Files:
	changelog control dbconfig-common.templates 
Log Message:
changelog updated, a template question was moved further up in the file for
the sake of being better organized.  i think the templates are now ready
for large-scale translation.  i'll be posting to the translator's list
tonight.



Index: changelog
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/changelog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- changelog	17 Mar 2005 06:01:53 -0000	1.15
+++ changelog	31 Mar 2005 03:54:35 -0000	1.16
@@ -1,3 +1,15 @@
+dbconfig-common (1.5.1) experimental; urgency=low
+
+  * add a depends on ucf, and a suggests for mysql-client or
+    postgresql-client.  thanks to Miguel Gea Milvaques <debian@miguelgea.com>
+    for pointing this out (closes: #301497).
+  * many, many debconf style corrections and suggestions from 
+    Christian Perrier <bubulle@debian.org>.  thanks!
+  * consolidation of some more or less duplicated debconf questions
+    to make translators' jobs a little easier.
+
+ -- sean finney <seanius@debian.org>  Wed, 30 Mar 2005 22:50:59 -0500
+
 dbconfig-common (1.5) experimental; urgency=low
 
   * debconf config questions support "back".

Index: control
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- control	4 Feb 2005 06:26:06 -0000	1.4
+++ control	31 Mar 2005 03:54:35 -0000	1.5
@@ -7,7 +7,8 @@
 
 Package: dbconfig-common
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ucf, ${misc:Depends}
+Suggests: virtual-mysql-client | mysql-client | postgresl-client
 Description: common framework for packaging database applications
  dbconfig-common presents a policy and implementation for
  managing various databases used by applications included in

Index: dbconfig-common.templates
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/dbconfig-common.templates,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dbconfig-common.templates	30 Mar 2005 02:51:33 -0000	1.10
+++ dbconfig-common.templates	31 Mar 2005 03:54:35 -0000	1.11
@@ -108,6 +108,10 @@
  before this is done, so that if something goes wrong, you can revert
  to the previous package version and repopulate your database.
 
+Template: dbconfig-common/password-confirm
+Type: password
+_Description: Password confirmation:
+
 Template: dbconfig-common/passwords-do-not-match
 Type: note
 _Description: Passwords do not match.
@@ -209,10 +213,6 @@
  Please provide a password for ${pkg} to register with the
  database server.  This may be left blank if no password is required.
 
-Template: dbconfig-common/mysql/app-pass2
-Type: password
-_Description: Password confirmation:
-
 Template: dbconfig-common/mysql/admin-user
 Type: string
 Default: root
@@ -230,10 +230,6 @@
  What is the password for the administrative account with which this
  package should create its MySQL database and user?
 
-Template: dbconfig-common/mysql/admin-pass2
-Type: password
-_Description: Password confirmation:
-
 Template: dbconfig-common/pgsql/method
 Type: select
 Choices: unix socket, tcp/ip, tcp/ip + ssl
@@ -293,10 +289,6 @@
  database server.  PostgreSQL access may need to be reconfigured
  to allow password-authenticated access.
 
-Template: dbconfig-common/pgsql/app-pass2
-Type: password
-_Description: Password confirmation:
-
 Template: dbconfig-common/pgsql/admin-user
 Type: string
 Default: postgres
@@ -312,10 +304,6 @@
  administrative actions?  (For a normal Debian PostgreSQL installation,
  a database password is not required, since authentication is done at the
  system level.)
-
-Template: dbconfig-common/pgsql/admin-pass2
-Type: password
-_Description: Password confirmation:
 
 Template: dbconfig-common/pgsql/authmethod-admin
 Type: select