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

[vorlon at alioth.debian.org]

tags 566946 pending
thanks

Author: vorlon
Date: 2010-01-26 04:30:08 +0000 (Tue, 26 Jan 2010)
New Revision: 3253

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba-common.config
   trunk/samba/debian/samba-common.dhcp
   trunk/samba/debian/samba.config
Log:
Revert the "bashisms" fix from version 2:3.3.0~rc2-4; "local foo=bar"
is explicitly allowed by Policy now, and this change introduced a
syntax error.  Closes: #566946.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2010-01-23 14:47:49 UTC (rev 3252)
+++ trunk/samba/debian/changelog	2010-01-26 04:30:08 UTC (rev 3253)
@@ -1,3 +1,11 @@
+samba (2:3.4.5~dfsg-2) UNRELEASED; urgency=low
+
+  * Revert the "bashisms" fix from version 2:3.3.0~rc2-4; "local foo=bar"
+    is explicitly allowed by Policy now, and this change introduced a
+    syntax error.  Closes: #566946.
+
+ -- Steve Langasek <vorlon at debian.org>  Mon, 25 Jan 2010 20:28:24 -0800
+
 samba (2:3.4.5~dfsg-1) unstable; urgency=low
 
   * New upstream release. Bugs fixed by this release:

Modified: trunk/samba/debian/samba-common.config
===================================================================
--- trunk/samba/debian/samba-common.config	2010-01-23 14:47:49 UTC (rev 3252)
+++ trunk/samba/debian/samba-common.config	2010-01-26 04:30:08 UTC (rev 3253)
@@ -10,8 +10,7 @@
 	fi
 
 	if [ -n "$2" ]; then
-		local FILE
-		FILE="$2"
+		local FILE="$2"
 	fi
 
 	if [ -z "$FILE" ]; then

Modified: trunk/samba/debian/samba-common.dhcp
===================================================================
--- trunk/samba/debian/samba-common.dhcp	2010-01-23 14:47:49 UTC (rev 3252)
+++ trunk/samba/debian/samba-common.dhcp	2010-01-26 04:30:08 UTC (rev 3253)
@@ -15,10 +15,8 @@
 
 	umask 022
 
-	local other_servers
-	other_servers==""
-	local serverlist
-	serverlist==""
+	local other_servers=""
+	local serverlist=""
 
 	# the destination file won't exist yet on the first run after 
 	# installing samba

Modified: trunk/samba/debian/samba.config
===================================================================
--- trunk/samba/debian/samba.config	2010-01-23 14:47:49 UTC (rev 3252)
+++ trunk/samba/debian/samba.config	2010-01-26 04:30:08 UTC (rev 3253)
@@ -14,8 +14,7 @@
 	fi
 
 	if [ -n "$2" ]; then
-		local FILE
-		FILE="$2"
+		local FILE="$2"
 	fi
 
 	if [ -z "$FILE" ]; then