[proftpd-dfsg] branch master updated (70db5fe -> 0e7a774)

[Hilmar Preuße]

This is an automated email from the git hooks/post-receive script.

hilmar-guest pushed a change to branch master
in repository proftpd-dfsg.

      from  70db5fe   Fixed proftpd-doc contents
       new  0e7a774   TL;DNR: new moduled and fixes, have a look @debian/changelog

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog                          |  34 +++-
 debian/clean                              |   4 +
 debian/control                            |   5 +-
 debian/control.in                         |   3 +-
 debian/patches/ftpasswd.cracklib.location |   2 +
 debian/patches/ftpstats                   |   6 +-
 debian/patches/mod_cap                    |  12 +-
 debian/patches/mod_sql_mysql.c            |   6 +-
 debian/patches/mod_wrap_noparanoid        |   6 +-
 debian/patches/odbc                       |   9 +-
 debian/patches/series                     |   2 +
 debian/patches/spelling_errors            |  36 ++--
 debian/patches/upstream_4335              |  33 ++++
 debian/patches/upstream_4336              | 276 ++++++++++++++++++++++++++++++
 debian/proftpd-basic.install              |  15 +-
 debian/proftpd-substvars                  |   2 +-
 debian/rules                              |  16 +-
 debian/templates/geoip.conf               | 101 +++++++++++
 18 files changed, 523 insertions(+), 45 deletions(-)
 create mode 100644 debian/patches/upstream_4335
 create mode 100644 debian/patches/upstream_4336
 create mode 100644 debian/templates/geoip.conf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git