Merge lp:~hmontoliu/ubuntu/lucid/denyhosts/fix-516160 into lp:ubuntu/lucid/denyhosts

[Hilario J. Montoliu (hjmf)]

[Hilario J. Montoliu (hjmf) (hmontoliu)]

Avoids nasty line at preinst (Closes: #516160)

[Chuck Short (zulcss)]

This patch already made it in lucid.

Regards
chuck

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-24 15:37:15 +0000
+++ debian/changelog	2010-02-02 18:40:28 +0000
@@ -1,3 +1,9 @@
+denyhosts (2.6-6.2) unstable; urgency=low
+
+  * Avoids nasty line at preinst (Closes: #516160)
+
+ -- H. Montoliu <[e-mail]>  Tue Feb  2 18:37:05 UTC 2010
+
 denyhosts (2.6-6.1) unstable; urgency=low
 
   * Non-maintainer upload.

=== modified file 'debian/denyhosts.preinst'
--- debian/denyhosts.preinst	2010-01-24 15:37:15 +0000
+++ debian/denyhosts.preinst	2010-02-02 18:40:28 +0000
@@ -5,8 +5,10 @@
 
 if dpkg --compare-versions "$2" lt 2.6-6.1
 then
+    if [ -f /var/lib/dpkg/info/denyhosts.postrm ]; then
 	sed -e 's#rm -f /etc/logrotate.d/denyhosts##g' < /var/lib/dpkg/info/denyhosts.postrm > /var/lib/dpkg/info/denyhosts.postrm.changed && \
 	mv -f /var/lib/dpkg/info/denyhosts.postrm.changed /var/lib/dpkg/info/denyhosts.postrm
+    fi
 fi
 
 #DEBHELPER#