[med-svn] r6169 - trunk/packages/biomaj-watcher/trunk/debian

[olivier sallou]

Author: osallou-guest
Date: 2011-03-07 12:08:36 +0000 (Mon, 07 Mar 2011)
New Revision: 6169

Added:
   trunk/packages/biomaj-watcher/trunk/debian/biomaj-watcher.doc-base
Removed:
   trunk/packages/biomaj-watcher/trunk/debian/biomaj-watcher.docbase
Modified:
   trunk/packages/biomaj-watcher/trunk/debian/control
   trunk/packages/biomaj-watcher/trunk/debian/get-orig-source
   trunk/packages/biomaj-watcher/trunk/debian/rules
Log:
update to compile with gwt

Added: trunk/packages/biomaj-watcher/trunk/debian/biomaj-watcher.doc-base
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/biomaj-watcher.doc-base	                        (rev 0)
+++ trunk/packages/biomaj-watcher/trunk/debian/biomaj-watcher.doc-base	2011-03-07 12:08:36 UTC (rev 6169)
@@ -0,0 +1,8 @@
+Document: biomaj-watcher
+Title: BioMAJ-Watcher User Manual
+Author: Romaric Sabas
+Abstract: Usage instructions for BioMAJ and BMajWatcher
+Section: Science/Biology
+
+Format: PDF
+Files: /usr/share/doc/biomaj/BW_userguide.pdf.gz

Deleted: trunk/packages/biomaj-watcher/trunk/debian/biomaj-watcher.docbase
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/biomaj-watcher.docbase	2011-03-07 06:13:05 UTC (rev 6168)
+++ trunk/packages/biomaj-watcher/trunk/debian/biomaj-watcher.docbase	2011-03-07 12:08:36 UTC (rev 6169)
@@ -1,8 +0,0 @@
-Document: biomaj-watcher
-Title: BioMAJ-Watcher User Manual
-Author: Romaric Sabas
-Abstract: Usage instructions for BMajWatcher
-Section: Science/Biology
-
-Format: PDF
-Files: /usr/share/doc/biomaj-watcher/BW_userguide.pdf.gz

Modified: trunk/packages/biomaj-watcher/trunk/debian/control
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/control	2011-03-07 06:13:05 UTC (rev 6168)
+++ trunk/packages/biomaj-watcher/trunk/debian/control	2011-03-07 12:08:36 UTC (rev 6169)
@@ -8,7 +8,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/biomaj-watcher/trunk/?rev=0&sc=0
 Homepage: http://biomaj.genouest.org
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: debconf, po-debconf
+Build-Depends-Indep: debconf, po-debconf,liblog4j1.2-java,libcommons-lang-java,libcommons-logging-java,libjsch-java,libjdom1-java,libquartz-java(>=1.6),libxerces2-java,biomaj(>=1.1)
 Standards-Version: 3.9.1
 
 Package: biomaj-watcher

Modified: trunk/packages/biomaj-watcher/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/get-orig-source	2011-03-07 06:13:05 UTC (rev 6168)
+++ trunk/packages/biomaj-watcher/trunk/debian/get-orig-source	2011-03-07 12:08:36 UTC (rev 6169)
@@ -3,29 +3,29 @@
 #biomaj-watcher version
 export WATCHERVERSION="1.0"
 
-export PORT=80
-#export PORT=8081
-
 svn export svn://scm.gforge.inria.fr/svn/biomaj/biomaj-watcher_deb biomaj_deb
 
 # BmajWatcher
-wget http://test.genouest.org:$PORT/artifactory/libs-releases-local/org/irisa/genouest/biomaj/BmajWatcher/$WATCHERVERSION/BmajWatcher-$WATCHERVERSION.war
-mv BmajWatcher-$WATCHERVERSION.war biomaj_deb/usr/share/java/webapps/biomaj-watcher/BmajWatcher.war
+mkdir -p biomaj_deb/usr/share/biomaj-watcher
+svn export svn://scm.gforge.inria.fr/svn/biomaj/trunk/biomaj_ext/BmajWatcher_1.0 biomaj_deb/usr/share/biomaj-watcher/webapp
+chmod 755 biomaj_deb/usr/share/biomaj-watcher/webapp/shellscripts/exec_bmaj.sh
 
-unzip biomaj_deb/usr/share/java/webapps/biomaj-watcher/BmajWatcher.war -d biomaj_deb/usr/share/java/webapps/biomaj-watcher/
-rm biomaj_deb/usr/share/java/webapps/biomaj-watcher/BmajWatcher.war
-chmod 755 biomaj_deb/usr/share/java/webapps/biomaj-watcher/shellscripts/exec_bmaj.sh
+cp -R biomaj_deb/usr/share/biomaj-watcher/webapp/* biomaj_deb/usr/share/biomaj-watcher/src/
+rm -rf biomaj_deb/usr/share/biomaj-watcher/webapp
+rm -rf biomaj_deb/usr/share/biomaj-watcher/src/doc
+rm -rf biomaj_deb/usr/share/biomaj-watcher/src/test
+rm -f biomaj_deb/usr/share/biomaj-watcher/src/war/WEB-INF/lib/*
 
+mv biomaj_deb/usr/share/biomaj-watcher/src/build.xml.debian  biomaj_deb/usr/share/biomaj-watcher/src/build.xml
+
 mkdir -p biomaj_deb/usr/share/doc/biomaj-watcher
-svn export svn://scm.gforge.inria.fr/svn/biomaj/trunk/biomaj_ext/BmajWatcher_$WATCHERVERSION/doc/BW_userguide.pdf biomaj_deb/usr/share/doc/biomaj-watcher/BW_userguide.pdf
-svn export svn://scm.gforge.inria.fr/svn/biomaj/trunk/biomaj_ext/BmajWatcher_$WATCHERVERSION/doc/BW_userguide.odt biomaj_deb/usr/share/doc/biomaj-watcher/BW_userguide.odt
+svn export svn://scm.gforge.inria.fr/svn/biomaj/trunk/biomaj_ext/BmajWatcher_1.0/doc/BW_userguide.pdf biomaj_deb/usr/share/doc/biomaj-watcher/BW_userguide.pdf
+svn export svn://scm.gforge.inria.fr/svn/biomaj/trunk/biomaj_ext/BmajWatcher_1.0/doc/BW_userguide.odt biomaj_deb/usr/share/doc/biomaj-watcher/BW_userguide.odt
 
 
-
 mv biomaj_deb biomaj-watcher_$WATCHERVERSION
 
 
-#cd biomaj-1.1.0
 tar --exclude biomajwatcher_$WATCHERVERSION/debian -cvzf  biomaj-watcher_$WATCHERVERSION.orig.tar.gz biomaj-watcher_$WATCHERVERSION
 
 rm -rf biomaj-watcher_$WATCHERVERSION

Modified: trunk/packages/biomaj-watcher/trunk/debian/rules
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/rules	2011-03-07 06:13:05 UTC (rev 6168)
+++ trunk/packages/biomaj-watcher/trunk/debian/rules	2011-03-07 12:08:36 UTC (rev 6169)
@@ -23,10 +23,12 @@
 build-stamp:
 	dh_testdir
 	touch build-stamp
+	ant -f usr/share/biomaj-watcher/src/build.xml war
 
 clean:
 	dh_testdir
 	dh_testroot
+	ant -f usr/share/biomaj-watcher/src/build.xml clean
 	rm -f build-stamp
 	dh_clean
 
@@ -36,6 +38,7 @@
 	dh_prep
 	dh_installdirs
 
+
 # Compile here architecture independant files
 binary-indep: build install  biomaj-watcher
 	dh_testdir
@@ -44,11 +47,13 @@
 biomaj-watcher:
 	dh_installdirs  -p$@
 	dh_install  -p$@
-	dh_install -p$@ usr/share/biomaj-watcher
+	dh_install -p$@ usr/share/biomaj-watcher/bin
 	dh_install -p$@ usr/share/doc/biomaj-watcher
 	dh_install -p$@ usr/share/java
 	dh_install -p$@ var/log/biomaj-watcher
 	dh_install -p$@ etc/biomaj-watcher
+	mkdir -p debian/biomaj-watcher/usr/share/java/webapps/biomaj-watcher/
+	unzip usr/share/biomaj-watcher/src/BmajWatcher.war -d debian/biomaj-watcher/usr/share/java/webapps/biomaj-watcher/
         # Common stuff
 	dh_installdebconf  -p$@
 	dh_installdocs  -p$@