[Pkg-samba-maint] [samba] 01/01: Move ownership of var/lib/samba and var/lib/samba/private to samba-common, remove obsolete samba4.dirs. Closes: #793866

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch experimental
in repository samba.

commit 9a8912d9621921c2e1383708744d68325a843908
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Jun 22 22:53:02 2015 +0000

    Move ownership of var/lib/samba and var/lib/samba/private to samba-common, remove obsolete samba4.dirs. Closes: #793866
---
 debian/changelog           | 2 ++
 debian/samba-common.dirs   | 1 +
 debian/samba-common.postrm | 7 +++++++
 debian/samba.dirs          | 2 --
 debian/samba.postrm        | 6 ------
 debian/samba4.dirs         | 2 --
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d004ed..35b91fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ samba (2:4.2.1+dfsg-1) UNRELEASED; urgency=medium
   * Add patch no_wrapper: avoid dependencies on
     {nss,uid,socket}_wrapper.
   * Move some libraries around.
+  * Move ownership of var/lib/samba and var/lib/samba/private to samba-
+    common, remove obsolete samba4.dirs. Closes: #793866
 
   [ Mathieu Parent ]
   * Merge ctdb source package
diff --git a/debian/samba-common.dirs b/debian/samba-common.dirs
index 7274aea..c4c1da4 100644
--- a/debian/samba-common.dirs
+++ b/debian/samba-common.dirs
@@ -2,3 +2,4 @@ etc/samba
 var/cache/samba
 var/lib/samba
 var/log/samba
+var/lib/samba/private
diff --git a/debian/samba-common.postrm b/debian/samba-common.postrm
index e2ecf20..adbdd02 100644
--- a/debian/samba-common.postrm
+++ b/debian/samba-common.postrm
@@ -2,6 +2,13 @@
 
 set -e
 if [ "$1" = purge ]; then
+
+	# Remove Samba's state files, both volatile and non-volatile
+	rm -Rf /var/run/samba/ /var/cache/samba/ /var/lib/samba
+
+	# Remove log files
+	rm -Rf /var/log/samba/
+
 	rm -rf /etc/samba/ /var/cache/samba/ /var/lib/samba/ /var/run/samba/
 	if [ -x "`which ucf 2>/dev/null`" ]; then
 		ucf --purge /etc/samba/smb.conf
diff --git a/debian/samba.dirs b/debian/samba.dirs
index 5746830..84d1375 100644
--- a/debian/samba.dirs
+++ b/debian/samba.dirs
@@ -1,7 +1,5 @@
 usr/bin
 usr/sbin
-var/lib/samba
-var/lib/samba/private
 var/lib/samba/printers/COLOR
 var/lib/samba/printers/IA64
 var/lib/samba/printers/W32ALPHA
diff --git a/debian/samba.postrm b/debian/samba.postrm
index 32d775e..c66384b 100644
--- a/debian/samba.postrm
+++ b/debian/samba.postrm
@@ -4,12 +4,6 @@ set -e
 
 if [ "$1" = purge ]; then
 
-	# Remove Samba's state files, both volatile and non-volatile
-	rm -Rf /var/run/samba/ /var/cache/samba/ /var/lib/samba
-
-	# Remove log files
-	rm -Rf /var/log/samba/
-
 	if [ -e /usr/share/debconf/confmodule ]; then
 		. /usr/share/debconf/confmodule
 		db_purge
diff --git a/debian/samba4.dirs b/debian/samba4.dirs
deleted file mode 100644
index 558d1fe..0000000
--- a/debian/samba4.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-var/lib/samba
-var/lib/samba/private

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git