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

[Francesco P. Lovergine]

The following commit has been merged in the master branch:
commit 1fc785b055f67ae8315e8dd3c9ba99262ac72c83
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date:   Sun Feb 13 12:49:26 2011 +0100

    Fixed #576888

diff --git a/debian/changelog b/debian/changelog
index 3590e49..e814162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ 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.
+    (closes: #576888)
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 12 Feb 2011 17:35:25 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 13 Feb 2011 12:47:31 +0100
 
 proftpd-dfsg (1.3.3d-2) unstable; urgency=low
 
diff --git a/debian/templates/proftpd.conf b/debian/templates/proftpd.conf
index 12137f5..6cff352 100644
--- a/debian/templates/proftpd.conf
+++ b/debian/templates/proftpd.conf
@@ -1,6 +1,7 @@
 #
 # /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
-# To really apply changes reload proftpd after modifications.
+# To really apply changes, reload proftpd after modifications, if
+# it runs in daemon mode. It is not required in inetd/xinetd mode.
 # 
 
 # Includes DSO modules
@@ -88,6 +89,12 @@ AllowOverwrite			on
 TransferLog /var/log/proftpd/xferlog
 SystemLog   /var/log/proftpd/proftpd.log
 
+# In order to keep log file dates consistent after chroot, use timezone info
+# from /etc/localtime.  If this is not set, and proftpd is configured to
+# chroot (e.g. DefaultRoot or <Anonymous>), it will use the non-daylight
+# savings timezone regardless of whether DST is in effect.
+#SetEnv TZ :/etc/localtime
+
 <IfModule mod_quotatab.c>
 QuotaEngine off
 </IfModule>

-- 
ProFTPD core package