Merge branch 'debian' into squeeze

Conflicts:
	debian/changelog
	debian/control

diff --cc debian/changelog
index 34b89a3e7a0e9a0e15edad6216b5a0224651dd7d,4c70b023f4c8add2626cc7e3102d354455d39bd8..b81b0fa92253b526b4b7ab4efe34ccd9e2f240d7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,26 +1,34 @@@
- krb5-strength (2.2-1~sbp60+1) squeeze-backports; urgency=low
++krb5-strength (3.0-1~sbp60+1) squeeze-backports; urgency=medium
 +
 +  * 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>  Mon, 16 Dec 2013 15:56:00 -0800
 +
+ krb5-strength (3.0-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - SQLite password dictionaries are now supported and can be used to
+       reject passwords within edit distance one of any dictionary word.
+     - cdbmake-wordlist has been renamed to krb5-strength-wordlist and can
+       also generate SQLite databases compatible with this plugin and
+       Heimdal quality check program.
+     - heimdal-history, a password history implementation for Heimdal, has
+       been added and can be stacked with heimdal-strength to check both
+       history and password strength.
+     - New configuration option, minimum_different, which sets the minimum
+       number of different characters required in a password.
+   * Add the upstream signing key to debian/upstream/signing-key.asc and
+     configure uscan to do signature validation.  Configure uscan to
+     download the xz tarball instead of the gz tarball.
+   * Create a _history user and group and a /var/lib/heimdal-history
+     directory on package installation for the use of heimdal-history,
+     remove the user and the standard database on purge, and remove the
+     directory if empty on package purge or removal.
+ 
+  -- Russ Allbery <rra@debian.org>  Wed, 26 Mar 2014 00:04:13 -0700
+ 
  krb5-strength (2.2-1) unstable; urgency=low
  
    * New upstream release.

diff --cc debian/control
index 8fbdf13c30be05a9d5657f2ff82b8622730af970,1d43e1f4fd31f231dd4759f988e571f67fa10861..71321bbd7140eb24760bdeeed489197c954ed635
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,10 -3,12 +3,12 @@@ Section: ne
  Priority: extra
  Maintainer: Russ Allbery <rra@debian.org>
  Build-Depends: debhelper (>= 9), cracklib-runtime, dh-autoreconf,
-  heimdal-dev, libcdb-dev, libcrack2-dev, libfile-slurp-perl,
-  libipc-run-perl, libjson-perl, libperl6-slurp-perl, libreadonly-perl,
 - libcdb-dev, libcrack2-dev, libcrypt-pbkdf2-perl, libdb-file-lock-perl,
 - libdbd-sqlite3-perl, libdbi-perl, libfile-slurp-perl,
 - libgetopt-long-descriptive-perl, libipc-run-perl, libjson-perl,
 - libkrb5-dev (>= 1.9), libperl6-slurp-perl, libreadonly-perl,
 - libsqlite3-dev, libtest-pod-perl, libtest-minimumversion-perl,
 - libtest-strict-perl, perl, pkg-config, tinycdb
++ heimdal-dev, libcdb-dev, libcrack2-dev, libcrypt-pbkdf2-perl,
++ libdb-file-lock-perl, libdbd-sqlite3-perl, libdbi-perl,
++ libfile-slurp-perl, libgetopt-long-descriptive-perl, libipc-run-perl,
++ libjson-perl, libperl6-slurp-perl, libreadonly-perl, libsqlite3-dev,
 + libtest-pod-perl, libtest-minimumversion-perl, libtest-strict-perl, perl,
-  tinycdb
++ pkg-config, tinycdb
  Standards-Version: 3.9.5
  Homepage: http://www.eyrie.org/~eagle/software/krb5-strength/
  Vcs-Git: git://git.eyrie.org/kerberos/krb5-strength.git -b debian