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

[olivier sallou]

Author: osallou-guest
Date: 2011-02-15 09:56:55 +0000 (Tue, 15 Feb 2011)
New Revision: 5983

Modified:
   trunk/packages/biomaj/trunk/debian/control
   trunk/packages/biomaj/trunk/debian/get-orig-source
   trunk/packages/biomaj/trunk/debian/rules
Log:
include commons-cli2 dependency in biomaj source

Modified: trunk/packages/biomaj/trunk/debian/control
===================================================================
--- trunk/packages/biomaj/trunk/debian/control	2011-02-15 07:20:14 UTC (rev 5982)
+++ trunk/packages/biomaj/trunk/debian/control	2011-02-15 09:56:55 UTC (rev 5983)
@@ -8,7 +8,7 @@
 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, 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
+Build-Depends-Indep: debconf, po-debconf, 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
 Standards-Version: 3.9.1
 
 Package: biomaj

Modified: trunk/packages/biomaj/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/biomaj/trunk/debian/get-orig-source	2011-02-15 07:20:14 UTC (rev 5982)
+++ trunk/packages/biomaj/trunk/debian/get-orig-source	2011-02-15 09:56:55 UTC (rev 5983)
@@ -15,8 +15,10 @@
 cp -R BioMAJ-$BMAJVERSION/doc/UsersGuide_BioMAJ_EN.odt biomaj_deb/usr/share/doc/biomaj/
 cp -R BioMAJ-$BMAJVERSION/doc/UsersGuide_BioMAJ_FR.odt biomaj_deb/usr/share/doc/biomaj/
 
-cp BioMAJ-$BMAJVERSION/lib/commons-cli-2.0-SNAPSHOT.jar biomaj_deb/usr/share/biomaj/lib/
+#cp BioMAJ-$BMAJVERSION/lib/commons-cli-2.0-SNAPSHOT.jar biomaj_deb/usr/share/biomaj/lib/
 
+svn export http://svn.apache.org/repos/asf/commons/sandbox/cli2/trunk biomaj_deb/usr/share/biomaj/lib/vendor/commons-cli2
+
 if [ -e biomaj_deb/usr/share/biomaj/lib/biomaj.jar ]
 then
 rm biomaj_deb/usr/share/biomaj/lib/biomaj.jar
@@ -47,7 +49,7 @@
 rmdir biomaj_deb/etc/biomaj/process
 
 echo "Updating file rights"
-chmod 644 biomaj_deb/usr/share/biomaj/lib/*.jar
+#chmod 644 biomaj_deb/usr/share/biomaj/lib/*.jar
 chmod 644 biomaj_deb/usr/share/biomaj/src/org/inria/biomaj/sql/*.java
 chmod 644 biomaj_deb/usr/share/biomaj/src/org/inria/biomaj/internal/ant/task/net/test/*.java
 chmod 644 biomaj_deb/usr/share/biomaj/src/org/inria/biomaj/internal/ant/task/net/*.java

Modified: trunk/packages/biomaj/trunk/debian/rules
===================================================================
--- trunk/packages/biomaj/trunk/debian/rules	2011-02-15 07:20:14 UTC (rev 5982)
+++ trunk/packages/biomaj/trunk/debian/rules	2011-02-15 09:56:55 UTC (rev 5983)
@@ -19,6 +19,9 @@
 export ANT_HOME=/usr/share/ant
 
 build: build-stamp
+	ant -f usr/share/biomaj/lib/vendor/commons-cli2.xml
+	cp usr/share/biomaj/lib/vendor/commons-cli2-build/dist/commons-cli2-2.0-SNAPSHOT.jar usr/share/biomaj/lib/
+	ant -f usr/share/biomaj/lib/vendor/commons-cli2.xml clean
 build-stamp:
 	dh_testdir
 	touch build-stamp
@@ -28,7 +31,10 @@
 	dh_testroot
 	rm -f build-stamp
 	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;
+	if test -e usr/share/biomaj/lib/commons-cli2-2.0-SNAPSHOT.jar;then rm usr/share/biomaj/lib/commons-cli2-2.0-SNAPSHOT.jar;fi;
 
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -43,7 +49,7 @@
 biomaj:
 	dh_installdirs  -p$@
 	dh_install  -p$@
-	dh_install -p$@ usr/share/biomaj
+	dh_install -p$@ --exclude=usr/share/biomaj/lib/vendor usr/share/biomaj
 	dh_install -p$@ usr/share/doc
 	dh_install -p$@ usr/bin/biomaj
 	dh_install -p$@ var/lib/biomaj