[med-svn] r7477 - trunk/packages/biomaj-watcher/trunk/debian
olivier sallou
osallou-guest at alioth.debian.org
Fri Aug 19 08:30:29 UTC 2011
Author: osallou-guest
Date: 2011-08-19 08:30:28 +0000 (Fri, 19 Aug 2011)
New Revision: 7477
Added:
trunk/packages/biomaj-watcher/trunk/debian/watch
Modified:
trunk/packages/biomaj-watcher/trunk/debian/changelog
trunk/packages/biomaj-watcher/trunk/debian/control
trunk/packages/biomaj-watcher/trunk/debian/dirs
trunk/packages/biomaj-watcher/trunk/debian/get-orig-source
trunk/packages/biomaj-watcher/trunk/debian/postinst
trunk/packages/biomaj-watcher/trunk/debian/rules
Log:
upstream update to 1.1
Modified: trunk/packages/biomaj-watcher/trunk/debian/changelog
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/changelog 2011-08-19 07:01:03 UTC (rev 7476)
+++ trunk/packages/biomaj-watcher/trunk/debian/changelog 2011-08-19 08:30:28 UTC (rev 7477)
@@ -1,3 +1,9 @@
+biomaj-watcher (1.1.0-2) UNRELEASED; urgency=low
+
+ * New upstream release with new features (multi tenant, private banks...)
+
+ -- Olivier Sallou <olivier.sallou at irisa.fr> Fri, 12 Aug 2011 16:41:06 +0200
+
biomaj-watcher (1.0-1) unstable; urgency=low
* Initial release (Closes: #609038).
Modified: trunk/packages/biomaj-watcher/trunk/debian/control
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/control 2011-08-19 07:01:03 UTC (rev 7476)
+++ trunk/packages/biomaj-watcher/trunk/debian/control 2011-08-19 08:30:28 UTC (rev 7477)
@@ -10,12 +10,12 @@
Build-Depends: debhelper (>= 8),ant(>=1.7), zip, unzip
Build-Depends-Indep: openjdk-6-jdk|default-jdk|java6-sdk, 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), javahelper (>=0.25)
+ libxerces2-java,biomaj(>=1.1), javahelper (>=0.25), biomaj (>= 1.2)
Standards-Version: 3.9.2
Package: biomaj-watcher
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jdk|default-jdk|java6-sdk, tomcat6 (>=6.0.32-3), biomaj (>= 1.1), debconf,
+Depends: ${misc:Depends}, openjdk-6-jdk|default-jdk|java6-sdk, tomcat6 (>=6.0.32-3), biomaj (>= 1.2), debconf,
liblog4j1.2-java, libjsch-java (>= 0.1.42),libjdom1-java (>= 1.1), libcommons-lang-java (>=2.4),
libcommons-logging-java (>=1.1),libquartz-java(>=1.6),libxerces2-java, unzip, zip
Description: BioMAJ web interface
Modified: trunk/packages/biomaj-watcher/trunk/debian/dirs
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/dirs 2011-08-19 07:01:03 UTC (rev 7476)
+++ trunk/packages/biomaj-watcher/trunk/debian/dirs 2011-08-19 08:30:28 UTC (rev 7477)
@@ -1 +1,2 @@
usr/share/java/webapps/biomaj-watcher
+usr/share/java/webapps/biomaj-watcher/WEB-INF/lib
Modified: trunk/packages/biomaj-watcher/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/get-orig-source 2011-08-19 07:01:03 UTC (rev 7476)
+++ trunk/packages/biomaj-watcher/trunk/debian/get-orig-source 2011-08-19 08:30:28 UTC (rev 7477)
@@ -1,14 +1,22 @@
#!/bin/bash -e
#biomaj-watcher version
-export WATCHERVERSION="1.0"
+#export WATCHERVERSION="1.1.0"
+WATCHERVERSION=`dpkg-parsechangelog | awk '/^Version/ { print $2 }' | cut -f1 -d'-'`
-svn export svn://scm.gforge.inria.fr/svn/biomaj/biomaj-watcher_deb biomaj_deb
+if [ "$WATCHERVERSION" = "UNRELEASED" ]; then
+BPATH="trunk/biomaj_ext/BmajWatcher"
+DPATH="trunk/biomaj-watcher_deb"
+else
+BPATH="tags/biomaj-watcher/"$WATCHERVERSION"/BmajWatcher"
+DPATH="tags/biomaj-watcher/"$WATCHERVERSION"/biomaj-watcher_deb"
+fi
+svn export svn://scm.gforge.inria.fr/svn/biomaj/trunk/biomaj-watcher_deb biomaj_deb
+
# BmajWatcher
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
+svn export svn://scm.gforge.inria.fr/svn/biomaj/trunk/biomaj_ext/BmajWatcher biomaj_deb/usr/share/biomaj-watcher/webapp
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
@@ -19,12 +27,12 @@
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_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
+svn export svn://scm.gforge.inria.fr/svn/biomaj/trunk/biomaj_ext/BmajWatcher/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/doc/BW_userguide.odt biomaj_deb/usr/share/doc/biomaj-watcher/BW_userguide.odt
svn export http://gwt-dnd.googlecode.com/svn/tags/gwt-dnd-3.0.1-r1016/DragDrop/NOTICE biomaj_deb/usr/share/doc/biomaj-watcher/gwt-dnd_NOTICE
mkdir -p biomaj_deb/external_deps
-svn export http://smartgwt.googlecode.com/svn/tags/2.2 biomaj_deb/external_deps/smartgwt
+svn export http://smartgwt.googlecode.com/svn/tags/2.4 biomaj_deb/external_deps/smartgwt
rm -rf biomaj_deb/external_deps/smartgwt/samples
mv biomaj_deb biomaj-watcher_$WATCHERVERSION
Modified: trunk/packages/biomaj-watcher/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/postinst 2011-08-19 07:01:03 UTC (rev 7476)
+++ trunk/packages/biomaj-watcher/trunk/debian/postinst 2011-08-19 08:30:28 UTC (rev 7477)
@@ -26,35 +26,44 @@
db_get biomaj/ldap_filter
opt_filer="$RET"
- javac -d $biomajwatcher_root/bin $biomajwatcher_root/bin/WatcherConfigurator.java
-
java -cp $biomajwatcher_root/bin WatcherConfigurator bmajroot:=$bmajroot bmajconf:=$bmajconf use_ldap:=$use_ldap ldap_host:=$ldap_host ldap_dn:=$ldap_dn opt_filter:=$opt_filter app_login:=$app_login app_passwd:=$app_passwd
# Copy required libs
- mkdir -p /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib
- cp /usr/share/java/xercesImpl.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
- cp /usr/share/java/commons-lang.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
- cp /usr/share/java/commons-logging.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
- cp /usr/share/java/jdom1.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
- cp /usr/share/java/jsch.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
- cp /usr/share/java/log4j-1.2.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
- cp /usr/share/java/quartz.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/xercesImpl.jar
+ ln -s /usr/share/java/xercesImpl.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/xercesImpl.jar
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/commons-lang.jar
+ ln -s /usr/share/java/commons-lang.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/commons-lang.jar
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/commons-logging.jar
+ ln -s /usr/share/java/commons-logging.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/commons-logging.jar
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/jdom1.jar
+ ln -s /usr/share/java/jdom1.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/jdom1.jar
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/jsch.jar
+ ln -s /usr/share/java/jsch.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/jsch.jar
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/log4j-1.2.jar
+ ln -s /usr/share/java/log4j-1.2.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/log4j-1.2.jar
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/quartz.jar
+ ln -s /usr/share/java/quartz.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/quartz.jar
- cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
+ #cp /usr/share/biomaj/lib/biomaj.jar /var/lib/tomcat6/shared/
+ rm -f /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar
+ ln -s /usr/share/biomaj/lib/biomaj.jar /usr/share/java/webapps/biomaj-watcher/WEB-INF/lib/biomaj.jar
chown -R tomcat6 /etc/biomaj/db_properties
chown -R tomcat6 /usr/share/java/webapps/biomaj-watcher
chmod -R 775 /etc/biomaj/db_properties
chown -R tomcat6 /var/log/biomaj
- chmod -R 775 /var/log/biomaj
+ chmod -R 664 /var/log/biomaj
chown -R tomcat6 /var/lib/biomaj
chmod -R 775 /var/lib/biomaj
+ chown -R tomcat6 /etc/biomaj-watcher
# Update context
+ java -cp $biomajwatcher_root/bin UpdateToBiomaj1_2 /usr/share/java/webapps/biomaj-watcher admin
cp /etc/biomaj-watcher/BmajWatcher*.xml /var/lib/tomcat6/conf/Catalina/localhost/
- echo "WARNING: tomcat server may need a restart"
+ service tomcat6 restart
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: trunk/packages/biomaj-watcher/trunk/debian/rules
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/rules 2011-08-19 07:01:03 UTC (rev 7476)
+++ trunk/packages/biomaj-watcher/trunk/debian/rules 2011-08-19 08:30:28 UTC (rev 7477)
@@ -17,16 +17,19 @@
export DH_OPTIONS
export ANT_HOME=/usr/share/ant
-#export JAVA_HOME=/usr/lib/jvm/java-6-openjdk/
+JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::")
%:
dh $@
override_dh_auto_build:
ant -f usr/share/biomaj-watcher/src/build.xml war
+ javac -d usr/share/biomaj-watcher/bin usr/share/biomaj-watcher/bin/WatcherConfigurator.java
+ javac -d usr/share/biomaj-watcher/bin usr/share/biomaj-watcher/bin/UpdateToBiomaj1_2.java
override_dh_clean:
ant -f usr/share/biomaj-watcher/src/build.xml clean
+ rm -f usr/share/biomaj-watcher/bin/*.class
dh_clean
override_dh_install:
Added: trunk/packages/biomaj-watcher/trunk/debian/watch
===================================================================
--- trunk/packages/biomaj-watcher/trunk/debian/watch (rev 0)
+++ trunk/packages/biomaj-watcher/trunk/debian/watch 2011-08-19 08:30:28 UTC (rev 7477)
@@ -0,0 +1,2 @@
+version=3
+https://gforge.inria.fr/frs/?group_id=369 .*/biomaj-watcher_(\d[\d.-]+)\.orig.(?:tar(?:\.gz|\.bz2)?|tgz|zip)
More information about the debian-med-commit
mailing list