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

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 9144843a0295517470c03e083957318daf30b410
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 15 13:28:18 2011 +0100

    Minor changes and a new conf.d introduced.

diff --git a/debian/changelog b/debian/changelog
index 61552e9..91e3ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
-proftpd-dfsg (1.3.3d-3) unstable; urgency=low
+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.
+  * Added README.Debian for proftpd-dev to explain how to build add-on
+    modules.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 15 Feb 2011 12:45:20 +0100
+
+proftpd-dfsg (1.3.3d-3) unstable; urgency=low
+
   * Updated danish template.
     (closes: #599862)
   * Now grep uses --silet to avoid warning at /etc/inetd.conf parsing.
diff --git a/debian/proftpd-basic.dirs b/debian/proftpd-basic.dirs
index 817da2c..c4a5aec 100644
--- a/debian/proftpd-basic.dirs
+++ b/debian/proftpd-basic.dirs
@@ -6,6 +6,7 @@ usr/bin
 usr/sbin
 usr/lib/proftpd
 etc/proftpd
+etc/proftpd/conf.d
 usr/share/proftpd
 usr/share/proftpd/templates
 var/log/proftpd
diff --git a/debian/proftpd-dev.README.Debian b/debian/proftpd-dev.README.Debian
new file mode 100644
index 0000000..e8ec425
--- /dev/null
+++ b/debian/proftpd-dev.README.Debian
@@ -0,0 +1,23 @@
+ProFTPD third parties module and packages development
+-----------------------------------------------------
+
+Upstream provides `prxs' as a useful tool to build your own proftpd DSO modules.
+The resulting shared library can be loaded in the /usr/lib/proftpd directory to
+allow proftpd finding the additional module.
+This could be done with a command like
+
+    prxs -c -i -d mod_foo.c
+
+The resulting module mod_foo.so is strictly binary-dependent on the specific
+version of proftpd you used to build it by prxs. If you prefer creating
+a deb source package Debian proftpd-dev package provides 
+
+    /usr/share/proftpd/proftpd.substvars
+
+which can be used to introduce a dependency on ${proftpd:Depends} in 
+your debian/control for foo binary package. You have to add its contents 
+to a debian/<foo>.substvars or debian/substvars with a command like
+
+    cat /usr/share/proftpd/proftpd.substvars >>debian/<foo>.substvars
+
+just before calling dh_gencontrol or dpkg-gencontrol.
diff --git a/debian/templates/proftpd.conf b/debian/templates/proftpd.conf
index 6cff352..918021b 100644
--- a/debian/templates/proftpd.conf
+++ b/debian/templates/proftpd.conf
@@ -181,3 +181,6 @@ AdminControlsEngine off
 #   # </Directory>
 # 
 # </Anonymous>
+
+# Include other custom configuration files
+Include /etc/proftpd/conf.d

-- 
ProFTPD core package