Author: fourmond Date: 2009-01-19 19:56:56 +0000 (Mon, 19 Jan 2009) New Revision: 7841
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 2 additional jars from the original source package Modified: trunk/jalview/debian/changelog =================================================================== --- trunk/jalview/debian/changelog 2009-01-18 20:34:46 UTC (rev 7840) +++ trunk/jalview/debian/changelog 2009-01-19 19:56:56 UTC (rev 7841) @@ -9,5 +9,7 @@ * 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 + * Also dropping jaxrpc.jar, also in libaxis-java + * Dropping provided log4j-1.2.8.jar, (build)?-dep on liblog4j1.2-java - -- Vincent Fourmond <[email protected]> Sun, 18 Jan 2009 20:11:23 +0100 + -- Vincent Fourmond <[email protected]> Mon, 19 Jan 2009 20:54:28 +0100 Modified: trunk/jalview/debian/control =================================================================== --- trunk/jalview/debian/control 2009-01-18 20:34:46 UTC (rev 7840) +++ trunk/jalview/debian/control 2009-01-19 19:56:56 UTC (rev 7841) @@ -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 + libgnumail-java, liblog4j1.2-java Standards-Version: 3.8.0 Homepage: http://www.jalview.org/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview @@ -16,7 +16,8 @@ Architecture: any 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 + libaxis-java, libwsdl4j-java, libgnujaf-java, libgnumail-java, + liblog4j1.2-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-18 20:34:46 UTC (rev 7840) +++ trunk/jalview/debian/new-upstream 2009-01-19 19:56:56 UTC (rev 7841) @@ -29,14 +29,14 @@ 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 ; do - rm -f jalview*/lib/$jar + activation.jar wsdl4j.jar jaxrpc.jar log4j-1.2.8.jar ; do + rm 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* +tar cvz -f $origname jalview* cd - # We remove any file already existing there: it might be a symlink. rm -f $orginame Modified: trunk/jalview/debian/rules =================================================================== --- trunk/jalview/debian/rules 2009-01-18 20:34:46 UTC (rev 7840) +++ trunk/jalview/debian/rules 2009-01-19 19:56:56 UTC (rev 7841) @@ -23,7 +23,7 @@ DEB_ANT_CLEAN_TARGET := clean DEB_JARS := $(ANT_HOME)/lib/ant-nodeps.jar xml-api xercesImpl \ - axis saaj gnumail wsdl4j activation + axis saaj gnumail wsdl4j activation jaxrpc log4j-1.2 # Additional arguments for ant, such as properties. ANT_ARGS := -DJALVIEW_VERSION=$(VERSION) @@ -45,8 +45,8 @@ # 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 jaxrpc.jar \ - jhall.jar Jmol-11.0.2.jar log4j-1.2.8.jar regex.jar \ + commons-discovery.jar commons-logging.jar \ + jhall.jar Jmol-11.0.2.jar regex.jar \ vamsas-client.jar Modified: trunk/jalview/debian/wrappers/jalview =================================================================== --- trunk/jalview/debian/wrappers/jalview 2009-01-18 20:34:46 UTC (rev 7840) +++ trunk/jalview/debian/wrappers/jalview 2009-01-19 19:56:56 UTC (rev 7841) @@ -7,8 +7,8 @@ find_java_runtime openjdk sun6 find_jars 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-commons-discovery jalview-commons-logging jaxrpc \ + jalview-jhall jalview-Jmol-11.0.2 log4j-1.2 \ gnumail jalview-regex saaj jalview-vamsas-client \ wsdl4j xercesImpl xml-apis \ jalview _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
