Author: fourmond Date: 2009-01-19 20:17:30 +0000 (Mon, 19 Jan 2009) New Revision: 7842
Modified: trunk/jalview/debian/changelog trunk/jalview/debian/control trunk/jalview/debian/new-upstream trunk/jalview/debian/patches/10-build.dpatch trunk/jalview/debian/rules Log: [jalview] Dropping another set of binary-only jars from the source package Modified: trunk/jalview/debian/changelog =================================================================== --- trunk/jalview/debian/changelog 2009-01-19 19:56:56 UTC (rev 7841) +++ trunk/jalview/debian/changelog 2009-01-19 20:17:30 UTC (rev 7842) @@ -11,5 +11,8 @@ * Dropping provided axis.jar and saaj.jar, (build)?-dep on libaxis-java * Also dropping jaxrpc.jar, also in libaxis-java * Dropping provided log4j-1.2.8.jar, (build)?-dep on liblog4j1.2-java + * 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. - -- Vincent Fourmond <[email protected]> Mon, 19 Jan 2009 20:54:28 +0100 + -- Vincent Fourmond <[email protected]> Mon, 19 Jan 2009 21:16:19 +0100 Modified: trunk/jalview/debian/control =================================================================== --- trunk/jalview/debian/control 2009-01-19 19:56:56 UTC (rev 7841) +++ trunk/jalview/debian/control 2009-01-19 20:17:30 UTC (rev 7842) @@ -5,7 +5,7 @@ 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 + libgnumail-java, liblog4j1.2-java, javahelp2 Standards-Version: 3.8.0 Homepage: http://www.jalview.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview @@ -17,7 +17,7 @@ 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 + liblog4j1.2-java, javahelp2 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 19:56:56 UTC (rev 7841) +++ trunk/jalview/debian/new-upstream 2009-01-19 20:17:30 UTC (rev 7842) @@ -29,7 +29,7 @@ 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 ; do + activation.jar wsdl4j.jar jaxrpc.jar log4j-1.2.8.jar jhall.jar ; do rm jalview*/lib/$jar done echo "Now listing binary jar files still present in the dfsg tarball" Modified: trunk/jalview/debian/patches/10-build.dpatch =================================================================== --- trunk/jalview/debian/patches/10-build.dpatch 2009-01-19 19:56:56 UTC (rev 7841) +++ trunk/jalview/debian/patches/10-build.dpatch 2009-01-19 20:17:30 UTC (rev 7842) @@ -8,7 +8,7 @@ @DPATCH@ diff -urNad jalview-2.4.dfsg~/build.xml jalview-2.4.dfsg/build.xml --- jalview-2.4.dfsg~/build.xml 2008-08-27 14:40:34.000000000 +0200 -+++ jalview-2.4.dfsg/build.xml 2009-01-17 15:30:47.000000000 +0100 ++++ jalview-2.4.dfsg/build.xml 2009-01-19 21:14:54.000000000 +0100 @@ -1,14 +1,14 @@ <?xml version="1.0"?> <project name="jalviewX" default="usage" basedir="."> @@ -75,3 +75,12 @@ </target> +@@ -190,7 +187,7 @@ + unless="help.uptodate"> + <java + classname="com.sun.java.help.search.Indexer" +- classpathref="build.classpath" ++ classpath="/usr/share/java/jhall.jar" + fork="true" + dir="${outputDir}/${helpDir}" + > Modified: trunk/jalview/debian/rules =================================================================== --- trunk/jalview/debian/rules 2009-01-19 19:56:56 UTC (rev 7841) +++ trunk/jalview/debian/rules 2009-01-19 20:17:30 UTC (rev 7842) @@ -23,8 +23,10 @@ DEB_ANT_CLEAN_TARGET := clean DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar xml-api xercesImpl \ - axis saaj gnumail wsdl4j activation jaxrpc log4j-1.2 + axis saaj gnumail wsdl4j activation jaxrpc log4j-1.2 \ + jhall + # Additional arguments for ant, such as properties. ANT_ARGS := -DJALVIEW_VERSION=$(VERSION) @@ -46,7 +48,7 @@ # IS IMPOSSIBLE ! BINARY_JARS = castor-1.1-cycle-xml.jar \ commons-discovery.jar commons-logging.jar \ - jhall.jar Jmol-11.0.2.jar regex.jar \ + Jmol-11.0.2.jar regex.jar \ vamsas-client.jar _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
