[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.6+dfsg-834-gbcda6d6

[Andrew Bartlett]

The following commit has been merged in the samba_4.0 branch:
commit 2f21f5e62faf411c0a049c94027317b66e2d1a8c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jun 13 12:55:45 2013 +1000

    move TDB files on upgrade

diff --git a/debian/TODO b/debian/TODO
index 8a601a9..a5aa8c3 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,10 +4,6 @@ This is an incomplete list of a number of issues that need to be fixed.
 
 TODOs before upload to experimental
 
-- fix new location of tdb on upgrade
-  - make a list of all affected tdb's
-  - move them on upgrade
-
 - update changelog file to better reflect everything that changed between this
   version and the last 3.6 version
 
diff --git a/debian/samba.postinst b/debian/samba.postinst
index c463fbc..94667f8 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -41,6 +41,35 @@ then
 	mv /etc/samba/idmap2.tdb /var/lib/samba/idmap2.tdb
 fi
 
+# Move files to private subdir now fhs patch is finally gone
+if dpkg --compare-versions "$2" lt-nl 2:4.0.6 \
+	&& [ -e /var/lib/samba/schannel_store.tdb ] \
+	&& ! [ -e /var/lib/samba/private/schannel_store.tdb ]
+then
+	mv /var/lib/samba/schannel_store.tdb /var/lib/samba/private/schannel_store.tdb
+fi
+
+if dpkg --compare-versions "$2" lt-nl 2:4.0.6 \
+	&& [ -e /var/lib/samba/idmap2.tdb ] \
+	&& ! [ -e /var/lib/samba/private/idmap2.tdb ]
+then
+	mv /var/lib/samba/idmap2.tdb /var/lib/samba/private/idmap2.tdb
+fi
+
+if dpkg --compare-versions "$2" lt-nl 2:4.0.6 \
+	&& [ -e /var/lib/samba/passdb.tdb ] \
+	&& ! [ -e /var/lib/samba/private/passdb.tdb ]
+then
+	mv /var/lib/samba/passdb.tdb /var/lib/samba/private/passdb.tdb
+fi
+
+if dpkg --compare-versions "$2" lt-nl 2:4.0.6 \
+	&& [ -e /var/lib/samba/secrets.tdb ] \
+	&& ! [ -e /var/lib/samba/private/secrets.tdb ]
+then
+	mv /var/lib/samba/secrets.tdb /var/lib/samba/private/secrets.tdb
+fi
+
 # add the sambashare group
 if ! getent group sambashare > /dev/null 2>&1
 then

-- 
Debian packaging for Samba