* Drop -DCRACKLIB_DICTS from CFLAGS, since the referenced define is no

  longer provided by cracklib2-dev 2.8 and above.  This requires a
  build-dependency on the corresponding version of libcrack2-dev.
  Closes: #490236.

3 files changed, 6 insertions, 2 deletions

diff --git a/changelog b/changelog
index c992b5f5..a39dfab9 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,10 @@ pam (0.99.7.1-7) UNRELEASED; urgency=low
   * Drop the 'XS' from Vcs-Svn/Vcs-Browser, since these are now officially
     recognized fields.
   * Add a Homepage field.  Closes: #473338.
+  * Drop -DCRACKLIB_DICTS from CFLAGS, since the referenced define is no
+    longer provided by cracklib2-dev 2.8 and above.  This requires a
+    build-dependency on the corresponding version of libcrack2-dev.
+    Closes: #490236.
 
  -- Steve Langasek <vorlon@debian.org>  Mon, 02 Jun 2008 11:44:27 -0700
 
diff --git a/control b/control
index 7763238f..2f1337a8 100644
--- a/control
+++ b/control
@@ -4,7 +4,7 @@ Priority: optional
 Uploaders: Karl Ramm <kcr@debian.org>, Sam Hartman <hartmans@debian.org>, Roger Leigh <rleigh@debian.org>
 Maintainer: Steve Langasek <vorlon@debian.org>
 Standards-Version: 3.7.2
-Build-Depends: cracklib2-dev (>= 2.7-9), bzip2, debhelper, quilt, flex, libdb-dev, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], po-debconf
+Build-Depends: libcrack2-dev (>= 2.8), bzip2, debhelper, quilt, flex, libdb-dev, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], po-debconf
 Build-Depends-Indep: xsltproc, libxml2-utils, docbook-xml, docbook-xsl, w3m
 Build-Conflicts-Indep: fop
 Vcs-Svn: svn://svn.debian.org/svn/pkg-pam/trunk/pam/
diff --git a/rules b/rules
index 6efd4992..68efb32e 100755
--- a/rules
+++ b/rules
@@ -5,7 +5,7 @@
 # architecture-dependant package, as well as an architecture-independant
 # package.
 
-CFLAGS	:= -g -D_GNU_SOURCE -D_REENTRANT -fPIC -DCRACKLIB_DICTS=CRACKLIB_DICTPATH
+CFLAGS	:= -g -D_GNU_SOURCE -D_REENTRANT -fPIC
 
 ifeq (,$(findstring noopt, ${DEB_BUILD_OPTIONS}))
 CFLAGS += -O2