[med-svn] r6401 - trunk/packages/biomaj/trunk/debian

[Andreas Tille]

Author: tille
Date: 2011-03-30 11:02:55 +0000 (Wed, 30 Mar 2011)
New Revision: 6401

Modified:
   trunk/packages/biomaj/trunk/debian/control
   trunk/packages/biomaj/trunk/debian/rules
Log:
Use short dh notation in debian/rules


Modified: trunk/packages/biomaj/trunk/debian/control
===================================================================
--- trunk/packages/biomaj/trunk/debian/control	2011-03-30 09:51:16 UTC (rev 6400)
+++ trunk/packages/biomaj/trunk/debian/control	2011-03-30 11:02:55 UTC (rev 6401)
@@ -7,13 +7,18 @@
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/biomaj/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/biomaj/trunk/?rev=0&sc=0
 Homepage: http://biomaj.genouest.org
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: debconf, po-debconf, openjdk-6-jdk, ant,libhsqldb-java,ant-contrib,liblog4j1.2-java,libcommons-net-java,libcommons-dbcp-java, libgnumail-java, libcommons-pool-java, libgnujaf-java, libjgoodies-forms-java,liboro-java,libregexp-java,libjfreechart-java,libjcommon-java,libjsch-java,libjdom1-java,junit4,libsaxonb-java,junit4,libjdepend-java
+Build-Depends: debhelper (>= 7.1)
+Build-Depends-Indep: debconf, po-debconf, openjdk-6-jdk, ant, libhsqldb-java, ant-contrib,
+ liblog4j1.2-java, libcommons-net-java, libcommons-dbcp-java, libgnumail-java, libcommons-pool-java,
+ libgnujaf-java, libjgoodies-forms-java, liboro-java, libregexp-java, libjfreechart-java,
+ libjcommon-java, libjsch-java, libjdom1-java, junit4, libsaxonb-java, junit4, libjdepend-java,
+ javahelper (>=0.25)
 Standards-Version: 3.9.1
 
 Package: biomaj
 Architecture: all
-Depends: openjdk-6-jdk, ant, libmysql-java, debconf, ${misc:Depends}, libhsqldb-java,ant-contrib,liblog4j1.2-java,libcommons-net-java (>= 1.4),libcommons-dbcp-java (>= 1.2), libgnumail-java, libcommons-pool-java (>= 1.5), libgnujaf-java, libjgoodies-forms-java (>= 1.2),liboro-java (>= 2.0),libregexp-java (>= 1.4),libjfreechart-java (>= 1.0),libjcommon-java (>= 1.0),libjsch-java (>= 0.1.42),libjdom1-java (>= 1.1),junit4,libsaxonb-java (>= 0.9)
+Depends: openjdk-6-jdk, ant, libmysql-java, debconf, ${misc:Depends}, ${java:Depends},
+ libhsqldb-java,ant-contrib,liblog4j1.2-java,libcommons-net-java (>= 1.4),libcommons-dbcp-java (>= 1.2), libgnumail-java, libcommons-pool-java (>= 1.5), libgnujaf-java, libjgoodies-forms-java (>= 1.2),liboro-java (>= 2.0),libregexp-java (>= 1.4),libjfreechart-java (>= 1.0),libjcommon-java (>= 1.0),libjsch-java (>= 0.1.42),libjdom1-java (>= 1.1),junit4,libsaxonb-java (>= 0.9)
 Suggests: mysql-community-server-5.0, ncbi-tools-bin, blast2
 Description: Biological banks updater
  BioMAJ downloads remote data banks, check their status and apply transformation

Modified: trunk/packages/biomaj/trunk/debian/rules
===================================================================
--- trunk/packages/biomaj/trunk/debian/rules	2011-03-30 09:51:16 UTC (rev 6400)
+++ trunk/packages/biomaj/trunk/debian/rules	2011-03-30 11:02:55 UTC (rev 6401)
@@ -12,19 +12,16 @@
 export ANT_HOME=/usr/share/ant
 export JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
 
-build: build-stamp
+%:
+	dh $@ --with javahelper
+
+override_dh_auto_build:
 	ant -f usr/share/biomaj/lib/vendor/commons-cli2.xml
 	cp usr/share/biomaj/lib/vendor/commons-cli2-build/dist/commons-cli-2.0-SNAPSHOT.jar usr/share/biomaj/lib/
 	ant -f usr/share/biomaj/lib/vendor/commons-cli2.xml clean
 	ant -f usr/share/biomaj/build.xml
-build-stamp:
-	dh_testdir
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
+override_dh_clean:
 	dh_clean
 	if test -e usr/share/biomaj/lib/vendor/commons-cli2-build;then ant -f usr/share/biomaj/lib/vendor/commons-cli2.xml clean;fi;
 	rm -f usr/share/biomaj/lib/commons-cli-2.0-SNAPSHOT.jar
@@ -32,51 +29,14 @@
 	rm -rf usr/share/biomaj/dist
 	rm -f usr/share/biomaj/lib/biomaj.jar
 
+override_dh_install:
+	# dh_install
+	dh_install --exclude=usr/share/biomaj/lib/vendor --exclude=usr/share/biomaj/build --exclude=usr/share/biomaj/dist usr/share/biomaj
+	dh_install usr/share/doc
+	dh_install usr/bin/biomaj
+	dh_install var/lib/biomaj
+	dh_install var/log/biomaj
+	dh_install etc/biomaj
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-# Compile here architecture independant files
-binary-indep: build install  biomaj
-	dh_testdir
-	dh_testroot
-
-biomaj:
-	dh_installdirs  -p$@
-	dh_install  -p$@
-	dh_install -p$@ --exclude=usr/share/biomaj/lib/vendor --exclude=usr/share/biomaj/build --exclude=usr/share/biomaj/dist usr/share/biomaj
-	dh_install -p$@ usr/share/doc
-	dh_install -p$@ usr/bin/biomaj
-	dh_install -p$@ var/lib/biomaj
-	dh_install -p$@ var/log/biomaj
-	dh_install -p$@ etc/biomaj
-	dh_installdebconf  -p$@
-	dh_installdocs  -p$@
-	dh_installexamples  -p$@
-	dh_installmenu  -p$@
-	dh_installcron -p$@
-	dh_installman -p$@
-	dh_installinfo -p$@
-	dh_installchangelogs -p$@
-	dh_link -p$@
-	dh_strip -p$@
-	dh_compress -p$@
-	dh_fixperms -p$@
-	dh_installdeb -p$@
-	dh_shlibdeps -p$@
-	dh_gencontrol -p$@
-	dh_md5sums -p$@
-	dh_builddeb -p$@
-
 get-orig-source:
 	. debian/get-orig-source
-
-binary-arch:
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
-