Merge branch 'master' of git+ssh://db.debian.org/git/debian.org

* 'master' of git+ssh://db.debian.org/git/debian.org:
  lintian wants hardening-includes (>= 2.0)

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 903bb9549cc324404da3951d01b4df1dc4c79882..5a23111f03781654184ee6ba3cf444e99a552a7a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,5 @@
 debian.org (49) XXstable; urgency=low
 
-  [ Peter Palfrader ]
-  * 
-
   [ Felipe Augusto van de Wiel (faw) ]
   * Add ddtp.debian.org
   * Add i18n.debian.org
@@ -11,7 +8,11 @@ debian.org (49) XXstable; urgency=low
   [ Martin Zobel-Helas ]
   * decline to have LoadModule and LoadFile in vhosts
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 23 May 2012 16:22:27 +0200
+  [ Peter Palfrader ]
+  * lintian:
+    - hardening-includes (>= 2.0)
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 20 Jun 2012 06:55:54 +0200
 
 debian.org (48) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index cace246964c72b40e3d70968c20f3b6161efc78b..82a5585ccc82b54d7261d0ef9c2742d46fe9b743 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -569,6 +569,8 @@ Depends:   binutils,
        ,
        docbook-utils,
        docbook-xml
+       ,
+       hardening-includes (>= 2.0)
 Description: metapackages for lintian.debian.org dependencies
  This package depends on everything that is needed for lintian.debian.org.