[med-svn] [figtree] 05/08: adapt patches for latest upstream version
Fabian Klötzl
kloetzl-guest at moszumanska.debian.org
Fri Jul 14 12:20:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
kloetzl-guest pushed a commit to branch master
in repository figtree.
commit 5ae3f6c3889a319cbdf59bb03d0119aeb61f724f
Author: Fabian Klötzl <fabian at kloetzl.info>
Date: Fri Jul 14 13:03:57 2017 +0200
adapt patches for latest upstream version
---
debian/patches/build_figtree_gui_only.patch | 19 ++++++++-------
debian/patches/fix_classpath_in_build_xml.patch | 6 ++---
debian/patches/fix_itext_api_change.patch | 2 +-
debian/patches/fix_jebl.patch | 2 +-
debian/patches/ignore_quaqua.patch | 31 ++++++++++---------------
debian/patches/java7-compat.patch | 4 ++--
debian/patches/series | 1 +
7 files changed, 31 insertions(+), 34 deletions(-)
diff --git a/debian/patches/build_figtree_gui_only.patch b/debian/patches/build_figtree_gui_only.patch
index 4de3e1a..0a0b057 100644
--- a/debian/patches/build_figtree_gui_only.patch
+++ b/debian/patches/build_figtree_gui_only.patch
@@ -1,23 +1,26 @@
Author: Andreas Tille <tille at debian.org>
Date: Mon, 07 Feb 2011 12:02:43 +0100
+Author: Fabian Klötzl <kloetzl at evolbio.mpg.de>
+Last-Date: 2017-07-14
Description: Do not build targets figtree-pdf.jar and figtree.war
--- a/build.xml
+++ b/build.xml
-@@ -60,35 +60,6 @@
+@@ -70,36 +70,6 @@
+ <attribute name="Built-By" value="${user.name}"/>
</manifest>
</jar>
-
+-
- <jar jarfile="${dist}/figtree-pdf.jar">
-- <zipgroupfileset dir="${lib}" includes="jebl.jar"/>
-- <zipgroupfileset dir="${lib}" includes="jam.jar"/>
-- <zipgroupfileset dir="${lib}" includes="iText.jar"/>
-- <fileset dir="${build}" includes="**/*.class,**/*.properties,**/*.png,**/*.gif"/>
+- <fileset dir="${build}"
+- includes="figtree/panel/**/*.class,figtree/treeviewer/**/*.class,**/*.properties,**/*.png,**/*.gif"
+- />
+-
- <manifest>
- <attribute name="Built-By" value="${user.name}"/>
-- <attribute name="Main-Class" value="figtree.application.FigTreePDF"/>
- </manifest>
- </jar>
-
+-
- <war destfile="${dist}/figtree.war"
- webxml="WebRoot/WEB-INF/web.xml">
- <fileset dir="WebRoot"/>
@@ -38,4 +41,4 @@ Description: Do not build targets figtree-pdf.jar and figtree.war
-
</target>
- <property name="version" value="1.4.2" />
+ <property name="version" value="1.4.3" />
diff --git a/debian/patches/fix_classpath_in_build_xml.patch b/debian/patches/fix_classpath_in_build_xml.patch
index 74fe1bc..dc09d20 100644
--- a/debian/patches/fix_classpath_in_build_xml.patch
+++ b/debian/patches/fix_classpath_in_build_xml.patch
@@ -11,9 +11,9 @@ Subject: adapt build file to match debian env
<property name="lib" location="lib"/>
+ <property name="deblib" location="/usr/share/java"/>
<property name="dist" location="dist"/>
+ <property name="packaging_tools" value="packaging_tools" />
- <property environment="env"/>
-@@ -35,7 +36,7 @@
+@@ -36,7 +37,7 @@
<target name="compile" depends="init">
<!-- Compile the java code from ${src} into ${build} -->
<javac source="1.6" target="1.6" srcdir="${src}" destdir="${build}"
@@ -22,7 +22,7 @@ Subject: adapt build file to match debian env
<include name="figtree/**"/>
</javac>
<copy todir="${build}" verbose="true">
-@@ -48,11 +49,13 @@
+@@ -49,11 +50,13 @@
<mkdir dir="${dist}"/>
<jar jarfile="${dist}/figtree.jar">
diff --git a/debian/patches/fix_itext_api_change.patch b/debian/patches/fix_itext_api_change.patch
index a0d2807..3b015cf 100644
--- a/debian/patches/fix_itext_api_change.patch
+++ b/debian/patches/fix_itext_api_change.patch
@@ -6,7 +6,7 @@ Author: Olivier Sallou <osallou at debian.org>
Forwarded: no
--- a/src/figtree/application/FigTreeFrame.java
+++ b/src/figtree/application/FigTreeFrame.java
-@@ -22,7 +22,7 @@ package figtree.application;
+@@ -22,7 +22,7 @@
import com.itextpdf.text.Document;
import com.itextpdf.text.DocumentException;
diff --git a/debian/patches/fix_jebl.patch b/debian/patches/fix_jebl.patch
index 8b133a1..bb0a741 100644
--- a/debian/patches/fix_jebl.patch
+++ b/debian/patches/fix_jebl.patch
@@ -4,7 +4,7 @@ Description: jebl in Debian has different API, modify code to match it.
Last-Updated: 2015-08-12
--- a/src/figtree/application/FigTreeFrame.java
+++ b/src/figtree/application/FigTreeFrame.java
-@@ -930,7 +930,7 @@ public class FigTreeFrame extends Docume
+@@ -932,7 +932,7 @@
FileWriter writer = new FileWriter(file);
FigTreeNexusExporter exporter = new FigTreeNexusExporter(writer, true);
diff --git a/debian/patches/ignore_quaqua.patch b/debian/patches/ignore_quaqua.patch
index 3f9a214..550575f 100644
--- a/debian/patches/ignore_quaqua.patch
+++ b/debian/patches/ignore_quaqua.patch
@@ -8,15 +8,15 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
--- a/src/figtree/application/FigTreeApplication.java
+++ b/src/figtree/application/FigTreeApplication.java
-@@ -51,7 +51,6 @@ import jebl.evolution.trees.Tree;
+@@ -56,7 +56,6 @@
import javax.imageio.ImageIO;
import javax.swing.*;
-import ch.randelshofer.quaqua.QuaquaManager;
-
- /**
- * Application class for FigTree including main() method for invoking it.
-@@ -336,40 +335,6 @@ public class FigTreeApplication extends
+ import org.apache.batik.dom.GenericDOMImplementation;
+ import org.apache.batik.svggen.SVGGraphics2D;
+ import org.w3c.dom.DOMImplementation;
+@@ -321,40 +320,6 @@
System.setProperty("apple.awt.showGrowBox","true");
System.setProperty("apple.awt.graphics.UseQuartz","true");
@@ -57,7 +57,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
UIManager.put("SystemFont", new Font("Lucida Grande", Font.PLAIN, 13));
UIManager.put("SmallSystemFont", new Font("Lucida Grande", Font.PLAIN, 11));
-@@ -465,4 +430,4 @@ public class FigTreeApplication extends
+@@ -450,4 +415,4 @@
}
}
@@ -66,7 +66,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
+}
--- a/src/figtree/treeviewer/TreeViewerController.java
+++ b/src/figtree/treeviewer/TreeViewerController.java
-@@ -112,13 +112,10 @@ public class TreeViewerController extend
+@@ -112,13 +112,10 @@
rectangularTreeToggle.setFocusable(false);
polarTreeToggle.setFocusable(false);
radialTreeToggle.setFocusable(false);
@@ -82,7 +82,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
ButtonGroup buttonGroup = new ButtonGroup();
--- a/src/figtree/application/FigTreeFrame.java
+++ b/src/figtree/application/FigTreeFrame.java
-@@ -224,7 +224,6 @@ public class FigTreeFrame extends Docume
+@@ -226,7 +226,6 @@
// treeViewer.showStatistics();
// }
// });
@@ -90,7 +90,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
// toolBar.addComponent(settingsToolButton);
// settingsToolButton.setEnabled(false);
-@@ -235,19 +234,16 @@ public class FigTreeFrame extends Docume
+@@ -237,19 +236,16 @@
toggle1.setFocusable(false);
toggle1.putClientProperty("JButton.buttonType", "segmentedTextured");
toggle1.putClientProperty("JButton.segmentPosition", "first");
@@ -110,7 +110,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
ButtonGroup buttonGroup = new ButtonGroup();
buttonGroup.add(toggle1);
-@@ -301,7 +297,6 @@ public class FigTreeFrame extends Docume
+@@ -303,7 +299,6 @@
prevTreeToolButton.setFocusable(false);
prevTreeToolButton.putClientProperty("JButton.buttonType", "segmentedTextured");
prevTreeToolButton.putClientProperty("JButton.segmentPosition", "first");
@@ -118,7 +118,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
final ToolbarAction nextTreeToolbarAction =
new ToolbarAction(null, "Next Tree...", nextIcon) {
-@@ -321,7 +316,6 @@ public class FigTreeFrame extends Docume
+@@ -323,7 +318,6 @@
nextTreeToolButton.setFocusable(false);
nextTreeToolButton.putClientProperty("JButton.buttonType", "segmentedTextured");
nextTreeToolButton.putClientProperty("JButton.segmentPosition", "last");
@@ -126,16 +126,9 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
nextTreeToolbarAction.setEnabled(treeViewer.getCurrentTreeIndex() < treeViewer.getTreeCount() - 1);
prevTreeToolbarAction.setEnabled(treeViewer.getCurrentTreeIndex() > 0);
-@@ -1852,4 +1846,4 @@ public class FigTreeFrame extends Docume
- private AnnotationDialog annotationDialog = null;
- private AnnotationDialog copyAnnotationDialog = null;
- private SelectAnnotationDialog selectAnnotationDialog = null;
--}
-\ No newline at end of file
-+}
--- a/src/figtree/treeviewer/ControllerOptionsPanel.java
+++ b/src/figtree/treeviewer/ControllerOptionsPanel.java
-@@ -51,7 +51,6 @@ public class ControllerOptionsPanel exte
+@@ -51,7 +51,6 @@
}
public static void setComponentLook(JComponent comp) {
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
index 6839ab3..7f6890c 100644
--- a/debian/patches/java7-compat.patch
+++ b/debian/patches/java7-compat.patch
@@ -5,7 +5,7 @@ Description: Fix up Painter symbol resolution issue in TreeView class.
--- a/src/figtree/treeviewer/TreePane.java
+++ b/src/figtree/treeviewer/TreePane.java
-@@ -28,6 +28,7 @@ import jebl.evolution.trees.*;
+@@ -28,6 +28,7 @@
import figtree.treeviewer.decorators.*;
import figtree.treeviewer.painters.*;
import figtree.treeviewer.treelayouts.*;
@@ -13,7 +13,7 @@ Description: Fix up Painter symbol resolution issue in TreeView class.
import javax.swing.*;
import java.awt.*;
-@@ -2341,4 +2342,4 @@ public class TreePane extends JComponent
+@@ -2449,4 +2450,4 @@
private Map<Node, Shape> calloutPaths = new HashMap<Node, Shape>();
diff --git a/debian/patches/series b/debian/patches/series
index c42c988..5d231a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ ignore_quaqua.patch
fix_classpath_in_build_xml.patch
fix_itext_api_change.patch
fix_jebl.patch
+fix_handling_of_paths_with_spaces_in_wrapper.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/figtree.git
More information about the debian-med-commit
mailing list