Imported Debian patch 3.7-13

diff --git a/debian/changelog b/debian/changelog
index c596f1660549461607676e6e935cc0086f39c761..39cba9049b0cff01d536e9d341b40bd4968afe49 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sash (3.7-13) unstable; urgency=low
+
+  * Update to debhelper compat version 9, which adds hardening.
+  * Update to newer Standards-Version, add Built-Using field.
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Sun, 29 Sep 2013 16:11:22 +0200
+
 sash (3.7-12) unstable; urgency=low
 
   * Update lintian overrides for new names.

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/debian/control b/debian/control
index fc1adb3f2c38fbb05980ab6e514e77f5c0fd78e3..4992332e7e501deb799936c702b255fb0b6a3029 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: sash
 Section: shells
 Priority: optional
 Maintainer: Tollef Fog Heen <tfheen@debian.org>
-Standards-Version: 3.8.0
-Build-Depends: zlib1g-dev (>= 1:1.2.2-7), debhelper (>= 8),
+Standards-Version: 3.9.4
+Build-Depends: zlib1g-dev (>= 1:1.2.2-7), debhelper (>= 9),
  e2fslibs-dev [!kfreebsd-amd64 !kfreebsd-i386],
  kfreebsd-kernel-headers [kfreebsd-amd64 kfreebsd-i386]
 
@@ -13,6 +13,7 @@ Section: shells
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: doc-debian
+Built-Using: ${built-using}
 Description: Stand-alone shell
  sash serves as an interactive substitute for /bin/sh, for use when
  /bin/sh is unusable.  It's statically linked, and includes many standard

diff --git a/debian/rules b/debian/rules
index b4da5d222b8210d29e7bb5f854bad442b023dc48..0903e46e4e9ef8f4f4de3aa9baf341c5bf9e34ac 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
 
 pkgdir := `pwd`/debian/sash
 
+BUILT_USING := $(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W zlib1g-dev libc6-dev)
+
 %:
        dh $@
 
@@ -14,3 +16,6 @@ override_dh_auto_install:
 override_dh_install:
        dh_install
        install -m 0644 debian/lintian-overrides $(pkgdir)/usr/share/lintian/overrides/sash
+
+override_dh_gencontrol:
+       dh_gencontrol -- -V"built-using=$(BUILT_USING)"