Fix upstream makefile to enable hardening flags as well use debhelper 9 to support...

diff --git a/debian/changelog b/debian/changelog
index bcd842abba1b3d1452858737bc1fb0b289b3f605..84034b5dd1eacc977e1135246b5eb94f62cd20aa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ tabix (0.2.5-2) UNRELEASED; urgency=low
      - Standards-Version: 3.9.3 (no changes needed)
      - removed cdbs from Build-Depends
   * debian/rules: Switched to dh to easily enable hardening flags
+  * debhelper 9 (control+compat) to enable building with hardening
+    flags
+  * debian/patches/use-dpkg-buildflags.patch: Regard hardening flags
 
  -- Andreas Tille <tille@debian.org>  Wed, 25 Apr 2012 17:02:10 +0200
 

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 48deb98a5f2b5d11ad51f461f2eaafe2605132c0..40d718171f6e261f847ead54b5294bbbc7a1ecff 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy@debian.org>,
  Andreas Tille <tille@debian.org>
-Build-Depends: debhelper (>= 8), zlib1g-dev
+Build-Depends: debhelper (>= 9), zlib1g-dev
 Standards-Version: 3.9.3
 Homepage: http://samtools.sourceforge.net/tabix.shtml
 Vcs-Git: git://git.debian.org/debian-med/tabix.git

diff --git a/debian/patches/series b/debian/patches/series
index f51f525c8277116a1dab77914060ebf7a0c08cf2..2effa734bb01c506f331cd76ff748c24e219d20d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 count-set-but-not-used.patch
+use-dpkg-buildflags.patch

diff --git a/debian/patches/use-dpkg-buildflags.patch b/debian/patches/use-dpkg-buildflags.patch
new file mode 100644 (file)
index 0000000..7856be7
--- /dev/null
+++ b/debian/patches/use-dpkg-buildflags.patch
@@ -0,0 +1,11 @@
+--- tabix.orig/Makefile
++++ tabix/Makefile
+@@ -12,7 +12,7 @@
+ .SUFFIXES:.c .o
+ 
+ .c.o:
+-              $(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
++              $(CC) -c $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS) $(DFLAGS) $(LDFLAGS) $(INCLUDES) $< -o $@
+ 
+ all-recur lib-recur clean-recur cleanlocal-recur install-recur:
+               @target=`echo $@ | sed s/-recur//`; \