Merge branch 'debian' into squeeze

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 9a84041776b1fa4397fb342b1c3d00b65cac0dd1..69f31a02aa27639ff59b68512f20bd2a3df2fc2e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+krb5-strength (2.1-1~sbp60+1) squeeze-backports; urgency=low
+
+  * Special Stanford-only local backport that builds the package against
+    Heimdal instead of MIT Kerberos.  We only need the heimdal-strength
+    program and the MIT API isn't supported until wheezy.
+
+ -- Russ Allbery <rra@debian.org>  Tue, 05 Nov 2013 12:00:21 -0800
+
 krb5-strength (2.1-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/control b/debian/control
index 7538986a23dd18844cbe4f5cd88a51be3bb24022..f1aeb3ab0b9d196559110b1d73849657bd95ce2a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: net
 Priority: extra
 Maintainer: Russ Allbery <rra@debian.org>
 Build-Depends: debhelper (>= 9), cracklib-runtime, dh-autoreconf,
- libcdb-dev, libcrack2-dev, libfile-slurp-perl, libipc-run-perl,
- libjson-perl, libkrb5-dev (>= 1.9), libperl6-slurp-perl,
- libreadonly-perl, libtest-pod-perl, libtest-minimumversion-perl,
- libtest-strict-perl, perl, tinycdb
+ heimdal-dev, libcdb-dev, libcrack2-dev, libfile-slurp-perl,
+ libipc-run-perl, libjson-perl, libperl6-slurp-perl, libreadonly-perl,
+ libtest-pod-perl, libtest-minimumversion-perl, libtest-strict-perl, perl,
+ tinycdb
 Standards-Version: 3.9.4
 Homepage: http://www.eyrie.org/~eagle/software/krb5-strength/
 Vcs-Git: git://git.eyrie.org/kerberos/krb5-strength.git -b debian

diff --git a/debian/rules b/debian/rules
index b1e6f03bbe4010b4588cc4cfa278d7d2da652f97..286b90d707700d7e5f4c3d92febea16eee48af68 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_test:
 
 override_dh_auto_install:
        dh_auto_install --parallel
-       rm debian/$(PACKAGE)/usr/lib/*/krb5/plugins/pwqual/*.la
+       rm debian/$(PACKAGE)/usr/lib/krb5/plugins/pwqual/*.la
 
 override_dh_installchangelogs:
        dh_installchangelogs NEWS