summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index f365386a..284aa8b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pam (1.0.1-5) UNRELEASED; urgency=low
+
+ * Build-conflict with libxcrypt-dev, which otherwise pulls libxcrypt in as
+ a dependency of libpam-modules if it's installed during the build.
+ Thanks to Larry Doolittle for catching.
+
+ -- Steve Langasek <vorlon@debian.org> Fri, 29 Aug 2008 13:08:41 -0700
+
pam (1.0.1-4) unstable; urgency=high
* High-urgency upload for RC bugfix.
diff --git a/debian/control b/debian/control
index 4f181e92..0cbc11e6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.0
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
-Build-Conflicts: libdb4.2-dev
+Build-Conflicts: libdb4.2-dev, libxcrypt-dev
Vcs-Bzr: http://bzr.debian.org/bzr/pkg-pam/debian/sid/
Homepage: http://pam.sourceforge.net/