Followup-For: Bug #699647
Control: tag -1 pending
Hi,
I have now prepared a NMU and will upload this to DELAYED/2.
Please let me know if I should delay it longer.
I plan to get a corresponding fix into the next wheezy point release.
Andreas
diff -Nru proftpd-dfsg-1.3.5~rc3/debian/changelog proftpd-dfsg-1.3.5~rc3/debian/changelog
--- proftpd-dfsg-1.3.5~rc3/debian/changelog 2013-10-05 14:59:31.000000000 +0200
+++ proftpd-dfsg-1.3.5~rc3/debian/changelog 2014-01-26 03:39:39.000000000 +0100
@@ -1,3 +1,13 @@
+proftpd-dfsg (1.3.5~rc3-2.2) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * proftpd-mod-geoip:
+ - Cleanup Breaks+Replaces.
+ - Add preinst script to delete the old buggy postrm script on upgrades
+ from wheezy. (Closes: #699647)
+
+ -- Andreas Beckmann <a...@debian.org> Sun, 26 Jan 2014 03:35:08 +0100
+
proftpd-dfsg (1.3.5~rc3-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru proftpd-dfsg-1.3.5~rc3/debian/control proftpd-dfsg-1.3.5~rc3/debian/control
--- proftpd-dfsg-1.3.5~rc3/debian/control 2013-10-05 15:00:53.000000000 +0200
+++ proftpd-dfsg-1.3.5~rc3/debian/control 2014-01-26 03:45:31.000000000 +0100
@@ -192,8 +192,6 @@
Package: proftpd-mod-geoip
Architecture: any
Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: proftpd-mod-geoip (<< 1.3.5~rc1-1)
-Replaces: proftpd-mod-geoip (<< 1.3.5~rc1-1)
Description: Versatile, virtual-hosting FTP daemon - GeoIP module
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
Protocol daemon supports also hidden directories, virtual hosts, and
diff -Nru proftpd-dfsg-1.3.5~rc3/debian/control.in proftpd-dfsg-1.3.5~rc3/debian/control.in
--- proftpd-dfsg-1.3.5~rc3/debian/control.in 2013-10-05 14:59:31.000000000 +0200
+++ proftpd-dfsg-1.3.5~rc3/debian/control.in 2014-01-26 03:37:31.000000000 +0100
@@ -192,8 +192,6 @@
Package: proftpd-mod-geoip
Architecture: any
Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: proftpd-mod-geoip (<< 1.3.5~rc1-1)
-Replaces: proftpd-mod-geoip (<< 1.3.5~rc1-1)
Description: Versatile, virtual-hosting FTP daemon - GeoIP module
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
Protocol daemon supports also hidden directories, virtual hosts, and
diff -Nru proftpd-dfsg-1.3.5~rc3/debian/proftpd-mod-geoip.preinst proftpd-dfsg-1.3.5~rc3/debian/proftpd-mod-geoip.preinst
--- proftpd-dfsg-1.3.5~rc3/debian/proftpd-mod-geoip.preinst 1970-01-01 01:00:00.000000000 +0100
+++ proftpd-dfsg-1.3.5~rc3/debian/proftpd-mod-geoip.preinst 2014-01-26 03:44:28.000000000 +0100
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]
+then
+ if dpkg --compare-versions "$2" lt-nl "0.3-1+deb7u1"
+ then
+ rm -fv $(dpkg-query --control-path proftpd-mod-geoip postrm)
+ fi
+fi
+
+#DEBHELPER#
