[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 01/01: Update debian/control and debian/rules to reflect new stable/unstable versions

[Ondrej Sury]

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

ondrej pushed a commit to branch master
in repository cyrus-sasl2.

commit c89d809bb3ff71db315beb1edf9cd61b7ece2ff3
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Feb 11 14:35:21 2014 +0100

    Update debian/control and debian/rules to reflect new stable/unstable versions
---
 debian/control | 21 +++++++--------------
 debian/rules   |  8 ++++++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 21a3844..add0a99 100644
--- a/debian/control
+++ b/debian/control
@@ -5,27 +5,22 @@ Maintainer: Debian Cyrus SASL Team <pkg-cyrus-sasl2-debian-devel at lists.alioth.de
 Uploaders: Fabian Fagerholm <fabbe at debian.org>, Roberto C. Sanchez <roberto at connexer.com>, Ondřej Surý <ondrej at debian.org>, Adam Conrad <adconrad at 0c3.net>
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9),
-	       quilt (>= 0.46-7~),
+	       quilt,
 	       autotools-dev,
-	       automake,
-	       autoconf,
-	       libtool,
 	       libdb-dev,
-	       libpam0g-dev (>= 0.76-22),
-	       libssl-dev (>= 0.9.7e-3),
-	       libmysqlclient-dev | libmysqlclient15-dev (>= 5.0.20),
-	       libpq-dev (>= 8.1.3-4),
+	       libpam0g-dev,
+	       libssl-dev,
+	       libmysqlclient-dev | libmysqlclient15-dev,
+	       libpq-dev,
 	       heimdal-multidev,
 	       krb5-multidev,
 	       libkrb5-dev,
 	       libsqlite3-dev,
-	       libldap2-dev (>= 2.1.30-8),
+	       libldap2-dev,
 	       chrpath,
 	       groff-base,
-	       debconf (>= 0.5) | debconf-2.0,
 	       po-debconf,
 	       docbook-to-man,
-	       hardening-wrapper,
 	       dh-autoreconf
 Build-Conflicts: heimdal-dev
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-cyrus-sasl2/cyrus-sasl2.git
@@ -39,9 +34,7 @@ Architecture: any
 Depends: libsasl2-2 (>= ${binary:Version}),
 	 ${shlibs:Depends},
 	 ${misc:Depends},
-	 lsb-base (>= 3.0-6),
-	 db-util,
-	 debconf (>= 1.4.69) | cdebconf (>= 0.39)
+	 db-util
 Breaks: libsasl2-2 (<< 2.1.26.dfsg1-2~)
 Replaces: libsasl2-2 (<< 2.1.26.dfsg1-2~)
 Description: Cyrus SASL - administration programs for SASL users database
diff --git a/debian/rules b/debian/rules
index 19e1d0a..ac530f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,11 @@
 # Debhelper control.
 export DH_ALWAYS_EXCLUDE=CVS
 #export DH_VERBOSE=1 # uncomment this to turn on verbose mode
-export DEB_BUILD_HARDENING=1
+
+# Enable package hardening through dpkg-buildflags
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -106,7 +110,7 @@ BUILD_TMP_SUFFIX=.debian-build.tmp
 ### The Makefile targets begin. ###
 
 %:
-	dh $@ --with=quilt --with=autoreconf $(DH_PACKAGE_EXCLUDES)
+	dh $@ --with=quilt --with=autotools_dev --with=autoreconf $(DH_PACKAGE_EXCLUDES)
 
 override_dh_auto_clean:
 	dh_auto_clean -B$(TMPBUILD_MIT)

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