Merge branch 'debian' into squeeze

Conflicts:
	debian/changelog
	debian/control

diff --cc debian/changelog
index 69f31a02aa27639ff59b68512f20bd2a3df2fc2e,b8ec0948f67cf9145dbc09744b1cfe53dc685964..34b89a3e7a0e9a0e15edad6216b5a0224651dd7d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,22 @@@
- krb5-strength (2.1-1~sbp60+1) squeeze-backports; urgency=low
++krb5-strength (2.2-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
++ -- Russ Allbery <rra@debian.org>  Mon, 16 Dec 2013 15:56:00 -0800
++
+ krb5-strength (2.2-1) unstable; urgency=low
+ 
+   * New upstream release.
+     - Support for more complex length-sensitive character class
+       restrictions using the new require_classes configuration setting.
+     - cdbmake-wordlist now supports filtering out words based on maximum
+       length and user-supplied regular expressions, and supports running
+       in filter mode to generate a new word list.
+   * Update to standards version 3.9.5 (no changes required).
+ 
+  -- Russ Allbery <rra@debian.org>  Mon, 16 Dec 2013 15:36:29 -0800
  
  krb5-strength (2.1-1) unstable; urgency=low
  

diff --cc debian/control
index f1aeb3ab0b9d196559110b1d73849657bd95ce2a,fe6f96c637dd60a0f9bf2f380967fb0b7b8e1cfa..8fbdf13c30be05a9d5657f2ff82b8622730af970
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,11 -3,11 +3,11 @@@ Section: ne
  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
+ 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
  Vcs-Browser: http://git.eyrie.org/?p=kerberos/krb5-strength.git