[med-svn] r10184 - trunk/packages/wise/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2012-03-30 10:23:06 +0000 (Fri, 30 Mar 2012)
New Revision: 10184

Modified:
   trunk/packages/wise/trunk/debian/changelog
   trunk/packages/wise/trunk/debian/rules
Log:
Short and verbose debhelper.

Closes: #666319


Modified: trunk/packages/wise/trunk/debian/changelog
===================================================================
--- trunk/packages/wise/trunk/debian/changelog	2012-03-30 10:09:23 UTC (rev 10183)
+++ trunk/packages/wise/trunk/debian/changelog	2012-03-30 10:23:06 UTC (rev 10184)
@@ -1,7 +1,11 @@
 wise (2.4.1-10) UNRELEASED; urgency=low
 
+  * Convert debian/rules to dh, Closes: #666319, as it restores build flags.
+  * Verbose debhelper in debian/rules.
   * Normalised and upgraded debian/copyright file with ‘cme fix’.
   * Pre-Depends on dpkg (>= 1.15.6~) (debian/control).
+  * Conforms to Debian policy 3.9.3 (debian/control, no other changes needed).
+  * Convert debian/rules to dh, Closes: #666319, as it restores build flags.
 
  -- Charles Plessy <plessy at debian.org>  Fri, 30 Mar 2012 19:05:42 +0900
 

Modified: trunk/packages/wise/trunk/debian/rules
===================================================================
--- trunk/packages/wise/trunk/debian/rules	2012-03-30 10:09:23 UTC (rev 10183)
+++ trunk/packages/wise/trunk/debian/rules	2012-03-30 10:23:06 UTC (rev 10184)
@@ -2,40 +2,14 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
+%:
+	dh $@ --with quilt
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-include /usr/share/quilt/quilt.make
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	touch configure-stamp
-
-build: patch build-stamp
-build-stamp: $(QUILT_STAMPFN) configure-stamp build-arch-stamp build-indep-stamp
-	dh_testdir
-	touch $@
-
-build-arch: build-arch-stamp
-build-arch-stamp:
-	dh_testdir
+override_dh_auto_build:
 	$(MAKE) -C src all
 	$(MAKE) -C debian/manpages.d
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp:
-	dh_testdir
-
 #	build documentation manually (docs/makefile is not useable)
 	cat src/models/*.tex src/dynlibsrc/*.tex | perl docs/gettex.pl > docs/temp.tex
 	cat docs/wise2api.tex docs/temp.tex docs/apiend.tex > docs/api.tex
@@ -52,37 +26,27 @@
 #	cd docs && ps2pdf genewise21.eps
 	cd docs && pdflatex wise2.tex
 	cd docs && pdflatex wise2.tex
-
 	cd docs && hevea api.tex
 	cd docs && hevea api.tex
 	cd docs && hevea dynamite.tex
 	cd docs && hevea dynamite.tex
 	cd docs && hevea wise2.tex
 	cd docs && hevea wise2.tex
-
 	mkdir -p docs/api
 	mkdir -p docs/dynamite
 	mkdir -p docs/wise2
-
 	mv docs/api.html docs/api
 	mv docs/dynamite.html docs/dynamite
 	mv docs/wise2.html docs/wise2
-
 	touch $@
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
+override_dh_clean:
 	$(MAKE) -C src clean
 	$(MAKE) -C debian/manpages.d clean
-
 #	bugfix
 	$(RM) -r src/oldbin
 	for i in dba psw dnal genomewise pswdb scanwise estwise genewise sywise genewisedb promoterwise pseudowise estwisedb; do $(RM) src/modules/$$i; done
 	$(RM) src/network/scanwise_server
-
 #	clean documentation
 	$(RM) docs/temp.tex
 	$(RM) docs/api.*
@@ -104,55 +68,15 @@
 	$(RM) docs/*.haux
 	$(RM) docs/*.htoc
 	$(RM) docs/*.html
-
 	$(RM) -r docs/api
 	$(RM) -r docs/dynamite
 	$(RM) -r docs/wise2
-
 	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep 
-	dh_installdirs
-
+override_dh_install:
 #	$(MAKE) install DESTDIR=$(CURDIR)/debian/wise
 	install -m 755 src/bin/* debian/wise/usr/bin
 	install -m 755 src/models/genomewise debian/wise/usr/bin
 
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installman -i
-	dh_link -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i -- -Z xz
-
-binary-arch: build install
-	dh_testdir -a
-	dh_testroot -a
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installman -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a -- -Z xz
-
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
+override_dh_builddeb:
+	dh_builddeb -- -Z xz