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

Proposed by Hilario J. Montoliu (hjmf)
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~hmontoliu/ubuntu/lucid/denyhosts/fix-516160
Merge into: lp:ubuntu/lucid/denyhosts
Diff against target: 28 lines (+8/-0)
2 files modified
debian/changelog (+6/-0)
debian/denyhosts.preinst (+2/-0)
To merge this branch: bzr merge lp:~hmontoliu/ubuntu/lucid/denyhosts/fix-516160
Reviewer Review Type Date Requested Status
Chuck Short (community) Approve
Ubuntu branches Pending
Review via email: mp+18467@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hilario J. Montoliu (hjmf) (hmontoliu) wrote :

Avoids nasty line at preinst (Closes: #516160)

Revision history for this message
Chuck Short (zulcss) wrote :

This patch already made it in lucid.

Regards
chuck

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-01-24 15:37:15 +0000
3+++ debian/changelog 2010-02-02 18:40:28 +0000
4@@ -1,3 +1,9 @@
5+denyhosts (2.6-6.2) unstable; urgency=low
6+
7+ * Avoids nasty line at preinst (Closes: #516160)
8+
9+ -- H. Montoliu <hmontoliu@ubuntu.com> Tue Feb 2 18:37:05 UTC 2010
10+
11 denyhosts (2.6-6.1) unstable; urgency=low
12
13 * Non-maintainer upload.
14
15=== modified file 'debian/denyhosts.preinst'
16--- debian/denyhosts.preinst 2010-01-24 15:37:15 +0000
17+++ debian/denyhosts.preinst 2010-02-02 18:40:28 +0000
18@@ -5,8 +5,10 @@
19
20 if dpkg --compare-versions "$2" lt 2.6-6.1
21 then
22+ if [ -f /var/lib/dpkg/info/denyhosts.postrm ]; then
23 sed -e 's#rm -f /etc/logrotate.d/denyhosts##g' < /var/lib/dpkg/info/denyhosts.postrm > /var/lib/dpkg/info/denyhosts.postrm.changed && \
24 mv -f /var/lib/dpkg/info/denyhosts.postrm.changed /var/lib/dpkg/info/denyhosts.postrm
25+ fi
26 fi
27
28 #DEBHELPER#

Subscribers

People subscribed via source and target branches