[med-svn] r5969 - in trunk/packages/figtree/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-02-13 20:08:46 +0000 (Sun, 13 Feb 2011)
New Revision: 5969

Modified:
   trunk/packages/figtree/trunk/debian/control
   trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch
Log:
Try to add more freehep class packages


Modified: trunk/packages/figtree/trunk/debian/control
===================================================================
--- trunk/packages/figtree/trunk/debian/control	2011-02-13 16:29:07 UTC (rev 5968)
+++ trunk/packages/figtree/trunk/debian/control	2011-02-13 20:08:46 UTC (rev 5969)
@@ -5,8 +5,10 @@
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7.1), javahelper (>=0.25), openjdk-6-jdk, ant, quilt (>= 0.47),
- libfreehep-graphics2d-java, libfreehep-graphicsio-java, libjebl2-java, libjam-java,
- libtrove-java
+ libjebl2-java, libjam-java, libtrove-java,
+ libfreehep-graphics2d-java, libfreehep-graphicsio-java, libfreehep-graphicsio-swf-java,
+ libfreehep-graphicsio-pdf-java, libfreehep-graphicsio-svg-java,
+ libfreehep-graphicsio-ps-java, libfreehep-graphicsio-emf-java
 Standards-Version: 3.9.1
 Homepage: http://tree.bio.ed.ac.uk/software/figtree/
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/figtree/trunk
@@ -14,7 +16,7 @@
 
 Package: figtree
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java-jre
 Description: graphical phylogenetic tree viewer
  FigTree is designed as a graphical viewer of phylogenetic trees and as
  a program for producing publication-ready figures.  In particular it is

Modified: trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch	2011-02-13 16:29:07 UTC (rev 5968)
+++ trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch	2011-02-13 20:08:46 UTC (rev 5969)
@@ -17,7 +17,7 @@
  		<!-- Compile the java code from ${src} into ${build} -->
  		<javac source="1.5" target="1.5" srcdir="${src}" destdir="${build}"
 -		       classpath="${lib}/jebl.jar:${lib}/jam.jar:${lib}/freehep.jar:${lib}/iText.jar:${lib}/quaqua.jar:${lib}/jwt/servlet-api-2.5-6.0.2.jar:${lib}/jwt/jwt-3.1.7pre1.jar">
-+		       classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-export.jar:${lib}/iText.jar">
++		       classpath="${deblib}/jebl.jar:${deblib}/jam.jar:${deblib}/freehep-graphics2d.jar:${deblib}/freehep-graphicsio.jar:${deblib}/freehep-graphicsio-pdf.jar:${deblib}/freehep-graphicsio-ps.jar:${deblib}/libfreehep-graphicsio-emf.jar:${deblib}/libfreehep-graphicsio-swf.jar:${deblib}/libfreehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${lib}/iText.jar">
  			<include name="figtree/**"/>
  		</javac>
  		<copy todir="${build}" verbose="true">