[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc3-108-gf504c29

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 62146d6ac9e949a00f1c6ffb545570932821f822
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 30 13:23:40 2014 +0100

    Included fix for #699647

diff --git a/debian/changelog b/debian/changelog
index 844888e..ee94e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+proftpd-dfsg (1.3.5~rc3-3) UNRELEASED; urgency=medium
+
+  * Included fix by Andreas Beckmann:
+    - Cleanup Breaks+Replaces.
+    - Add proftpd-mod-geoip.preinst script to delete the old buggy postrm script
+      on upgrades from wheezy. Otherwise the buggy postrm script would delete
+      some files from the newly unpacked package. (Closes: #699647)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 30 Jan 2014 13:20:53 +0100
+
 proftpd-dfsg (1.3.5~rc3-2) unstable; urgency=low
 
   * Added version for dependency on memcached, for completeness.
diff --git a/debian/control b/debian/control
index f63d4e5..5ada7b8 100644
--- a/debian/control
+++ b/debian/control
@@ -192,8 +192,6 @@ Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
 Package: proftpd-mod-geoip
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: proftpd-mod-geoip (<< 1.3.5)
-Replaces: proftpd-mod-geoip (<< 1.3.5)
 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 --git a/debian/control.in b/debian/control.in
index 970d503..7cfe72b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -192,8 +192,6 @@ Description: Versatile, virtual-hosting FTP daemon - SQLite3 module
 Package: proftpd-mod-geoip
 Architecture: any
 Depends: proftpd-basic (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: proftpd-mod-geoip (<< 1.3.5)
-Replaces: proftpd-mod-geoip (<< 1.3.5)
 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 --git a/debian/proftpd-mod-geoip.preinst b/debian/proftpd-mod-geoip.preinst
new file mode 100644
index 0000000..44ded34
--- /dev/null
+++ b/debian/proftpd-mod-geoip.preinst
@@ -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#

-- 
ProFTPD core package