From 7ec71aa20d43fd45dd9321e42ada93ee10fd1d45 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sat, 29 Oct 2005 13:31:57 +0000 Subject: r11398: Keep s3 in sync with trunk (This used to be commit 7fc05b79643c93eaf0ef028a7337889ed21c52ba) --- packaging/Debian/debian-unstable/samba.postinst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packaging/Debian/debian-unstable/samba.postinst') diff --git a/packaging/Debian/debian-unstable/samba.postinst b/packaging/Debian/debian-unstable/samba.postinst index 7b0bdd92ad..0fb03f8768 100644 --- a/packaging/Debian/debian-unstable/samba.postinst +++ b/packaging/Debian/debian-unstable/samba.postinst @@ -56,7 +56,8 @@ EOFMAGICNUMBER1234 # moving the files in the old directories (/var/samba/ and # /var/state/samba) to the new FHS-compliant directories. -if [ -d /var/samba/ ]; then +if [ -d /var/samba/ ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.0.7-4 +then mv /var/samba/* /var/lib/samba/ 2>/dev/null || true rmdir /var/samba/ fi @@ -64,7 +65,8 @@ fi # Default for anything we don't know about (see next two 'for' loops) # is /var/lib/samba -- guaranteed not to accidentally tromp on any # files the admin thought were safe. -if [ -d /var/state/samba ]; then +if [ -d /var/state/samba ] && [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.3-4 +then mv /var/state/samba/* /var/lib/samba/ 2>/dev/null || true rmdir /var/state/samba/ -- cgit