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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2009-01-18 19:12:26 +0000 (Sun, 18 Jan 2009)
New Revision: 7839

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] Further cleaning of the source tarball + appropriate changes

Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2009-01-17 14:46:34 UTC (rev 7838)
+++ trunk/jalview/debian/changelog	2009-01-18 19:12:26 UTC (rev 7839)
@@ -6,5 +6,8 @@
     tarball, getting rid of the non-free bits.
   * debian/patches/10-build.dpatch: disable features that depends
     on things removed from the .dfsg tarball
+  * Dropping provided xercesImpl.jar, (build)?-dep on libxerces2-java
+  * Dropping provided xml-apis.jar, (build)?-dep on libxalan2-java
+  * Dropping provided axis.jar and saaj.jar, (build)?-dep on libaxis-java
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 17 Jan 2009 15:24:21 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 18 Jan 2009 20:11:23 +0100

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2009-01-17 14:46:34 UTC (rev 7838)
+++ trunk/jalview/debian/control	2009-01-18 19:12:26 UTC (rev 7839)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep,
-	       ant, dpatch, libxerces2-java, libxalan2-java
+	       ant, dpatch, libxerces2-java, libxalan2-java,
+	       libaxis-java
 Standards-Version: 3.8.0
 Homepage: http://www.jalview.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
@@ -14,6 +15,7 @@
 Architecture: any
 Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
 	 java-wrappers (>= 0.1.11), libxerces2-java, libxalan2-java, 
+	 libaxis-java	 
 Suggests: clustalw, kalign, t-coffee
 Description: multiple alignment editor
  JalView is a Java alignement editor that can work with sequence

Modified: trunk/jalview/debian/new-upstream
===================================================================
--- trunk/jalview/debian/new-upstream	2009-01-17 14:46:34 UTC (rev 7838)
+++ trunk/jalview/debian/new-upstream	2009-01-18 19:12:26 UTC (rev 7839)
@@ -28,9 +28,13 @@
 # Removing the utils/ directory, not needed for build ?
 rm -rf jalview*/utils
 # Remove unneeded jar files.
-for jar in xercesImpl.jar ; do
+for jar in xercesImpl.jar xml-apis.jar saaj.jar axis.jar ; do
     rm -f jalview*/lib/$jar
 done
+echo "Now listing binary jar files still present in the dfsg tarball"
+ls -l jalview*/lib/
+
+echo "Creating archive"
 tar cvz -f $origname jalv*
 cd -
 # We remove any file already existing there: it might be a symlink.

Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules	2009-01-17 14:46:34 UTC (rev 7838)
+++ trunk/jalview/debian/rules	2009-01-18 19:12:26 UTC (rev 7839)
@@ -22,7 +22,8 @@
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_CLEAN_TARGET := clean
 
-DEB_JARS             := $(ANT_HOME)/lib/ant-nodeps.jar xml-api xercesImpl
+DEB_JARS             := $(ANT_HOME)/lib/ant-nodeps.jar xml-api xercesImpl \
+	axis saaj
 
 # Additional arguments for ant, such as properties.
 ANT_ARGS := -DJALVIEW_VERSION=$(VERSION)
@@ -43,10 +44,10 @@
 #
 # AS LONG AS THIS VARIABLE EXISTS, UPLOAD TO MAIN, AND POSSIBLY TO NON-FREE,
 # IS IMPOSSIBLE !
-BINARY_JARS = activation.jar axis.jar castor-1.1-cycle-xml.jar \
+BINARY_JARS = activation.jar castor-1.1-cycle-xml.jar \
 	commons-discovery.jar commons-logging.jar jaxrpc.jar \
 	jhall.jar Jmol-11.0.2.jar log4j-1.2.8.jar mail.jar regex.jar \
-	saaj.jar vamsas-client.jar wsdl4j.jar
+	vamsas-client.jar wsdl4j.jar
 
 
 print-version:

Modified: trunk/jalview/debian/wrappers/jalview
===================================================================
--- trunk/jalview/debian/wrappers/jalview	2009-01-17 14:46:34 UTC (rev 7838)
+++ trunk/jalview/debian/wrappers/jalview	2009-01-18 19:12:26 UTC (rev 7839)
@@ -6,10 +6,10 @@
 # We need openjdk or sun6
 find_java_runtime openjdk sun6
 
-find_jars jalview-activation jalview-axis jalview-castor-1.1-cycle-xml \
+find_jars jalview-activation axis jalview-castor-1.1-cycle-xml \
     jalview-commons-discovery jalview-commons-logging jalview-jaxrpc \
     jalview-jhall jalview-Jmol-11.0.2 jalview-log4j-1.2.8 \
-    jalview-mail jalview-regex jalview-saaj jalview-vamsas-client \
+    jalview-mail jalview-regex saaj jalview-vamsas-client \
     jalview-wsdl4j xercesImpl xml-apis \
     jalview