[med-svn] r10224 - trunk/packages/rnahybrid/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-03-31 21:39:39 +0000 (Sat, 31 Mar 2012)
New Revision: 10224

Modified:
   trunk/packages/rnahybrid/trunk/debian/changelog
   trunk/packages/rnahybrid/trunk/debian/compat
   trunk/packages/rnahybrid/trunk/debian/control
   trunk/packages/rnahybrid/trunk/debian/rules
Log:
Short dh in debian/rules; debhelper 9


Modified: trunk/packages/rnahybrid/trunk/debian/changelog
===================================================================
--- trunk/packages/rnahybrid/trunk/debian/changelog	2012-03-31 21:03:42 UTC (rev 10223)
+++ trunk/packages/rnahybrid/trunk/debian/changelog	2012-03-31 21:39:39 UTC (rev 10224)
@@ -1,13 +1,14 @@
 rnahybrid (2.1-3) UNRELEASED; urgency=low
 
   [ Charles Plessy ]
-  * Documented informations in debian/upstream
-  * Removed mention of the bibliographic reference in debian/controlâ
+  * Documented information in debian/upstream
+  * Removed mention of the bibliographic reference in debian/control
 
   [ Andreas Tille ]
   * debian/source/format: 3.0 (quilt)
   * debian/control: Standards-Version: 3.9.3 (no changes needed)
-  * debhelper 8 (control+compat)
+  * debhelper 9 (control+compat)
+  * debian/rules: short dh
 
  -- Andreas Tille <tille at debian.org>  Sat, 31 Mar 2012 22:52:18 +0200
 

Modified: trunk/packages/rnahybrid/trunk/debian/compat
===================================================================
--- trunk/packages/rnahybrid/trunk/debian/compat	2012-03-31 21:03:42 UTC (rev 10223)
+++ trunk/packages/rnahybrid/trunk/debian/compat	2012-03-31 21:39:39 UTC (rev 10224)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/rnahybrid/trunk/debian/control
===================================================================
--- trunk/packages/rnahybrid/trunk/debian/control	2012-03-31 21:03:42 UTC (rev 10223)
+++ trunk/packages/rnahybrid/trunk/debian/control	2012-03-31 21:39:39 UTC (rev 10224)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), autotools-dev, libg2-dev
+Build-Depends: debhelper (>= 9), autotools-dev, libg2-dev
 Standards-Version: 3.9.3
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/rnahybrid/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/rnahybrid/trunk/

Modified: trunk/packages/rnahybrid/trunk/debian/rules
===================================================================
--- trunk/packages/rnahybrid/trunk/debian/rules	2012-03-31 21:03:42 UTC (rev 10223)
+++ trunk/packages/rnahybrid/trunk/debian/rules	2012-03-31 21:39:39 UTC (rev 10224)
@@ -1,49 +1,18 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+%:
+	dh $@ --with autotools_dev
 
-CFLAGS = -Wall -g
+override_dh_auto_configure:
+	dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) \
+			    --build=$(DEB_BUILD_GNU_TYPE) \
+			    --prefix=/usr \
+			    --mandir=\$${prefix}/share/man \
+			    CFLAGS="$(CFLAGS)" \
+			    LDFLAGS="-Wl,-z,defs"
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure 	--host=$(DEB_HOST_GNU_TYPE)\
-			--build=$(DEB_BUILD_GNU_TYPE)\
-			--prefix=/usr\
-			--mandir=\$${prefix}/share/man\
-			CFLAGS="$(CFLAGS)"\
-			LDFLAGS="-Wl,-z,defs"
-
-build: build-stamp
-
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean: config.status
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-	$(MAKE) distclean
-	dh_clean config.sub config.guess 
-
-test: build
+override_dh_auto_test:
 	src/RNAhybrid -s 3utr_worm -t examples/cel-hbl-1.fasta -q examples/cel-let-7.fasta
 	src/RNAcalibrate -d examples/3UTR_worm.freq -k 50 -l 50,30 -q examples/cel-let-7.fasta
 	src/RNAhybrid -d 1.9,0.28 -t examples/cel-hbl-1.fasta -q examples/cel-let-7.fasta
@@ -51,31 +20,3 @@
 	src/RNAcalibrate -f 2,7 -d examples/3UTR_worm.freq -k 50 -l 50,30 -q examples/cel-let-7.fasta
 	src/RNAhybrid -s 3utr_worm -t examples/cbr-hbl-1.fasta -q examples/cel-let-7.fasta
 	-src/RNAeffective -k 30 -s -t examples/hbl-1.fasta -q examples/cel-let-7.fasta
-
-install: build test
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/rnahybrid install
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs README
-	dh_installexamples examples/*
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install