[pkg-java] r15086 - trunk/jalview/debian

[Vincent Fourmond]

Author: fourmond
Date: 2011-09-27 23:18:06 +0000 (Tue, 27 Sep 2011)
New Revision: 15086

Modified:
   trunk/jalview/debian/control
   trunk/jalview/debian/new-upstream
   trunk/jalview/debian/rules
Log:
[jalview] Version 2.6.1 getting close, pity that 2.7 is out already ;-) !

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2011-09-27 22:12:05 UTC (rev 15085)
+++ trunk/jalview/debian/control	2011-09-27 23:18:06 UTC (rev 15086)
@@ -7,9 +7,10 @@
 	       libaxis-java, libwsdl4j-java, libgnujaf-java,
 	       libgnumail-java, liblog4j1.2-java, javahelp2,
 	       libcommons-discovery-java, libcommons-logging-java,
-	       libstevesoft-regex-java, libjmol-java,
-	       libcastor-xml-java, libvamsas-client-java,
-	       libjaba-client-java, libaxis-java, jmol-applet,
+	       libstevesoft-regex-java, libjmol-java (>= 12.1.42),
+	       libcastor-xml-java,
+	       libjaba-client-java, libaxis-java, 
+	       jmol-applet (>= 12.1.42),
 	       javahelper, javahelp2
 Standards-Version: 3.9.2
 Homepage: http://www.jalview.org/

Modified: trunk/jalview/debian/new-upstream
===================================================================
--- trunk/jalview/debian/new-upstream	2011-09-27 22:12:05 UTC (rev 15085)
+++ trunk/jalview/debian/new-upstream	2011-09-27 23:18:06 UTC (rev 15086)
@@ -29,7 +29,7 @@
 rm -rf jalview*/utils
 
 # Removing all binary jars...
-find -name '*.jar' | xargs rm 
+find -name '*.jar' | grep -vi vamsas | xargs rm 
 
 echo "Creating archive"
 tar cvj -f $origname jalview*

Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules	2011-09-27 22:12:05 UTC (rev 15085)
+++ trunk/jalview/debian/rules	2011-09-27 23:18:06 UTC (rev 15086)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/castor-xml.jar:/usr/share/java/commons-logging.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/castor-core.jar:/usr/share/java/Jmol.jar:/usr/share/java/vamsas-client.jar:/usr/share/java/min-jaba-client.jar:/usr/share/java/axis-jaxrpc.jar:/usr/share/java/axis.jar:/usr/share/jmol-applet/JmolApplet.jar:/usr/share/java/jh.jar
+export CLASSPATH=/usr/share/java/castor-xml.jar:/usr/share/java/commons-logging.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/castor-core.jar:/usr/share/java/Jmol.jar:/usr/share/java/vamsas-client.jar:/usr/share/java/min-jaba-client.jar:/usr/share/java/axis-jaxrpc.jar:/usr/share/java/axis.jar:/usr/share/jmol-applet/JmolApplet.jar:/usr/share/java/jh.jar:lib/vamsas-client.jar
 
 %:
 	dh $@ --with javahelper