[med-svn] r7427 - trunk/packages/velvet/trunk/debian

[Timothy Booth]

Author: tbooth-guest
Date: 2011-08-11 16:02:44 +0000 (Thu, 11 Aug 2011)
New Revision: 7427

Modified:
   trunk/packages/velvet/trunk/debian/changelog
   trunk/packages/velvet/trunk/debian/rules
Log:
Shifted from CDBS to DH.  Confirmed that the resulting DEB is identical to the
one produced before, apart from some file size difference due to switch from '-O2'
to '-O3' compiler flag.  I'm not sure why the two build systems have different defaults?

The issue with MetaVelvet seems to have gone away - upstream have cleaned up the build
system a lot since Andreas was struggling with it.


Modified: trunk/packages/velvet/trunk/debian/changelog
===================================================================
--- trunk/packages/velvet/trunk/debian/changelog	2011-08-11 14:18:14 UTC (rev 7426)
+++ trunk/packages/velvet/trunk/debian/changelog	2011-08-11 16:02:44 UTC (rev 7427)
@@ -1,8 +1,10 @@
-velvet (1.1.05-1ubuntu2) lucid; urgency=low
+velvet (1.1.05-1ubuntu4) lucid; urgency=low
 
+  * Moved from CDBS to DH 
   * New upstream.  Still includes a copy of Zlib but the default
     is now to use the system version, so removed relevant patch.
-  * Modified build to work on unmodified upstream.
+  * Modified build to work on unmodified upstream (still works on
+    pruned upstream).
 
  -- Tim Booth <tbooth at ceh.ac.uk>  Thu, 11 Aug 2011 13:34:46 +0100
 

Modified: trunk/packages/velvet/trunk/debian/rules
===================================================================
--- trunk/packages/velvet/trunk/debian/rules	2011-08-11 14:18:14 UTC (rev 7426)
+++ trunk/packages/velvet/trunk/debian/rules	2011-08-11 16:02:44 UTC (rev 7427)
@@ -1,23 +1,23 @@
 #!/usr/bin/make -f
 
-DEB_COMPRESS_EXCLUDE := .pdf	# The PDF doc will not be compressed
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-build/velvet::
-	touch zlib # prevents the zlib in the ‘third-party’ folder to be built.
+%:
+	dh  $@ --with quilt
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+pkg=velvet
 
-clean::
-	$(RM) zlib
+override_dh_auto_clean :
+	dh_auto_clean
+	rm -rf zlib
 
-pkg=velvet
+override_dh_auto_build :
+	touch zlib # prevents the zlib in the ‘third-party’ folder to be built.
+	dh_auto_build
+	dh_auto_build -- color
 
-DEB_MAKE_BUILD_TARGET = obj velveth velvetg LDFLAGS='-lm -lz' OPT=''
-
-build/velvet::
-	make color CFLAGS='$(CFLAGS)' LIBS='-lm -lz' OPT=''
+override_dh_install :
 	mkdir -p $(CURDIR)/debian/$(pkg)/usr/share/man/man1/
 	help2man --no-info --name="simple hashing program" \
 	         $(CURDIR)/velveth > $(CURDIR)/debian/$(pkg)/usr/share/man/man1/velveth.1
@@ -29,12 +29,18 @@
 	help2man --no-info --version-option=" " \
 	         --name="de Bruijn graph construction, error removal and repeat resolution (colorspace version)" \
 	         $(CURDIR)/velvetg_de > $(CURDIR)/debian/$(pkg)/usr/share/man/man1/velvetg_de.1
-
-#If the taball is not being scrubbed we need this.
-binary-install/velvet::
+	dh_install
+	#If the tarball is not being scrubbed we need this.
 	find $(CURDIR)/debian/$(pkg) -name '.DS_Store' -exec rm {} \;
 	rm -rf $(CURDIR)/debian/$(pkg)/usr/share/velvet/contrib/MetaVelvet*
 
+#Prevent compression of user manual
+override_dh_compress :
+	dh_compress -X.pdf
+
+override_dh_pysupport :
+	#Not needed, Python scripts are just for examples
+
 get-orig-source:
 	. debian/get-orig-source