Ubuntu
dovecot package

Merge lp:~clint-fewbar/ubuntu/maverick/dovecot/karmic2lucid2maverick-upgrade-fix into lp:ubuntu/maverick/dovecot

  1. Maverick (10.10)
  2. karmic2lucid2maverick-upgrade-fix
  3. Merge into maverick
Proposed by Clint Byrum
Status: Merged
Merge reported by: Mathias Gug
Merged at revision: not available
Proposed branch: lp:~clint-fewbar/ubuntu/maverick/dovecot/karmic2lucid2maverick-upgrade-fix
Merge into: lp:ubuntu/maverick/dovecot
Diff against target: 41 lines (+11/-4)
2 files modified
debian/changelog (+7/-0)
debian/mail-stack-delivery.preinst (+4/-4)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/maverick/dovecot/karmic2lucid2maverick-upgrade-fix
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+37707@code.launchpad.net

Description of the change

This fixes upgrading from lucid if, since installing lucid, you have upgraded dovecot-postfix ever, which is quite common as it has received at least one update.

To post a comment you must log in.

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-10-01 08:36:22 +0000
3+++ debian/changelog 2010-10-06 07:13:55 +0000
4@@ -1,3 +1,10 @@
5+dovecot (1:1.2.12-1ubuntu8) maverick; urgency=low
6+
7+ * debian/mail-stack-delivery.preinst: Fixing shell syntax and typo in
8+ file rename code. (LP: #653362)
9+
10+ -- Clint Byrum <clint@ubuntu.com> Wed, 06 Oct 2010 00:00:48 -0700
11+
12 dovecot (1:1.2.12-1ubuntu7) maverick; urgency=low
13
14 [Dave Walker]
15
16=== modified file 'debian/mail-stack-delivery.preinst'
17--- debian/mail-stack-delivery.preinst 2010-09-23 08:58:04 +0000
18+++ debian/mail-stack-delivery.preinst 2010-10-06 07:13:55 +0000
19@@ -13,11 +13,11 @@
20 rm -f "$CONFFILE"
21 else
22 if [ -e "$CONFFILE" ]; then
23- if "$CONFFILE" eq "/etc/dovecot/conf.d/01-dovecot-postfix.conf"; then
24+ if [ "$CONFFILE" = "/etc/dovecot/conf.d/01-dovecot-postfix.conf" ]; then
25 mv -f "$CONFFILE" "/etc/dovecot/conf.d/01-mail-stack-delivery.conf"
26 fi
27- if "$CONFFILE" eq "/etc/dovecot/conf.d/01-dovecot-postfix.auth"; then
28- mv -f "$CONFFILE" "/etc/dovecot/conf.d/01-mail-stack-delivery.auth"
29+ if [ "$CONFFILE" = "/etc/dovecot/auth.d/01-dovecot-postfix.auth" ]; then
30+ mv -f "$CONFFILE" "/etc/dovecot/auth.d/01-mail-stack-delivery.auth"
31 fi
32 fi
33 fi
34@@ -39,7 +39,7 @@
35 mkdir "/var/backups/mail-stack-delivery/"
36 fi
37 mv -f "/var/backups/dovecot-postfix/main.cf-backup" "/var/backups/mail-stack-delivery/main.cf-backup"
38- test -d /var/backups/dovecot-postfix/ && rmdir /var/backups/dovecot-postfix/
39+ test -d /var/backups/dovecot-postfix/ && rmdir --ignore-fail-on-non-empty /var/backups/dovecot-postfix/
40 fi
41 fi
42

Subscribers

People subscribed via source and target branches

to all changes: