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

[olivier sallou]

Author: osallou-guest
Date: 2011-07-11 07:16:03 +0000 (Mon, 11 Jul 2011)
New Revision: 7242

Modified:
   trunk/packages/biomaj/trunk/debian/postinst
   trunk/packages/biomaj/trunk/debian/rules
Log:
changes rules to remove openjdk dependency

Modified: trunk/packages/biomaj/trunk/debian/postinst
===================================================================
--- trunk/packages/biomaj/trunk/debian/postinst	2011-07-11 07:05:34 UTC (rev 7241)
+++ trunk/packages/biomaj/trunk/debian/postinst	2011-07-11 07:16:03 UTC (rev 7242)
@@ -24,7 +24,7 @@
 
       cd $biomaj_root
 
-      javac -d $biomaj_root/bin $biomaj_root/bin/Configurator.java
+      #javac -d $biomaj_root/bin $biomaj_root/bin/Configurator.java
 
       java -cp $biomaj_root/bin Configurator java_home:=$jdk_home ant_home:=$ant_home biomaj_root:=$biomaj_root use_ldap:=$use_ldap ldap_host:=$ldap_host ldap_dn:=$ldap_dn opt_filter:=$opt_filter db_type:=$db_type db_url:=$db_url db_login:=$db_login db_passwd:=$db_passwd app_login:=$app_login app_passwd:=$app_passwd tomcat_port:=$tomcat_port
 

Modified: trunk/packages/biomaj/trunk/debian/rules
===================================================================
--- trunk/packages/biomaj/trunk/debian/rules	2011-07-11 07:05:34 UTC (rev 7241)
+++ trunk/packages/biomaj/trunk/debian/rules	2011-07-11 07:16:03 UTC (rev 7242)
@@ -11,6 +11,7 @@
 
 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 $@ --with javahelper