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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-11-23 20:26:05 +0000 (Fri, 23 Nov 2007)
New Revision: 1595

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba-common.config
   trunk/samba/debian/samba-common.templates
Log:
Set the default value for the workgroup question to "WORKGROUP" in
samba-common.templates, not just in the template smb.conf, so that the
debconf question comes out right every time; and always treat this as a
high-priority debconf question instead of selecting the priority based on
whether there's an existing value, since there's now *always* an existing
value but the value doesn't tell us anything meaningful about the user's
preference.  Closes: #451271.



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-11-23 19:32:06 UTC (rev 1594)
+++ trunk/samba/debian/changelog	2007-11-23 20:26:05 UTC (rev 1595)
@@ -11,12 +11,19 @@
     printing system, because since the original introduction of this patch
     in Debian there was a regression upstream that caused cups to never be
     selected as the default print system.
+  * Set the default value for the workgroup question to "WORKGROUP" in
+    samba-common.templates, not just in the template smb.conf, so that the
+    debconf question comes out right every time; and always treat this
+    as a high-priority debconf question instead of selecting the
+    priority based on whether there's an existing value, since there's
+    now *always* an existing value but the value doesn't tell us
+    anything meaningful about the user's preference.  Closes: #451271.
 
   [ Christian Perrier ]
   * Update the "built by" part of README.debian
   * Remove the very outdated parts of README.debian
 
- -- Steve Langasek <vorlon at debian.org>  Fri, 23 Nov 2007 10:45:47 -0800
+ -- Steve Langasek <vorlon at debian.org>  Fri, 23 Nov 2007 11:33:46 -0800
 
 samba (3.0.27-1) unstable; urgency=low
 

Modified: trunk/samba/debian/samba-common.config
===================================================================
--- trunk/samba/debian/samba-common.config	2007-11-23 19:32:06 UTC (rev 1594)
+++ trunk/samba/debian/samba-common.config	2007-11-23 20:26:05 UTC (rev 1595)
@@ -48,15 +48,6 @@
 
 # User wants to use debconf, let's continue...
 
-# Adjust priority of the question about the workgroup name depending
-# on whether a workgroup name has already being specified.
-db_get samba-common/workgroup || true
-if [ "${RET}" ]; then
-	WGPRIORITY=medium
-else
-	WGPRIORITY=high
-fi
-
 # Preload any values from the existing smb.conf file
 if [ -f $FILE ]; then
 	WORKGROUP=`smbconf_retr workgroup`
@@ -78,7 +69,7 @@
 fi
 
 # Get workgroup name
-db_input $WGPRIORITY samba-common/workgroup || true
+db_input high samba-common/workgroup || true
 db_go
 
 # Use encrypted passwords?

Modified: trunk/samba/debian/samba-common.templates
===================================================================
--- trunk/samba/debian/samba-common.templates	2007-11-23 19:32:06 UTC (rev 1594)
+++ trunk/samba/debian/samba-common.templates	2007-11-23 20:26:05 UTC (rev 1595)
@@ -28,6 +28,7 @@
 
 Template: samba-common/workgroup
 Type: string
+Default: WORKGROUP
 _Description: Workgroup/Domain Name:
  Please specify the workgroup you want this server to appear to be in
  when queried by clients. Note that this parameter also controls the