[SCM] Debian package checker branch, master, updated. 2.5.6-60-g33acfe7

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit 33acfe76ea61ed413df56b09f88400404a0c348c
Author: Kees Cook <kees@outflux.net>
Date:   Wed Apr 4 23:05:28 2012 +0200

    Update for latest hardening-check
    
    Changes to the original patch:
     * This is a subset of the original patch.
     * (Also) update lintian depends on hardening-includes
    
    Signed-off-by: Kees Cook <kees@debian.org>
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/collection/hardening-info b/collection/hardening-info
index 6692c96..b7408be 100755
--- a/collection/hardening-info
+++ b/collection/hardening-info
@@ -44,13 +44,6 @@ if ( -e "$dir/hardening-info" ) {
 open OUT, '>', "$dir/hardening-info"
     or fail("cannot open hardening-info: $!");
 
-# If we're running inside the Lintian test suite itself, we need to avoid
-# all the tests except the "binaries-hardening" test.
-exit 0
-    if (defined $ENV{'LINTIAN_INTERNAL_TESTSUITE'} and
-        $ENV{'LINTIAN_INTERNAL_TESTSUITE'} eq "1" and
-        $dir !~ m|/binaries-hardening/binaries-hardening_1.0_.*_binary$|);
-
 # Prepare to examine the file tree.
 chdir ("$dir/unpacked")
     or fail("unable to chdir to unpacked: $!");
diff --git a/debian/control b/debian/control
index f13205a..755604a 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: binutils,
                fakeroot,
                file,
                gettext,
-               hardening-includes (>= 1.35),
+               hardening-includes (>= 2.0),
                intltool-debian,
                javahelper (>= 0.32~),
                libapt-pkg-perl,
@@ -63,7 +63,7 @@ Depends: binutils,
          diffstat,
          file,
          gettext,
-         hardening-includes (>= 1.35),
+         hardening-includes (>= 2.0),
          intltool-debian,
          libapt-pkg-perl,
          libc-bin (>= 2.13) | locales,

-- 
Debian package checker