Your message dated Sun, 25 Jan 2015 19:42:21 +0000
with message-id <1422214941.2056.11.ca...@adam-barratt.org.uk>
and subject line Re: Bug#776226: unblock: courier/0.73.1-1.6
has caused the Debian Bug report #776226,
regarding unblock: courier/0.73.1-1.6
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
776226: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776226
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package courier
This fixes diversions and alternatives handling:
* cleanup a typoed diversion remaining from lenny
* do not remove and reinstall alternatives on upgrades
(might not preserve local customization)
unblock courier/0.73.1-1.6
Andreas
diff -u courier-0.73.1/debian/changelog courier-0.73.1/debian/changelog
--- courier-0.73.1/debian/changelog
+++ courier-0.73.1/debian/changelog
@@ -1,3 +1,13 @@
+courier (0.73.1-1.6) unstable; urgency=medium
+
+ * Non-maintainer upload with maintainer approval.
+ * courier-mta.preinst: Clean up a misspelled diversion dating back to lenny.
+ (Closes: #692954)
+ * courier-base.prerm, courier-mta.prerm: Do not remove (and reinstall)
+ alternatives on upgrades, as that may remove local customization.
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 25 Jan 2015 16:34:52 +0100
+
courier (0.73.1-1.5) unstable; urgency=medium
* Non-maintainer upload.
diff -u courier-0.73.1/debian/courier-base.prerm courier-0.73.1/debian/courier-base.prerm
--- courier-0.73.1/debian/courier-base.prerm
+++ courier-0.73.1/debian/courier-base.prerm
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA.
-if [ "$1" = "upgrade" -o "$1" = "remove" ]; then
+if [ "$1" = "remove" ]; then
for binary in maildirmake deliverquota makedat; do
update-alternatives --remove $binary /usr/bin/$binary.courier
done
diff -u courier-0.73.1/debian/courier-mta.preinst courier-0.73.1/debian/courier-mta.preinst
--- courier-0.73.1/debian/courier-mta.preinst
+++ courier-0.73.1/debian/courier-mta.preinst
@@ -25,6 +25,15 @@
--divert /usr/share/man/man1/addcr.ucspi-tcp.1.gz /usr/share/man/man1/addcr.1.gz
}
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+ # remove misspelled diversion dating back to lenny
+ # do not use --rename to avoid clashing with the correctly spelled diversion
+ if [ -n "$(dpkg-divert --listpackage /usr/share/man/man1/addcr.1.g)" ]; then
+ dpkg-divert --package courier-mta --remove \
+ --divert /usr/share/man/man1/addcr.ucspi-tcp.1.gz /usr/share/man/man1/addcr.1.g
+ fi
+fi
+
if [ "$1" = "install" ]; then
add_diversion
fi
diff -u courier-0.73.1/debian/courier-mta.prerm courier-0.73.1/debian/courier-mta.prerm
--- courier-0.73.1/debian/courier-mta.prerm
+++ courier-0.73.1/debian/courier-mta.prerm
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
# MA 02111-1307 USA.
-if [ "$1" = "upgrade" -o "$1" = "remove" ]; then
+if [ "$1" = "remove" ]; then
for binary in lockmail preline; do
update-alternatives --remove $binary /usr/bin/$binary.courier
done
--- End Message ---
--- Begin Message ---
On Sun, 2015-01-25 at 18:31 +0100, Andreas Beckmann wrote:
> Please unblock package courier
Unblocked by Niels.
Regards,
Adam
--- End Message ---
