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

[Andreas Tille]

Author: tille
Date: 2011-02-15 12:17:15 +0000 (Tue, 15 Feb 2011)
New Revision: 5988

Modified:
   trunk/packages/figtree/trunk/debian/figtree.manifest
   trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch
Log:
Fix names of freehep classes


Modified: trunk/packages/figtree/trunk/debian/figtree.manifest
===================================================================
--- trunk/packages/figtree/trunk/debian/figtree.manifest	2011-02-15 12:07:40 UTC (rev 5987)
+++ trunk/packages/figtree/trunk/debian/figtree.manifest	2011-02-15 12:17:15 UTC (rev 5988)
@@ -1,3 +1,3 @@
 usr/share/figtree/figtree.jar:
- Class-Path: /usr/share/java/jebl.jar /usr/share/java/jam.jar /usr/share/java/freehep-graphics2d.jar /usr/share/java/freehep-graphicsio.jar /usr/share/java/freehep-graphicsio-pdf.jar /usr/share/java/freehep-graphicsio-ps.jar /usr/share/java/libfreehep-graphicsio-emf.jar /usr/share/java/libfreehep-graphicsio-swf.jar /usr/share/java/libfreehep-graphicsio-svg.jar /usr/share/java/freehep-export.jar /usr/share/maven-repo/org/freehep/freehep-graphicsio-emf/2.1.1/freehep-graphicsio-emf-2.1.1.jar /usr/share/maven-repo/org/freehep/freehep-graphicsio-svg/2.1.1/freehep-graphicsio-svg-2.1.1.jar /usr/share/maven-repo/org/freehep/freehep-graphicsio-swf/2.1.1/freehep-graphicsio-swf-2.1.1.jar lib/iText.jar
+ Class-Path: /usr/share/java/jebl.jar /usr/share/java/jam.jar /usr/share/java/freehep-graphics2d.jar /usr/share/java/freehep-graphicsio.jar /usr/share/java/freehep-graphicsio-pdf.jar /usr/share/java/freehep-graphicsio-ps.jar /usr/share/java/freehep-graphicsio-emf.jar /usr/share/java/freehep-graphicsio-swf.jar /usr/share/java/freehep-graphicsio-svg.jar /usr/share/java/freehep-export.jar lib/iText.jar
  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-15 12:07:40 UTC (rev 5987)
+++ trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch	2011-02-15 12:17:15 UTC (rev 5988)
@@ -4,25 +4,20 @@
 
 --- figtree-1.3.1.orig/build.xml
 +++ figtree-1.3.1/build.xml
-@@ -11,6 +11,12 @@
+@@ -11,6 +11,7 @@
  	<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 +41,7 @@
+@@ -35,7 +36,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:${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">
++		       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}/freehep-graphicsio-emf.jar:${deblib}/freehep-graphicsio-swf.jar:${deblib}/freehep-graphicsio-svg.jar:${deblib}/freehep-export.jar:${lib}/iText.jar">
  			<include name="figtree/**"/>
  		</javac>
  		<copy todir="${build}" verbose="true">