[pkg-java] r13530 - in trunk/jalview/debian: . wrappers

[Vincent Fourmond]

Author: fourmond
Date: 2011-04-14 15:21:32 +0000 (Thu, 14 Apr 2011)
New Revision: 13530

Modified:
   trunk/jalview/debian/changelog
   trunk/jalview/debian/control
   trunk/jalview/debian/rules
   trunk/jalview/debian/watch
   trunk/jalview/debian/wrappers/jalview
Log:
[jalview] Updating for debian-packaged Jmol -- does not work yet !

Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2011-04-13 22:17:14 UTC (rev 13529)
+++ trunk/jalview/debian/changelog	2011-04-14 15:21:32 UTC (rev 13530)
@@ -19,5 +19,6 @@
   * Dropping provided commons-logging.jar, (build)?-dep on 
     libcommons-logging-java
   * Dropping provided regex.jar, (build)?-dep on libstevesoft-regex-java
+  * Dropping provided JMol.jar, now that jmol has been packaged for Debian !
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 28 Mar 2009 09:48:46 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 14 Apr 2011 16:52:07 +0200

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2011-04-13 22:17:14 UTC (rev 13529)
+++ trunk/jalview/debian/control	2011-04-14 15:21:32 UTC (rev 13530)
@@ -7,7 +7,7 @@
 	       libaxis-java, libwsdl4j-java, libgnujaf-java,
 	       libgnumail-java, liblog4j1.2-java, javahelp2,
 	       libcommons-discovery-java, libcommons-logging-java,
-	       libstevesoft-regex-java
+	       libstevesoft-regex-java, libjmol-java
 Standards-Version: 3.8.0
 Homepage: http://www.jalview.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
@@ -20,7 +20,7 @@
 	 java-wrappers (>= 0.1.11), libxerces2-java, libxalan2-java, 
 	 libaxis-java, libwsdl4j-java, libgnujaf-java, libgnumail-java,
 	 liblog4j1.2-java, javahelp2, libcommons-discovery-java,
-	 libcommons-logging-java, libstevesoft-regex-java
+	 libcommons-logging-java, libstevesoft-regex-java, libjmol-java
 Suggests: kalign, t-coffee, clustalw
 Description: multiple alignment editor
  JalView is a Java alignement editor that can work with sequence

Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules	2011-04-13 22:17:14 UTC (rev 13529)
+++ trunk/jalview/debian/rules	2011-04-14 15:21:32 UTC (rev 13530)
@@ -24,35 +24,27 @@
 
 DEB_JARS             := $(ANT_HOME)/lib/ant-nodeps.jar xml-api xercesImpl \
 	axis saaj gnumail wsdl4j activation jaxrpc log4j-1.2 \
-	jhall commons-discovery commons-logging regex
+	jhall Jmol commons-discovery commons-logging regex
 
 
 # Additional arguments for ant, such as properties.
 ANT_ARGS := -DJALVIEW_VERSION=$(VERSION)
 
-# Some comments here:
-# libaxis-java
-#  -> saaj.jar
-#  -> jaxrpc.jar
-# libwsdl4j-java
-#  -> wsdl4j.jar
-# libgnujaf-java
-#  -> activation.jar
-# javahelp2:
-#  -> jhall.jar
-
 # These are jar provided by the source tarball that should be installed
 # along with the program to make it work.
 #
 # AS LONG AS THIS VARIABLE EXISTS, UPLOAD TO MAIN, AND POSSIBLY TO NON-FREE,
 # IS IMPOSSIBLE !
 BINARY_JARS = castor-1.1-cycle-xml.jar \
-	Jmol-11.0.2.jar \
 	vamsas-client.jar
 
 # The source for castor-1.1-cycle-xml.jar can be found at
 # http://dist.codehaus.org/castor/1.1
 #
+# Apparently, jalview works with only the following (newer) files:
+#   -> ./castor-1.3.1-xml
+#   -> ./castor-1.3.1-core
+#
 # By looking quickly at the src/build.xml file, it sounds as if it is
 # possible to only compile the xml part. Not sure if that makes sense,
 # or even if it would work, though...

Modified: trunk/jalview/debian/watch
===================================================================
--- trunk/jalview/debian/watch	2011-04-13 22:17:14 UTC (rev 13529)
+++ trunk/jalview/debian/watch	2011-04-14 15:21:32 UTC (rev 13530)
@@ -6,5 +6,5 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-opts="dversionmangle=s/\.dfsg//,uversionmangle=s/_/./"	\
+opts="dversionmangle=s/\.dfsg//,uversionmangle=s/_/./g"	\
 http://www.jalview.org/source/source.html jalview_(.*)\.tar\.gz debian debian/new-upstream

Modified: trunk/jalview/debian/wrappers/jalview
===================================================================
--- trunk/jalview/debian/wrappers/jalview	2011-04-13 22:17:14 UTC (rev 13529)
+++ trunk/jalview/debian/wrappers/jalview	2011-04-14 15:21:32 UTC (rev 13530)
@@ -8,7 +8,7 @@
 
 find_jars activation axis jalview-castor-1.1-cycle-xml \
     commons-discovery commons-logging jaxrpc \
-    jhall jalview-Jmol-11.0.2 log4j-1.2 \
+    jhall Jmol log4j-1.2 \
     gnumail regex saaj jalview-vamsas-client \
     wsdl4j xercesImpl xml-apis \
     jalview