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

[Vincent Fourmond]

Author: fourmond
Date: 2010-02-05 00:03:53 +0000 (Fri, 05 Feb 2010)
New Revision: 11499

Modified:
   trunk/jalview/debian/changelog
   trunk/jalview/debian/control
   trunk/jalview/debian/new-upstream
   trunk/jalview/debian/rules
   trunk/jalview/debian/wrappers/jalview
Log:
[jalview] Some long-standing commits + fix build

Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2010-02-04 00:11:53 UTC (rev 11498)
+++ trunk/jalview/debian/changelog	2010-02-05 00:03:53 UTC (rev 11499)
@@ -18,5 +18,6 @@
     libcommons-discovery-java
   * Dropping provided commons-logging.jar, (build)?-dep on 
     libcommons-logging-java
+  * Dropping provided regex.jar, (build)?-dep on libstevesoft-regex-java
 
- -- Vincent Fourmond <fourmond at debian.org>  Mon, 19 Jan 2009 22:27:21 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 28 Mar 2009 09:48:46 +0100

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2010-02-04 00:11:53 UTC (rev 11498)
+++ trunk/jalview/debian/control	2010-02-05 00:03:53 UTC (rev 11499)
@@ -2,11 +2,12 @@
 Section: science
 Priority: optional
 Maintainer: Vincent Fourmond <fourmond at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep,
-	       ant, dpatch, libxerces2-java, libxalan2-java,
+Build-Depends: cdbs, debhelper (>= 7), default-jdk,
+	       ant, ant-optional, dpatch, libxerces2-java, libxalan2-java,
 	       libaxis-java, libwsdl4j-java, libgnujaf-java,
 	       libgnumail-java, liblog4j1.2-java, javahelp2,
-	       libcommons-discovery-java, libcommons-logging-java
+	       libcommons-discovery-java, libcommons-logging-java,
+	       libstevesoft-regex-java
 Standards-Version: 3.8.0
 Homepage: http://www.jalview.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
@@ -19,8 +20,8 @@
 	 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
-Suggests: clustalw, kalign, t-coffee
+	 libcommons-logging-java, libstevesoft-regex-java
+Suggests: kalign, t-coffee, clustalw
 Description: multiple alignment editor
  JalView is a Java alignement editor that can work with sequence
  alignement produced by programs implementing alignment algorithms

Modified: trunk/jalview/debian/new-upstream
===================================================================
--- trunk/jalview/debian/new-upstream	2010-02-04 00:11:53 UTC (rev 11498)
+++ trunk/jalview/debian/new-upstream	2010-02-05 00:03:53 UTC (rev 11499)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# new-upstream: copyright 2007 by Vincent Fourmond.
+# new-upstream: copyright 2008, 2009 by Vincent Fourmond.
 # See debian/copyright file for details.
 #
 # Called by uscan; from uscan(1):
@@ -30,7 +30,7 @@
 # Remove unneeded jar files.
 for jar in xercesImpl.jar xml-apis.jar saaj.jar axis.jar mail.jar \
     activation.jar  wsdl4j.jar jaxrpc.jar log4j-1.2.8.jar jhall.jar \
-    commons-discovery.jar commons-logging.jar; do
+    commons-discovery.jar commons-logging.jar regex.jar ; do
     rm jalview*/lib/$jar
 done
 echo "Now listing binary jar files still present in the dfsg tarball"

Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules	2010-02-04 00:11:53 UTC (rev 11498)
+++ trunk/jalview/debian/rules	2010-02-05 00:03:53 UTC (rev 11499)
@@ -14,7 +14,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj
+JAVA_HOME_DIRS       := /usr/lib/jvm/default-java
 ANT_HOME             := /usr/share/ant
 DEB_ANT_COMPILER     := modern
 DEB_ANT_BUILD_TARGET := build makedist
@@ -24,7 +24,7 @@
 
 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
+	jhall commons-discovery commons-logging regex
 
 
 # Additional arguments for ant, such as properties.
@@ -47,9 +47,15 @@
 # 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 regex.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
+#
+# 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...
 
 print-version:
 	echo $(VERSION)

Modified: trunk/jalview/debian/wrappers/jalview
===================================================================
--- trunk/jalview/debian/wrappers/jalview	2010-02-04 00:11:53 UTC (rev 11498)
+++ trunk/jalview/debian/wrappers/jalview	2010-02-05 00:03:53 UTC (rev 11499)
@@ -9,7 +9,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 \
-    gnumail jalview-regex saaj jalview-vamsas-client \
+    gnumail regex saaj jalview-vamsas-client \
     wsdl4j xercesImpl xml-apis \
     jalview