[Pkg-samba-maint] r3761 - trunk/samba/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2011-05-12 08:46:47 +0000 (Thu, 12 May 2011)
New Revision: 3761

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba-common.config
   trunk/samba/debian/samba-common.templates
   trunk/samba/debian/samba.config
   trunk/samba/debian/samba.templates
Log:
Use db_settitle in debconf questions and make these
titles translatable

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-05-09 12:39:32 UTC (rev 3760)
+++ trunk/samba/debian/changelog	2011-05-12 08:46:47 UTC (rev 3761)
@@ -8,6 +8,10 @@
   [ Mathieu Parent ]
   * Builddep on libctdb-dev or ctdb < 1.10 
 
+  [ Christian Perrier ]
+  * Use db_settitle in debconf questions and make these
+    titles translatable
+
  -- Mathieu Parent <sathieu at debian.org>  Tue, 29 Mar 2011 21:28:42 +0200
 
 samba (2:3.5.8~dfsg-1) unstable; urgency=low

Modified: trunk/samba/debian/samba-common.config
===================================================================
--- trunk/samba/debian/samba-common.config	2011-05-09 12:39:32 UTC (rev 3760)
+++ trunk/samba/debian/samba-common.config	2011-05-12 08:46:47 UTC (rev 3761)
@@ -27,7 +27,7 @@
 
 FILE=/etc/samba/smb.conf
 
-db_title "Samba Server"
+db_settitle samba-common/title
 
 # We ask the question IFF the config contains complex options that could
 # cause us to break the config.

Modified: trunk/samba/debian/samba-common.templates
===================================================================
--- trunk/samba/debian/samba-common.templates	2011-05-09 12:39:32 UTC (rev 3760)
+++ trunk/samba/debian/samba-common.templates	2011-05-12 08:46:47 UTC (rev 3761)
@@ -1,3 +1,7 @@
+Template: samba-common/title
+Type: title
+_Description: Samba server and utilities
+
 Template: samba-common/dhcp
 Type: boolean
 Default: false

Modified: trunk/samba/debian/samba.config
===================================================================
--- trunk/samba/debian/samba.config	2011-05-09 12:39:32 UTC (rev 3760)
+++ trunk/samba/debian/samba.config	2011-05-12 08:46:47 UTC (rev 3761)
@@ -44,7 +44,7 @@
 
 FILE=/etc/samba/smb.conf
 
-db_title "Samba Server"
+db_settitle samba/title
 
 # We first read the settings file
 # in order to get admin-modified settings

Modified: trunk/samba/debian/samba.templates
===================================================================
--- trunk/samba/debian/samba.templates	2011-05-09 12:39:32 UTC (rev 3760)
+++ trunk/samba/debian/samba.templates	2011-05-12 08:46:47 UTC (rev 3761)
@@ -1,3 +1,7 @@
+Template: samba-common/title
+Type: title
+_Description: Samba server
+
 Template: samba/generate_smbpasswd
 Type: boolean
 Default: false