[med-svn] [SCM] fastx-toolkit branch, master, updated. debian/0.0.13.1-1-3-g98f8050

Andreas Tille tille at debian.org
Thu Apr 26 12:21:43 UTC 2012


The following commit has been merged in the master branch:
commit 98f805039e39bb3cbc4a553af33b8d5acec9427c
Author: Andreas Tille <tille at debian.org>
Date:   Thu Apr 26 14:20:39 2012 +0200

    Switch from cdbs to dh as a preparation to use hardening flags;  this has the additional side effect of having one lintian issue (duplicate upstream changelog) less. :-)

diff --git a/debian/changelog b/debian/changelog
index 7e21357..25107c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ fastx-toolkit (0.0.13.1-2) UNRELEASED; urgency=low
      - Standards-Version: 3.9.3 (no changes needed)
   * debian/patches/gcc-4.7.patch: Fix build issue with gcc-4.7
     Closes: #667161
+  * debian/rules: convert from cdbs to dh to finally enable hardening
+    flags
 
  -- Andreas Tille <tille at debian.org>  Wed, 25 Apr 2012 22:31:55 +0200
 
diff --git a/debian/control b/debian/control
index 32379fa..90d9f1e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: cdbs, debhelper (>= 8), autotools-dev, pkg-config, libgtextutils-dev
+Build-Depends: debhelper (>= 8), autotools-dev, pkg-config, libgtextutils-dev
 Standards-Version: 3.9.3
 Vcs-Browser: http://git.debian.org/?p=debian-med/fastx-toolkit.git
 Vcs-Git: git://git.debian.org/debian-med/fastx-toolkit.git
diff --git a/debian/rules b/debian/rules
index 134b09e..641748f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,13 @@
 #!/usr/bin/make -f
 
-DEB_INSTALL_CHANGELOGS_ALL = NEWS
+pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@
 
-install/fastx-toolkit::
-	rm --recursive $(CURDIR)/debian/fastx-toolkit/usr/share/aclocal
+override_dh_install:
+	dh_install
+	rm --recursive $(CURDIR)/debian/$(pkg)/usr/share/aclocal
+
+override_dh_installchangelogs:
+	dh_installchangelogs -k NEWS

-- 
FASTQ/A short-reads pre-processing tools



More information about the debian-med-commit mailing list