[Logcheck-commits] r1211 - logcheck/trunk/debian

[maks-guest at users.alioth.debian.org]

Author: maks-guest
Date: 2006-08-13 10:47:20 +0000 (Sun, 13 Aug 2006)
New Revision: 1211

Modified:
   logcheck/trunk/debian/changelog
   logcheck/trunk/debian/logcheck-database.postinst
Log:
logcheck-database should now be piuparts clean for upgrades from sarge.


Modified: logcheck/trunk/debian/changelog
===================================================================
--- logcheck/trunk/debian/changelog	2006-07-29 16:08:36 UTC (rev 1210)
+++ logcheck/trunk/debian/changelog	2006-08-13 10:47:20 UTC (rev 1211)
@@ -35,8 +35,13 @@
     only filters up messages, not the down ones. By nature of the link status,
     the messages will come in pairs or not at all anyway.
 
- -- martin f. krafft <madduck at debian.org>  Fri, 28 Jul 2006 20:50:10 +0100
+  [ maximilian attems ]
+  * debian/logcheck-database.postinst: Make logcheck-database piuparts clean,
+    on upgrade. Remove moved configfiles if they are unchanged. 
+    Thanks Lars Wirzenius <liw at iki.fi> for report (closes: #355701).
 
+ -- maximilian attems <maks at sternwelten.at>  Sun, 13 Aug 2006 12:21:49 +0200
+
 logcheck (1.2.47) unstable; urgency=low
 
   * ignore.d.server/pdns: minor corrections to better ignore notifies --

Modified: logcheck/trunk/debian/logcheck-database.postinst
===================================================================
--- logcheck/trunk/debian/logcheck-database.postinst	2006-07-29 16:08:36 UTC (rev 1210)
+++ logcheck/trunk/debian/logcheck-database.postinst	2006-08-13 10:47:20 UTC (rev 1211)
@@ -77,6 +77,25 @@
 		echo "Done"
 	    fi
 	fi
+
+	# Remove old sarge mv logcheck-data configfiles if unchanged
+	if [ -n "$2" ] && dpkg --compare-versions "$2" lt "1.2.48"; then
+		proftpd_sum=$(sha1sum '/etc/logcheck/ignore.d.paranoid/proftpd'\
+			| awk '{print $1}')
+		imap_sum=$(sha1sum '/etc/logcheck/ignore.d.paranoid/imap' \
+			| awk '{print $1}')
+		anacron_sum=$(sha1sum '/etc/logcheck/ignore.d.workstation/anacron'\
+			| awk '{print $1}')
+		if [ "${proftpd_sum}" = "da39a3ee5e6b4b0d3255bfef95601890afd80709" ]; then
+			rm -rf /etc/logcheck/ignore.d.paranoid/proftpd
+		fi
+		if [ "${imap_sum}" = "9d4e9db1bd0c5cdd5ea3ba8875e628bf50cf1f5f" ]; then
+			rm -rf /etc/logcheck/ignore.d.paranoid/imap
+		fi
+		if [ "${anacron_sum}" = "78e753ffeff32474a805a7654aa99a07076b6975" ]; then
+			rm -rf /etc/logcheck/ignore.d.workstation/anacron
+		fi
+	fi
 	;;
     
     abort-upgrade|abort-remove|abort-deconfigure)