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

[Andreas Tille]

Author: tille
Date: 2011-02-14 12:34:20 +0000 (Mon, 14 Feb 2011)
New Revision: 5973

Modified:
   trunk/packages/figtree/trunk/debian/control
   trunk/packages/figtree/trunk/debian/figtree.manifest
   trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch
   trunk/packages/figtree/trunk/debian/rules
Log:
Used suggested hack by Debian Java experts and made sure Build-Depends will fit this hack


Modified: trunk/packages/figtree/trunk/debian/control
===================================================================
--- trunk/packages/figtree/trunk/debian/control	2011-02-14 09:27:52 UTC (rev 5972)
+++ trunk/packages/figtree/trunk/debian/control	2011-02-14 12:34:20 UTC (rev 5973)
@@ -6,9 +6,11 @@
 Uploaders: Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 7.1), javahelper (>=0.25), openjdk-6-jdk, ant, quilt (>= 0.47),
  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
+ libfreehep-graphics2d-java, libfreehep-graphicsio-java,
+ libfreehep-graphicsio-pdf-java, libfreehep-graphicsio-ps-java,
+ libfreehep-graphicsio-swf-java (= 2.1.1+dfsg-1),
+ libfreehep-graphicsio-svg-java (= 2.1.1-3),
+ libfreehep-graphicsio-emf-java (= 2.1.1+dfsg-1)
 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
@@ -16,7 +18,7 @@
 
 Package: figtree
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre | java-jre
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${java:Depends}
 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/figtree.manifest
===================================================================
--- trunk/packages/figtree/trunk/debian/figtree.manifest	2011-02-14 09:27:52 UTC (rev 5972)
+++ trunk/packages/figtree/trunk/debian/figtree.manifest	2011-02-14 12:34:20 UTC (rev 5973)
@@ -1,3 +1,3 @@
 usr/share/figtree/figtree.jar:
  Class-Path: /usr/share/java/trove.jar
- Main-class: com.foo
+ Main-class: figtree/application/FigTreeApplication

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-14 09:27:52 UTC (rev 5972)
+++ trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch	2011-02-14 12:34:20 UTC (rev 5973)
@@ -4,20 +4,25 @@
 
 --- figtree-1.3.1.orig/build.xml
 +++ figtree-1.3.1/build.xml
-@@ -11,6 +11,7 @@
+@@ -11,6 +11,12 @@
  	<property name="build" location="build"/>
  
  	<property name="lib" location="lib"/>
 +	<property name="deblib" location="/usr/share/java"/>
++	<!-- HACK: see http://lists.debian.org/debian-java/2011/02/msg00123.html -->
++	<property name="freeheploc" location="/usr/share/maven-repo/org/freehep/"/>
++	<property name="freehepver" location="2.1.1"/>
++	<property name="fhgio"      location="freehep-graphicsio"/>
++        <!-- END HACK -->
  	<property name="dist" location="dist"/>
  
  	<property environment="env"/>
-@@ -35,7 +36,7 @@
+@@ -35,7 +41,7 @@
  	<target name="compile" depends="init">
  		<!-- 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-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">
++		       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:${freeheploc}/freehep-graphicsio-emf/2.1.1/freehep-graphicsio-emf-2.1.1.jar:${freeheploc}/freehep-graphicsio-svg/2.1.1/freehep-graphicsio-svg-2.1.1.jar:${freeheploc}/freehep-graphicsio-swf/2.1.1/freehep-graphicsio-swf-2.1.1.jar:${lib}/iText.jar">
  			<include name="figtree/**"/>
  		</javac>
  		<copy todir="${build}" verbose="true">

Modified: trunk/packages/figtree/trunk/debian/rules
===================================================================
--- trunk/packages/figtree/trunk/debian/rules	2011-02-14 09:27:52 UTC (rev 5972)
+++ trunk/packages/figtree/trunk/debian/rules	2011-02-14 12:34:20 UTC (rev 5973)
@@ -20,7 +20,7 @@
 	ant clean
 
 override_dh_link:
-	dh_link usr/share/foo/foo.jar usr/bin/foo
+	dh_link usr/share/figtree/figtree.jar usr/bin/figtree
 
 #override_dh_install:
 #	dh_install