Merge lp:~gruemaster/bacula/960761 into lp:ubuntu/precise/bacula

[Tobin Davis]

[Colin Watson (cjwatson)]

Well, it's inaccurate to describe this as a typo. The leading _ is for translations, as documented in the po-debconf(7) manual page.

However, the transition to po-debconf has clearly been botched here: most notably, there's no debian/po/POTFILES.in. More to the point, perhaps, I really can't see us doing an extensive call for translations etc. when the package has no debconf translations in Debian. So, with the exception of s/precise/lucid/ in debian/changelog (which I'll take care of), this looks fine.

review: Approve

=== modified file 'debian/bacula-director-mysql.templates'
--- debian/bacula-director-mysql.templates	2010-03-14 02:19:12 +0000
+++ debian/bacula-director-mysql.templates	2012-03-23 23:48:19 +0000
@@ -46,7 +46,7 @@
 
 Template: bacula/notconfigured
 Type: note
-_Description: Warning - Bacula is not configured
+Description: Warning - Bacula is not configured
  Please note that you have not completed the Bacula configuration. For
  completing it, please use "dpkg-reconfigure bacula-director-mysql" later.
 

=== modified file 'debian/bacula-director-pgsql.templates'
--- debian/bacula-director-pgsql.templates	2009-01-20 07:45:53 +0000
+++ debian/bacula-director-pgsql.templates	2012-03-23 23:48:19 +0000
@@ -1,52 +1,52 @@
 Template: bacula/db_host
 Type: string
 Default: localhost
-_Description: Database server hostname:
+Description: Database server hostname:
  Please enter the hostname of the database server host.
 
 Template: bacula/dba_name
 Type: string
 Default: root
-_Description: Database administrator username:
+Description: Database administrator username:
  Please enter the PostgreSQL administrator username, needed for
  the database creation.
 
 Template: bacula/dba_password
 Type: password
-_Description: Database administrator password:
+Description: Database administrator password:
  Please enter the PostgreSQL administrator password, needed for
  the database creation.
 
 Template: bacula/dba_confirm
 Type: password
-_Description: DBA password confirmation:
+Description: DBA password confirmation:
  Please confirm the password in order to continue the process.
 
 Template: bacula/mismatch
 Type: note
-_Description: Password mismatch
+Description: Password mismatch
  The password and its confirmation do not match. Please
  reenter the passwords.
 
 Template: bacula/dbu_name
 Type: string
 Default: bacula
-_Description: Database owner username:
+Description: Database owner username:
  Please enter the username of the Bacula database owner.
 
 Template: bacula/dbu_password
 Type: password
-_Description: Database owner password:
+Description: Database owner password:
  Please enter the password of the Bacula database owner.
 
 Template: bacula/dbu_confirm
 Type: password
-_Description: Database user password confirmation:
+Description: Database user password confirmation:
  Please confirm the password of the Bacula database owner.
 
 Template: bacula/notconfigured
 Type: note
-_Description: Warning - Bacula is not configured
+Description: Warning - Bacula is not configured
  Please note that you have not completed the Bacula configuration. For
  completing it, please use "dpkg-reconfigure bacula-director-pgsql" later.
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-07 21:32:43 +0000
+++ debian/changelog	2012-03-23 23:48:19 +0000
@@ -1,3 +1,10 @@
+bacula (5.2.5-0ubuntu6) lucid; urgency=low
+
+  * Fix templates for dpkg installation of 
+    backula-director-[mysql|pgsql] packages. (LP: #960761)
+
+ -- Tobin <[e-mail]>  Fri, 23 Mar 2012 16:32:16 -0700
+
 bacula (5.2.5-0ubuntu5) precise; urgency=low
 
   * Add libncurses-dev to build-depends, as the console client insists