[Dbconfig-common-devel] dbconfig-common/debian changelog, 1.67, 1.68 credit-xlators, 1.3, 1.4 dbconfig-common.templates, 1.23, 1.24

[seanius at haydn.debian.org]

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

Modified Files:
	changelog credit-xlators dbconfig-common.templates 
Log Message:
debconf updates, mostly.


Index: changelog
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/changelog,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- changelog	26 Sep 2005 07:20:43 -0000	1.67
+++ changelog	27 Sep 2005 09:50:54 -0000	1.68
@@ -7,6 +7,8 @@
     - the postgres user now defaults to /bin/false as a shell, so
       we explicitly add '-s /bin/sh' when su'ing to postgres.  thanks
       to Craig Small for finding this.
+    - added "-c" option to credit-xlators for my own convenience.
+    - debconf template updates.
   * Bart Cornelis:
     - Spelling fixes and some translations for new strings sent in by
       Thijs Kinkhorst.

Index: credit-xlators
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/credit-xlators,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- credit-xlators	18 Apr 2005 00:43:34 -0000	1.3
+++ credit-xlators	27 Sep 2005 09:50:54 -0000	1.4
@@ -10,12 +10,15 @@
 #	credit-xlators [podir]
 # where [podir] defaults to debian/po
 
-TEMP=`getopt -o t -n $0 -- "$@"`
+TEMP=`getopt -o ct -n $0 -- "$@"`
 if [ $? != 0 ] ; then echo "only option i know if is -t" >&2 ; exit 1 ; fi
 eval set -- "$TEMP"
 
 while true; do
 	case "$1" in
+	-c)
+		do_commas="y"
+	;;
 	-t)
 		do_terse="y"
 	;;
@@ -57,11 +60,20 @@
 		echo $l: $xl
 	done
 else
+	(
 	for f in `ls "$podir"/*.po | sort`; do
 		xl=`grep '^"Last-Translator' $f | sed -e 's,^[^:]*: \([^\\]*\).*,\1,'`
 		if [ "$xl" ]; then
-			echo $xl
+			if [ "$do_commas" ]; then
+				xl="$xl, "
+				echo_args="-n"
+			fi
+			echo $echo_args $xl
 		fi
 	done
+	if [ "$do_commas" ]; then
+		echo
+	fi
+	) | sed -e '$s/,$//'
 fi
 

Index: dbconfig-common.templates
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/debian/dbconfig-common.templates,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- dbconfig-common.templates	11 Jul 2005 04:23:00 -0000	1.23
+++ dbconfig-common.templates	27 Sep 2005 09:50:54 -0000	1.24
@@ -319,14 +319,44 @@
  For a default Debian PostgreSQL installation running on the same host,
  you probably want "ident".
 
+Template: dbconfig-common/pgsql/no-user-choose-other-method
+Type: note
+_Description: Choose a different PostgreSQL connection method?
+ Unfortunately, it seems that the database connection method you
+ have selected for ${pkg} will not work, because it requires the existence
+ of a local user that does not exist.
+ .
+ If you would like to reconfigure your application to use a different
+ method, you should choose this option.  If you know for certain that
+ this method will work and you want to continue without changing
+ your choice, you should refuse this option.
+
 Template: dbconfig-common/pgsql/changeconf
 Type: boolean
 Default: false
 _Description: Change PostgreSQL configuration automatically?
- To enable bootstrapping the PostgreSQL database for ${pkg}, the
- configuration of PostgreSQL has to be changed.  It is suggested that
- this is done by dbconfig-common when your package is
- installed.
+ It has been determined that the database installation for ${pkg}
+ can not be automatically accomplished without making changes to
+ your PostgreSQL server's access controls.  It is suggested that this
+ be done by dbconfig-common when your package is installed.  If you
+ would prefer that this be done manually (or not at all), please add
+ the following line to your pg_hba.conf:
+ .
+ ${pghbaline}
+
+Template: dbconfig-common/pgsql/revertconf
+Type: boolean
+Default: false
+_Description: Revert PostgreSQL configuration automatically?
+ As ${pkg} is now being removed, it may no longer be necessary to
+ have an access control entry in your PostgreSQL server's configuration.
+ While keeping such an entry will not break any software on your
+ system, it may be seen as a potential security concern.  It is suggested
+ that this be done by dbconfig-common when your package is removed.  If you
+ would prefer that this be done manually (or not at all), please remove
+ the following line from your pg_hba.conf:
+ .
+ ${pghbaline}
 
 Template: dbconfig-common/pgsql/manualconf
 Type: note