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

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2009-01-19 21:32:00 +0000 (Mon, 19 Jan 2009)
New Revision: 7844

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] Dropping included commons-* jars

Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2009-01-19 20:19:59 UTC (rev 7843)
+++ trunk/jalview/debian/changelog	2009-01-19 21:32:00 UTC (rev 7844)
@@ -14,5 +14,9 @@
   * Dropping provided jhall.jar, (build)?-dep on javahelp2
   * debian/patches/10-build.dpatch: tweaked the classpath of the
     buildindices task for it to find the class.
+  * Dropping provided commons-discovery.jar, (build)?-dep on 
+    libcommons-discovery-java
+  * Dropping provided commons-logging.jar, (build)?-dep on 
+    libcommons-logging-java
 
- -- Vincent Fourmond <fourmond at debian.org>  Mon, 19 Jan 2009 21:16:19 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Mon, 19 Jan 2009 22:27:21 +0100

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2009-01-19 20:19:59 UTC (rev 7843)
+++ trunk/jalview/debian/control	2009-01-19 21:32:00 UTC (rev 7844)
@@ -5,7 +5,8 @@
 Build-Depends: cdbs, debhelper (>= 7), default-jdk-builddep,
 	       ant, dpatch, libxerces2-java, libxalan2-java,
 	       libaxis-java, libwsdl4j-java, libgnujaf-java,
-	       libgnumail-java, liblog4j1.2-java, javahelp2
+	       libgnumail-java, liblog4j1.2-java, javahelp2,
+	       libcommons-discovery-java, libcommons-logging-java
 Standards-Version: 3.8.0
 Homepage: http://www.jalview.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
@@ -13,11 +14,12 @@
 
 
 Package: jalview
-Architecture: any
+Architecture: all
 Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
 	 java-wrappers (>= 0.1.11), libxerces2-java, libxalan2-java, 
 	 libaxis-java, libwsdl4j-java, libgnujaf-java, libgnumail-java,
-	 liblog4j1.2-java, javahelp2
+	 liblog4j1.2-java, javahelp2, libcommons-discovery-java,
+	 libcommons-logging-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-19 20:19:59 UTC (rev 7843)
+++ trunk/jalview/debian/new-upstream	2009-01-19 21:32:00 UTC (rev 7844)
@@ -29,7 +29,8 @@
 rm -rf jalview*/utils
 # 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 ; do
+    activation.jar  wsdl4j.jar jaxrpc.jar log4j-1.2.8.jar jhall.jar \
+    commons-discovery.jar commons-logging.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	2009-01-19 20:19:59 UTC (rev 7843)
+++ trunk/jalview/debian/rules	2009-01-19 21:32:00 UTC (rev 7844)
@@ -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
+	jhall commons-discovery commons-logging
 
 
 # Additional arguments for ant, such as properties.
@@ -47,7 +47,6 @@
 # AS LONG AS THIS VARIABLE EXISTS, UPLOAD TO MAIN, AND POSSIBLY TO NON-FREE,
 # IS IMPOSSIBLE !
 BINARY_JARS = castor-1.1-cycle-xml.jar \
-	commons-discovery.jar commons-logging.jar \
 	Jmol-11.0.2.jar regex.jar \
 	vamsas-client.jar
 

Modified: trunk/jalview/debian/wrappers/jalview
===================================================================
--- trunk/jalview/debian/wrappers/jalview	2009-01-19 20:19:59 UTC (rev 7843)
+++ trunk/jalview/debian/wrappers/jalview	2009-01-19 21:32:00 UTC (rev 7844)
@@ -7,7 +7,7 @@
 find_java_runtime openjdk sun6
 
 find_jars activation axis jalview-castor-1.1-cycle-xml \
-    jalview-commons-discovery jalview-commons-logging jaxrpc \
+    commons-discovery commons-logging jaxrpc \
     jhall jalview-Jmol-11.0.2 log4j-1.2 \
     gnumail jalview-regex saaj jalview-vamsas-client \
     wsdl4j xercesImpl xml-apis \