[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.4a-68-ge0d6651
Mahyuddin Susanto
udienz at ubuntu.com
Mon Mar 26 16:28:56 UTC 2012
The following commit has been merged in the master branch:
commit e0d6651a0d25fa2d8575b50af5d5331e1e20ea85
Author: Mahyuddin Susanto <udienz at ubuntu.com>
Date: Mon Mar 26 23:28:25 2012 +0700
Wrap and sort debian/control*
Signed-off-by: Mahyuddin Susanto <udienz at ubuntu.com>
diff --git a/debian/changelog b/debian/changelog
index 473b2c0..986a8be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ proftpd-dfsg (1.3.4a-2) UNRELEASED; urgency=low
- Resync with latest dep5 format.
- Use stand-alone license paragraph for repeatable license.
- Use whitespace instead of comma separated for Files fields.
+ - wrap-and-sort.
* debian/control:
- Bump Standards-Version to 3.9.3.
* debian/rules: Enabled hardened flags, patch from Moritz Muehlenhoff.
@@ -16,7 +17,7 @@ proftpd-dfsg (1.3.4a-2) UNRELEASED; urgency=low
* debian/proftpd-basic.install: Add missing sftp-sql modules.
(Closes: 665191)
- -- Mahyuddin Susanto <udienz at ubuntu.com> Mon, 26 Mar 2012 23:22:55 +0700
+ -- Mahyuddin Susanto <udienz at ubuntu.com> Mon, 26 Mar 2012 23:27:59 +0700
proftpd-dfsg (1.3.4a-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 078cd62..ec865fb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,25 +4,50 @@ Priority: optional
Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Standards-Version: 3.9.3
-Build-Depends: libmysqlclient-dev, libpam-dev, debhelper (>= 7), zlib1g-dev,
- libpq-dev, libldap2-dev, libssl-dev (>= 0.9.8l), libwrap0-dev, libcap-dev [linux-any],
- autotools-dev, libncurses5-dev, libacl1-dev, libattr1-dev, unixodbc-dev, libsqlite3-dev,
- libpcre3-dev
+Build-Depends: autotools-dev,
+ debhelper (>= 7),
+ libacl1-dev,
+ libattr1-dev,
+ libcap-dev [linux-any],
+ libldap2-dev,
+ libmysqlclient-dev,
+ libncurses5-dev,
+ libpam-dev,
+ libpcre3-dev,
+ libpq-dev,
+ libsqlite3-dev,
+ libssl-dev (>= 0.9.8l),
+ libwrap0-dev,
+ unixodbc-dev,
+ zlib1g-dev
Homepage: http://www.proftpd.org/
Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
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
+Depends: adduser,
+ debconf (>= 0.5.00),
+ debianutils (>= 1.21.0),
+ libpam-runtime (>= 0.76-13.1),
+ netbase (>= 4.13),
+ sed (>= 4.1.5),
+ ucf (>= 0.30),
+ update-inetd,
+ ${misc:Depends},
+ ${shlibs:Depends}
Conflicts: ftp-server
Breaks: proftpd (<< 1.3.2)
Replaces: proftpd (<< 1.3.2)
Provides: ftp-server, proftpd, proftpd-abi-1.3.4a
-Suggests: proftpd-doc, openssl,
- proftpd-mod-mysql, proftpd-mod-pgsql, proftpd-mod-ldap, proftpd-mod-odbc, proftpd-mod-sqlite,
- openbsd-inetd | inet-superserver
+Suggests: openbsd-inetd | inet-superserver,
+ openssl,
+ proftpd-doc,
+ proftpd-mod-ldap,
+ proftpd-mod-mysql,
+ proftpd-mod-odbc,
+ proftpd-mod-pgsql,
+ proftpd-mod-sqlite
Description: Versatile, virtual-hosting FTP daemon - binaries
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
Protocol daemon supports also hidden directories, virtual hosts, and
@@ -35,13 +60,18 @@ Description: Versatile, virtual-hosting FTP daemon - binaries
upload/download ratios are also supported.
.
This package contains the daemon and all main modules used for
- common configurations. If you need database-centric authentication
+ common configurations. If you need database-centric authentication
install the suitable proftpd-mod suggested package.
Package: proftpd-dev
Architecture: any
-Depends: proftpd-basic (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
- libtool, libacl1-dev, libssl-dev, libpcre3-dev
+Depends: libacl1-dev,
+ libpcre3-dev,
+ libssl-dev,
+ libtool,
+ proftpd-basic (=${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Suggests: pkg-config
Description: Versatile, virtual-hosting FTP daemon - development files
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
@@ -73,7 +103,7 @@ Description: Versatile, virtual-hosting FTP daemon - documentation
not needed). Advanced features such as multiple password files and
upload/download ratios are also supported.
.
- This package contains the software documentation.
+ This package contains the software documentation.
Homepage: http://www.proftpd.org/docs
Package: proftpd-mod-mysql
diff --git a/debian/control.in b/debian/control.in
index f3ec91b..c1aa848 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,25 +4,50 @@ Priority: optional
Maintainer: ProFTPD Maintainance Team <pkg-proftpd-maintainers at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Standards-Version: 3.9.3
-Build-Depends: libmysqlclient-dev, libpam-dev, debhelper (>= 7), zlib1g-dev,
- libpq-dev, libldap2-dev, libssl-dev (>= 0.9.8l), libwrap0-dev, libcap-dev [linux-any],
- autotools-dev, libncurses5-dev, libacl1-dev, libattr1-dev, unixodbc-dev, libsqlite3-dev,
- libpcre3-dev
+Build-Depends: autotools-dev,
+ debhelper (>= 7),
+ libacl1-dev,
+ libattr1-dev,
+ libcap-dev [linux-any],
+ libldap2-dev,
+ libmysqlclient-dev,
+ libncurses5-dev,
+ libpam-dev,
+ libpcre3-dev,
+ libpq-dev,
+ libsqlite3-dev,
+ libssl-dev (>= 0.9.8l),
+ libwrap0-dev,
+ unixodbc-dev,
+ zlib1g-dev
Homepage: http://www.proftpd.org/
Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
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
+Depends: adduser,
+ debconf (>= 0.5.00),
+ debianutils (>= 1.21.0),
+ libpam-runtime (>= 0.76-13.1),
+ netbase (>= 4.13),
+ sed (>= 4.1.5),
+ ucf (>= 0.30),
+ update-inetd,
+ ${misc:Depends},
+ ${shlibs:Depends}
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
+Suggests: openbsd-inetd | inet-superserver,
+ openssl,
+ proftpd-doc,
+ proftpd-mod-ldap,
+ proftpd-mod-mysql,
+ proftpd-mod-odbc,
+ proftpd-mod-pgsql,
+ proftpd-mod-sqlite
Description: Versatile, virtual-hosting FTP daemon - binaries
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
Protocol daemon supports also hidden directories, virtual hosts, and
@@ -35,13 +60,18 @@ Description: Versatile, virtual-hosting FTP daemon - binaries
upload/download ratios are also supported.
.
This package contains the daemon and all main modules used for
- common configurations. If you need database-centric authentication
+ common configurations. If you need database-centric authentication
install the suitable proftpd-mod suggested package.
Package: proftpd-dev
Architecture: any
-Depends: proftpd-basic (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
- libtool, libacl1-dev, libssl-dev, libpcre3-dev
+Depends: libacl1-dev,
+ libpcre3-dev,
+ libssl-dev,
+ libtool,
+ proftpd-basic (=${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Suggests: pkg-config
Description: Versatile, virtual-hosting FTP daemon - development files
ProFTPD is a powerful modular FTP/SFTP/FTPS server. This File Transfer
@@ -73,7 +103,7 @@ Description: Versatile, virtual-hosting FTP daemon - documentation
not needed). Advanced features such as multiple password files and
upload/download ratios are also supported.
.
- This package contains the software documentation.
+ This package contains the software documentation.
Homepage: http://www.proftpd.org/docs
Package: proftpd-mod-mysql
--
ProFTPD core package
More information about the Pkg-proftpd-maintainers
mailing list