[Logcheck-commits] CVS logcheck/debian

[CVS User maks-guest]

Update of /cvsroot/logcheck/logcheck/debian
In directory haydn:/tmp/cvs-serv5968/debian

Modified Files:
	changelog logcheck-database.postinst logcheck-database.preinst 
Log Message:

cleanup very old symlink farm handling


--- /cvsroot/logcheck/logcheck/debian/changelog	2006/07/04 16:46:20	1.595
+++ /cvsroot/logcheck/logcheck/debian/changelog	2006/07/04 16:52:43	1.596
@@ -60,8 +60,10 @@
   [ maximilian attems ]
   * debian/logcheck.postinst: Remove old check against woody version
     removing /var/cache/logcheck.
+  * logcheck-database.preinst, debian/logcheck-database.postinst: Remove checks
+    against old woody symlinkfarm.
 
- -- maximilian attems <maks at sternwelten.at>  Tue,  4 Jul 2006 18:41:10 +0200
+ -- maximilian attems <maks at sternwelten.at>  Tue,  4 Jul 2006 18:48:14 +0200
 
 logcheck (1.2.44) UNRELEASED; urgency=low
 
--- /cvsroot/logcheck/logcheck/debian/logcheck-database.postinst	2004/09/28 16:41:27	1.2
+++ /cvsroot/logcheck/logcheck/debian/logcheck-database.postinst	2006/07/04 16:52:44	1.3
@@ -67,21 +67,6 @@
 
 case "$1" in
     configure)
-	# The symlink is no longer used, so delete it when
-	# upgrading from a version less than 1.1.9.0
-	if dpkg --compare-versions "$2" lt "1.1.9.0"; then
-	    if [ -h $confdir/ignore.d ]; then
-		echo -n "Removing $confdir/ignore.d symlink: "
-		rm -f $confdir/ignore.d
-		echo "Done"
-	    fi
-	    if [ -h $confdir/logcheck.ignore ]; then
-		echo -n "Removing $confdir/logcheck.ignore symlink: "
-		rm -f $confdir/logcheck.ignore
-		echo "Done"		
-	    fi
-	fi
-
 	if dpkg --compare-versions "$2" lt "1.2.6"; then
 	    db_get logcheck-database/conffile-cleanup
 	    if [ "$RET" = true ]; then
--- /cvsroot/logcheck/logcheck/debian/logcheck-database.preinst	2004/04/19 18:22:04	1.1.1.1
+++ /cvsroot/logcheck/logcheck/debian/logcheck-database.preinst	2006/07/04 16:52:44	1.2
@@ -36,48 +36,6 @@
 	# The symlink is no longer used, so delete it when
 	# upgrading from a version less than 1.1.9.1
 	if [ -n "$2" ]; then
-	    if dpkg --compare-versions "$2" lt "1.1.9.1"; then
-		echo -n "Removing old symlinks from /etc/logcheck/ignore.d.workstation: "
-		for file in $workstation; do
-		    if [ -h $confdir/ignore.d.workstation/$file ]; then
-			rm -f $confdir/ignore.d.workstation/$file
-		    fi
-		done
-		echo "Done"
-		echo -n "Removing old symlinks from /etc/logcheck/ignore.d.server: "
-		for file in $server; do
-		    if [ -h $confdir/ignore.d.server/$file ]; then
-			rm -f $confdir/ignore.d.server/$file
-		    fi
-		done
-		echo "Done"
-		echo -n "Moving default rulefiles to new location: "
-		if [ -f $confdir/logcheck.cracking ]; then
-		    mv $confdir/logcheck.cracking $confdir/cracking.d/standard
-		fi
-		if [ -f $confdir/logcheck.ignore.paranoid ]; then
-		    mv $confdir/logcheck.ignore.paranoid \
-			$confdir/ignore.d.paranoid/standard
-		fi
-		if [ -f $confdir/logcheck.ignore.server ]; then
-		    mv $confdir/logcheck.ignore.server \
-			$confdir/ignore.d.server/standard
-		fi
-		if [ -f $confdir/logcheck.ignore.workstation ]; then
-		    mv $confdir/logcheck.ignore.workstation \
-			$confdir/ignore.d.workstation/standard
-		fi
-		if [ -f $confdir/logcheck.violations ]; then
-		    mv $confdir/logcheck.violations \
-			$confdir/violations.d/standard
-		fi
-		if [ -f $confdir/logcheck.violations.ignore ]; then
-		    mv $confdir/logcheck.violations.ignore \
-			$confdir/violations.ignore.d/standard
-		fi
-		echo "Done"
-	    fi
-
 	    # The standard files were renamed in 1.2.1 release, so
 	    # we'll move it to the new name.

[1 lines skipped]