[Logcheck-commits] CVS logcheck/debian

[CVS User ttroxell]

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

Modified Files:
	changelog logcheck.postinst 
Log Message:
-remove changelog line for de-commenter
-touch cron.d/logcheck in postinst as discussed on l-devel and d-devel
-update dh_installlogcheck to current, patched version in debhelper
-re-conditionalize permission setting on <1.3.33 (I got joeyh to patch 
dh_installogcheck allready)



--- /cvsroot/logcheck/logcheck/debian/changelog	2005/01/05 22:09:02	1.317
+++ /cvsroot/logcheck/logcheck/debian/changelog	2005/01/06 01:04:21	1.318
@@ -17,7 +17,11 @@
   * Set rule directories setgid to simplify administration. (closes: #286230)
   * Add future package plans to TODO
   * Remove dh_strip and dh_shlibdeps from debian/rules
-  * Set up postinst based post-adduser crontab de-commenter (closes: #284788)
+  * Touch cron.d/logcheck in postinst. (closes: #284788)
+  * Conditionally set permissions in postinst on version <1.2.33 
+    (closes: #287184)
+  * Update dh_installlogcheck, which has already been patched in debhelper.
+    (closes: #287184)
 
  -- 
 
--- /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2004/12/30 06:46:38	1.26
+++ /cvsroot/logcheck/logcheck/debian/logcheck.postinst	2005/01/06 01:04:21	1.27
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $Id: logcheck.postinst,v 1.26 2004/12/30 06:46:38 ttroxell Exp $
+# $Id: logcheck.postinst,v 1.27 2005/01/06 01:04:21 ttroxell Exp $
 
 set -e
 
@@ -54,7 +54,7 @@
         if [ "$2" = "" -a ! -f /etc/logcheck/header.txt ]; then
           cp -p /usr/share/logcheck/header.txt /etc/logcheck
         fi
-	if [ -d /var/lib/logcheck -a -d /etc/logcheck ]; then
+	if [ dpkg --compare-versions "$2" lt 1.2.33; ]; then
     	  # Fix Permissions
     	  chown -R logcheck:logcheck /var/lib/logcheck  || true
           chgrp -R logcheck /etc/logcheck || true
@@ -70,6 +70,10 @@
           chown logcheck /var/lock/logcheck > /dev/null 2>&1 || true
 	fi
 
+	# fix for #284788
+	# update timestamp on cron
+	touch /etc/cron.d/logcheck || true
+
 	;;
     
     abort-upgrade|abort-remove|abort-deconfigure)