[SCM] proftpd-dfsg branch, master, updated. debian/1.3.3a-6-22-g9021e4f

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 9021e4f4527098dfa7b5e6615d2bbba45f2990ef
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sat Feb 19 15:39:25 2011 +0100

    Fixed some more packaging issues.

diff --git a/debian/NEWS b/debian/NEWS
index b2b4583..80cdc7c 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -2,7 +2,7 @@ proftpd-dfsg (1.3.3d-4) unstable; urgency=low
 
     Starting from this version /etc/proftpd/proftpd.conf also includes 
     all files present at /etc/proftpd/conf.d/ to allow a better customization
-    without need of changing the main system files. 
+    without need of changing the main system files.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 13:45:18 +0100
 
diff --git a/debian/changelog b/debian/changelog
index 5fc4718..39aea8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 proftpd-dfsg (1.3.3d-4) unstable; urgency=low
 
-  * NOT YET RELEASED.
   * Fixed previous changelog.
   * Now proftpd.conf includes /etc/proftpd/conf.d contents to allow custom
     configurations being loaded after system ones in separate files.
@@ -11,8 +10,9 @@ proftpd-dfsg (1.3.3d-4) unstable; urgency=low
   * Updated debian/NEWS file with information about new conf.d directory.
   * Now configuration file name can be overriden at run-time.
     (closes: #613527)
+  * Now uses Breaks instead of Conflicts against pre-squeeze proftpd package.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 18 Feb 2011 19:14:56 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 19 Feb 2011 15:33:36 +0100
 
 proftpd-dfsg (1.3.3d-3) unstable; urgency=low
 
@@ -20,7 +20,8 @@ proftpd-dfsg (1.3.3d-3) unstable; urgency=low
     (closes: #599862)
   * Now grep uses --silet to avoid warning at /etc/inetd.conf parsing.
     (closes: #605781)
-  * Added commented TZ explicit set in proftpd.conf template. Thanks John Wright.
+  * Added commented TZ explicit set in proftpd.conf template. 
+    Thanks John Wright.
     (closes: #576888)
   * [PATCH] prxs.in fixed to avoid using the shell to call libtool, which
     prevents prxs working correctly with any shell.
@@ -34,7 +35,7 @@ proftpd-dfsg (1.3.3d-2) unstable; urgency=low
     added me as an Uploader.
   * Updated README.source to reflect changes to maintainance.
   * Changed long description in debian/control* to be more smart and up-to-date.
-  * Changed ProFTPd string occurrences in ProFTPD in all templates, as it is the 
+  * Changed ProFTPd string occurrences in ProFTPD in all templates, as it is the
     official program name since a long time.
   * Fixed proftpd-substvars for current version.
   * Now proftpd-substvars is updated at every build to avoid easy oversights.
diff --git a/debian/control b/debian/control
index aad62aa..8ffc514 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Package: proftpd-basic
 Architecture: any
 Depends: netbase (>= 4.13), ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5.00), adduser, 
  ucf (>= 0.30), debianutils (>= 1.21.0), libpam-runtime (>= 0.76-13.1),  sed (>= 4.1.5), update-inetd
-Conflicts: ftp-server, proftpd (<< 1.3.2)
+Conflicts: ftp-server
+Breaks: proftpd (<< 1.3.2)
 Replaces: proftpd (<< 1.3.2)
 Provides: ftp-server, proftpd, proftpd-abi-1.3.3d
 Suggests: proftpd-doc, openssl, proftpd-mod-mysql, proftpd-mod-pgsql, proftpd-mod-ldap, proftpd-mod-odbc, proftpd-mod-sqlite, openbsd-inetd | inet-superserver
diff --git a/debian/control.in b/debian/control.in
index 4e952c4..e4821bb 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -15,7 +15,8 @@ Package: proftpd-basic
 Architecture: any
 Depends: netbase (>= 4.13), ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5.00), adduser, 
  ucf (>= 0.30), debianutils (>= 1.21.0), libpam-runtime (>= 0.76-13.1),  sed (>= 4.1.5), update-inetd
-Conflicts: ftp-server, proftpd (<< 1.3.2)
+Conflicts: ftp-server
+Breaks: proftpd (<< 1.3.2)
 Replaces: proftpd (<< 1.3.2)
 Provides: ftp-server, proftpd, proftpd-abi- at VERSION@
 Suggests: proftpd-doc, openssl, proftpd-mod-mysql, proftpd-mod-pgsql, proftpd-mod-ldap, proftpd-mod-odbc, proftpd-mod-sqlite, openbsd-inetd | inet-superserver
diff --git a/debian/templates/proftpd.conf b/debian/templates/proftpd.conf
index 918021b..c51caee 100644
--- a/debian/templates/proftpd.conf
+++ b/debian/templates/proftpd.conf
@@ -183,4 +183,4 @@ AdminControlsEngine off
 # </Anonymous>
 
 # Include other custom configuration files
-Include /etc/proftpd/conf.d
+Include /etc/proftpd/conf.d/

-- 
ProFTPD core package