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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2012-05-10 17:02:21 +0000 (Thu, 10 May 2012)
New Revision: 4085

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/winbind.postinst
Log:
Drop code that was moving files around in samba.postinst and
winbind.postinst for pre-squeeze versions of the package.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-05-10 17:00:42 UTC (rev 4084)
+++ trunk/samba/debian/changelog	2012-05-10 17:02:21 UTC (rev 4085)
@@ -38,8 +38,8 @@
   * Add a NEWS.Debian entry about the libnss-winbind split and, while at
     it, add an entry for libpam-winbind too (as it will affect upgrades
     from squeeze).
-  * Drop code that was moving files around in samba.postinst for
-    pre-squeeze version of the package.
+  * Drop code that was moving files around in samba.postinst and
+    winbind.postinst for pre-squeeze versions of the package.
   * Drop code that was modifying a deprecated "passdb backend" setting
     in smb.conf for pre-squeeze versions of the package (in 
     samba-common.config).

Modified: trunk/samba/debian/winbind.postinst
===================================================================
--- trunk/samba/debian/winbind.postinst	2012-05-10 17:00:42 UTC (rev 4084)
+++ trunk/samba/debian/winbind.postinst	2012-05-10 17:02:21 UTC (rev 4085)
@@ -5,19 +5,4 @@
 getent group winbindd_priv >/dev/null 2>&1 ||
 	addgroup --system --force-badname --quiet winbindd_priv
 
-# move a tdb that should have been in /var/cache all along
-if dpkg --compare-versions "$2" lt-nl 3.0.25b-2 \
-   && [ -e /var/run/samba/idmap_cache.tdb ] \
-   && ! [ -e /var/cache/samba/idmap_cache.tdb ]
-then
-        mv /var/run/samba/idmap_cache.tdb /var/cache/samba/idmap_cache.tdb
-fi
-
-if dpkg --compare-versions "$2" lt-nl 2:3.5.4~dfsg-2 \
-   && [ -e /etc/samba/idmap2.tdb ] \
-   && ! [ -e /var/lib/samba/idmap2.tdb ]
-then
-	mv /etc/samba/idmap2.tdb /var/lib/samba/idmap2.tdb
-fi
-
 #DEBHELPER#