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

[Andreas Tille]

Author: tille
Date: 2012-08-02 07:47:08 +0000 (Thu, 02 Aug 2012)
New Revision: 11965

Added:
   trunk/packages/figtree/trunk/debian/patches/java7-compat.patch
Modified:
   trunk/packages/figtree/trunk/debian/changelog
   trunk/packages/figtree/trunk/debian/control
   trunk/packages/figtree/trunk/debian/patches/series
Log:
Build with openjdk-7


Modified: trunk/packages/figtree/trunk/debian/changelog
===================================================================
--- trunk/packages/figtree/trunk/debian/changelog	2012-08-02 07:00:33 UTC (rev 11964)
+++ trunk/packages/figtree/trunk/debian/changelog	2012-08-02 07:47:08 UTC (rev 11965)
@@ -1,3 +1,14 @@
+figtree (1.3.1-2) UNRELEASED; urgency=low
+
+  * Apply patch provided by James Page <james.page at ubuntu.com> to build
+    with openjdk-7 (thanks to James)
+    Closes: #683532
+  * debian/control:
+     - Switch Build-Depends to default-jdk (also thanks to James)
+     - Fixed Vcs fields
+
+ -- Andreas Tille <tille at debian.org>  Thu, 02 Aug 2012 09:43:00 +0200
+
 figtree (1.3.1-1) unstable; urgency=low
 
   * Initial release (Closes: #614278)

Modified: trunk/packages/figtree/trunk/debian/control
===================================================================
--- trunk/packages/figtree/trunk/debian/control	2012-08-02 07:00:33 UTC (rev 11964)
+++ trunk/packages/figtree/trunk/debian/control	2012-08-02 07:47:08 UTC (rev 11965)
@@ -4,7 +4,7 @@
 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), javahelper (>=0.25), openjdk-6-jdk, ant, quilt (>= 0.47),
+Build-Depends: debhelper (>= 7.1), javahelper (>=0.25), default-jdk, ant, quilt (>= 0.47),
  libjebl2-java, libjam-java, libtrove-java,
  libfreehep-graphics2d-java, libfreehep-graphicsio-java,
  libfreehep-graphicsio-pdf-java, libfreehep-graphicsio-ps-java,

Added: trunk/packages/figtree/trunk/debian/patches/java7-compat.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/java7-compat.patch	                        (rev 0)
+++ trunk/packages/figtree/trunk/debian/patches/java7-compat.patch	2012-08-02 07:47:08 UTC (rev 11965)
@@ -0,0 +1,22 @@
+Author: James Page <james.page at ubuntu.com>
+Date: Wed, 01 Aug 2012 14:58:30 +0100
+Bugs-Debian: http://bugs.debian.org/683532
+Description: Fix up Painter symbol resolution issue in TreeView class.
+
+--- figtree-1.3.1.orig/src/figtree/treeviewer/TreePane.java
++++ figtree-1.3.1/src/figtree/treeviewer/TreePane.java
+@@ -7,6 +7,7 @@
+ import figtree.treeviewer.decorators.*;
+ import figtree.treeviewer.painters.*;
+ import figtree.treeviewer.treelayouts.*;
++import figtree.treeviewer.painters.Painter;
+ 
+ import javax.swing.*;
+ import java.awt.*;
+@@ -1964,4 +1965,4 @@
+ 
+     private Map<Node, Shape> calloutPaths = new HashMap<Node, Shape>();
+ 
+-}
+\ No newline at end of file
++}

Modified: trunk/packages/figtree/trunk/debian/patches/series
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/series	2012-08-02 07:00:33 UTC (rev 11964)
+++ trunk/packages/figtree/trunk/debian/patches/series	2012-08-02 07:47:08 UTC (rev 11965)
@@ -2,3 +2,4 @@
 ignore_quaqua.patch
 remove_webui.patch
 fix_classpath_in_build_xml.patch
+java7-compat.patch