[Pkg-samba-maint] r1861 - trunk/samba4/debian

[ctrlsoft-guest at alioth.debian.org]

Author: ctrlsoft-guest
Date: 2008-05-11 16:44:45 +0000 (Sun, 11 May 2008)
New Revision: 1861

Modified:
   trunk/samba4/debian/samba4-common.config
   trunk/samba4/debian/samba4-common.templates
   trunk/samba4/debian/samba4.config
   trunk/samba4/debian/samba4.templates
Log:
Rename prefix of debconf templates.

Modified: trunk/samba4/debian/samba4-common.config
===================================================================
--- trunk/samba4/debian/samba4-common.config	2008-05-10 23:06:37 UTC (rev 1860)
+++ trunk/samba4/debian/samba4-common.config	2008-05-11 16:44:45 UTC (rev 1861)
@@ -11,10 +11,10 @@
 # so we can generate a new one.
 #
 if [ ! -f /etc/samba/smb.conf ]; then
-	db_input medium samba-common/realm || true
+	db_input medium samba4-common/realm || true
 	db_go || true
 
-	db_input medium samba-common/domain || true
+	db_input medium samba4-common/domain || true
 	db_go || true
 fi
 

Modified: trunk/samba4/debian/samba4-common.templates
===================================================================
--- trunk/samba4/debian/samba4-common.templates	2008-05-10 23:06:37 UTC (rev 1860)
+++ trunk/samba4/debian/samba4-common.templates	2008-05-11 16:44:45 UTC (rev 1861)
@@ -1,10 +1,10 @@
-Template: samba-common/realm
+Template: samba4-common/realm
 Type: string
 _Description: Realm
  The Kerberos realm your server will be in. In many cases, this will be
  the same as your DNS domain name (ie. YOUR.REALM).
 
-Template: samba-common/domain
+Template: samba4-common/workgroup
 Type: string
 _Description: Domain
  The domain of your server. This is also known as the

Modified: trunk/samba4/debian/samba4.config
===================================================================
--- trunk/samba4/debian/samba4.config	2008-05-10 23:06:37 UTC (rev 1860)
+++ trunk/samba4/debian/samba4.config	2008-05-11 16:44:45 UTC (rev 1861)
@@ -13,12 +13,12 @@
 	#
 	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "3.9.0"; then
 		if [ -f /etc/samba/smb.conf ]; then
-			db_input medium samba/upgrade-from-v3 || true
+			db_input medium samba4/upgrade-from-v3 || true
 			db_go || true
 
 			# The realm can't be easily autodetected from the Samba 3
 			# settings.
-			db_input medium samba-common/realm || true
+			db_input medium samba4-common/realm || true
 			db_go || true
 		fi
 	fi
@@ -27,14 +27,14 @@
 	# First-time installation, perhaps? If so, the user could want to
 	# set up Samba as a PDC, if the other parameters are in place.
 	#
-	db_get samba-common/realm || true
+	db_get samba4-common/realm || true
 	REALM="$RET"
 
-	db_get samba-common/domain || true
+	db_get samba4-common/domain || true
 	DOMAIN="$RET"
 
 	if [ -z "$2" -a -n "$REALM" -a -n "$DOMAIN" ]; then
-		db_input medium samba/setup-pdc || true
+		db_input medium samba4/setup-pdc || true
 		db_go || true
 	fi
 fi

Modified: trunk/samba4/debian/samba4.templates
===================================================================
--- trunk/samba4/debian/samba4.templates	2008-05-10 23:06:37 UTC (rev 1860)
+++ trunk/samba4/debian/samba4.templates	2008-05-11 16:44:45 UTC (rev 1861)
@@ -1,4 +1,4 @@
-Template: samba/upgrade-from-v3
+Template: samba4/upgrade-from-v3
 Type: boolean
 Default: true
 _Description: Upgrade from Samba 3?
@@ -6,7 +6,7 @@
  Samba 4. This is likely to fail for complex setups, but should provide a
  good starting point for most existing installations.
 
-Template: samba/setup-pdc
+Template: samba4/setup-pdc
 Type: boolean
 Default: false
 _Description: Set up Samba 4 as a PDC?