[med-svn] r5967 - in trunk/packages/figtree/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Sun Feb 13 12:01:13 UTC 2011
Author: tille
Date: 2011-02-13 12:01:05 +0000 (Sun, 13 Feb 2011)
New Revision: 5967
Added:
trunk/packages/figtree/trunk/debian/figtree.manifest
trunk/packages/figtree/trunk/debian/patches/fix_classpath.patch
trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch
Modified:
trunk/packages/figtree/trunk/debian/changelog
trunk/packages/figtree/trunk/debian/control
trunk/packages/figtree/trunk/debian/patches/series
trunk/packages/figtree/trunk/debian/rules
Log:
Try building against Debian packaged libraries (does not work entirely regarding freehep)
Modified: trunk/packages/figtree/trunk/debian/changelog
===================================================================
--- trunk/packages/figtree/trunk/debian/changelog 2011-02-13 02:24:41 UTC (rev 5966)
+++ trunk/packages/figtree/trunk/debian/changelog 2011-02-13 12:01:05 UTC (rev 5967)
@@ -2,4 +2,4 @@
* Initial release (Closes: #????)
- -- Andreas Tille <tille at debian.org> Mon, 07 Feb 2011 12:02:43 +0100
+ -- Andreas Tille <tille at debian.org> Sun, 13 Feb 2011 12:53:06 +0100
Modified: trunk/packages/figtree/trunk/debian/control
===================================================================
--- trunk/packages/figtree/trunk/debian/control 2011-02-13 02:24:41 UTC (rev 5966)
+++ trunk/packages/figtree/trunk/debian/control 2011-02-13 12:01:05 UTC (rev 5967)
@@ -4,9 +4,9 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 7.1), openjdk-6-jdk, ant, quilt (>= 0.47),
- libfreehep-graphics2d-java, libfreehep-graphicsio-java, libfreehep-swing-java,
- libfreehep-util-java, libfreehep-xml-java
+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
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
Added: trunk/packages/figtree/trunk/debian/figtree.manifest
===================================================================
--- trunk/packages/figtree/trunk/debian/figtree.manifest (rev 0)
+++ trunk/packages/figtree/trunk/debian/figtree.manifest 2011-02-13 12:01:05 UTC (rev 5967)
@@ -0,0 +1,3 @@
+usr/share/figtree/figtree.jar:
+ Class-Path: /usr/share/java/trove.jar
+ Main-class: com.foo
Added: trunk/packages/figtree/trunk/debian/patches/fix_classpath.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/fix_classpath.patch (rev 0)
+++ trunk/packages/figtree/trunk/debian/patches/fix_classpath.patch 2011-02-13 12:01:05 UTC (rev 5967)
@@ -0,0 +1,24 @@
+--- figtree-1.3.1.orig/.classpath
++++ figtree-1.3.1/.classpath
+@@ -1,17 +1,11 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <classpath>
+ <classpathentry kind="src" path="src"/>
+- <classpathentry kind="lib" path="lib/freehep.jar"/>
++ <classpathentry kind="lib" path="/usr/share/java/freehep-graphics2d.jar"/>
++ <classpathentry kind="lib" path="/usr/share/java/freehep-graphicsio.jar"/>
+ <classpathentry kind="lib" path="lib/iText.jar"/>
+- <classpathentry kind="lib" path="lib/jam.jar"/>
+- <classpathentry kind="lib" path="lib/jdom.jar"/>
+- <classpathentry kind="lib" path="lib/jebl.jar"/>
+- <classpathentry kind="lib" path="lib/swing-layout.jar"/>
++ <classpathentry kind="lib" path="/usr/share/java//jam.jar"/>
++ <classpathentry kind="lib" path="/usr/share/java//jebl.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+- <classpathentry kind="lib" path="lib/quaqua.jar"/>
+- <classpathentry kind="lib" path="lib/jwt/commons-fileupload-1.2.1.jar"/>
+- <classpathentry kind="lib" path="lib/jwt/commons-io-1.4.jar"/>
+- <classpathentry kind="lib" path="lib/jwt/servlet-api-2.5-6.0.2.jar"/>
+- <classpathentry kind="lib" path="lib/jwt/jwt-3.1.7pre1.jar"/>
+ <classpathentry kind="output" path="bin"/>
+ </classpath>
Added: trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch (rev 0)
+++ trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch 2011-02-13 12:01:05 UTC (rev 5967)
@@ -0,0 +1,23 @@
+Description: Fix Classpath to use Debian packaged classes
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 13 Feb 2011 12:53:06 +0100
+
+--- figtree-1.3.1.orig/build.xml
++++ figtree-1.3.1/build.xml
+@@ -11,6 +11,7 @@
+ <property name="build" location="build"/>
+
+ <property name="lib" location="lib"/>
++ <property name="deblib" location="/usr/share/java"/>
+ <property name="dist" location="dist"/>
+
+ <property environment="env"/>
+@@ -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-export.jar:${lib}/iText.jar">
+ <include name="figtree/**"/>
+ </javac>
+ <copy todir="${build}" verbose="true">
Modified: trunk/packages/figtree/trunk/debian/patches/series
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/series 2011-02-13 02:24:41 UTC (rev 5966)
+++ trunk/packages/figtree/trunk/debian/patches/series 2011-02-13 12:01:05 UTC (rev 5967)
@@ -2,3 +2,4 @@
ignore_quaqua.patch
remove_webui.patch
add_maven_pom_xml.patch
+fix_classpath_in_build_xml.patch
Modified: trunk/packages/figtree/trunk/debian/rules
===================================================================
--- trunk/packages/figtree/trunk/debian/rules 2011-02-13 02:24:41 UTC (rev 5966)
+++ trunk/packages/figtree/trunk/debian/rules 2011-02-13 12:01:05 UTC (rev 5967)
@@ -6,15 +6,22 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_JARS := freehep-graphics2d freehep-graphicsio freehep-export
+
pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+JAVA_HOME=/usr/lib/jvm/default-java
+
%:
- dh $@ --with quilt
+ dh $@ --with javahelper
override_dh_auto_clean:
rm -rf dist
ant clean
-override_dh_install:
- dh_install
- cp -a debian/$(pkg).sh $(CURDIR)/debian/$(pkg)/usr/bin/$(pkg)
+override_dh_link:
+ dh_link usr/share/foo/foo.jar usr/bin/foo
+
+#override_dh_install:
+# dh_install
+# cp -a debian/$(pkg).sh $(CURDIR)/debian/$(pkg)/usr/bin/$(pkg)
More information about the debian-med-commit
mailing list