Switch from cdbs to dh to easily enable hardening flags

diff --git a/debian/changelog b/debian/changelog
index db269e1f327eb3dda0e3b2ac03de420b14f32dca..bcd842abba1b3d1452858737bc1fb0b289b3f605 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ tabix (0.2.5-2) UNRELEASED; urgency=low
   * debian/patches/count-set-but-not-used.patch: uncomment unused
     variable
     Closes: #626267
+  * debian/control:
+     - Standards-Version: 3.9.3 (no changes needed)
+     - removed cdbs from Build-Depends
+  * debian/rules: Switched to dh to easily enable hardening flags
 
  -- Andreas Tille <tille@debian.org>  Wed, 25 Apr 2012 17:02:10 +0200
 

diff --git a/debian/control b/debian/control
index aa004543d8c07c05d4d5b19bb3d4af2e26fe5587..48deb98a5f2b5d11ad51f461f2eaafe2605132c0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ 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: cdbs, debhelper (>= 8), zlib1g-dev
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8), zlib1g-dev
+Standards-Version: 3.9.3
 Homepage: http://samtools.sourceforge.net/tabix.shtml
 Vcs-Git: git://git.debian.org/debian-med/tabix.git
 Vcs-Browser: http://git.debian.org/?p=debian-med/tabix.git

diff --git a/debian/rules b/debian/rules
index dd55160b60f383ad8c6362bab7c2214ad30b45b1..3cfec413500acbca0d2e50914f3e6cd7c8f14b48 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+%:
+       dh $@
 
-DEB_COMPRESS_EXCLUDE  = .tbi
+override_dh_compress:
+       dh_compress --exclude=.tbi