[med-svn] r19920 - in trunk/packages/figtree/trunk/debian: . patches
Olivier Sallou
osallou at moszumanska.debian.org
Wed Aug 12 08:41:36 UTC 2015
Author: osallou
Date: 2015-08-12 08:41:35 +0000 (Wed, 12 Aug 2015)
New Revision: 19920
Modified:
trunk/packages/figtree/trunk/debian/changelog
trunk/packages/figtree/trunk/debian/control
trunk/packages/figtree/trunk/debian/figtree.manifest
trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch
trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch
trunk/packages/figtree/trunk/debian/patches/ignore_quaqua.patch
trunk/packages/figtree/trunk/debian/patches/java7-compat.patch
trunk/packages/figtree/trunk/debian/patches/series
Log:
new upstream release 1.4.2
Modified: trunk/packages/figtree/trunk/debian/changelog
===================================================================
--- trunk/packages/figtree/trunk/debian/changelog 2015-08-12 08:05:22 UTC (rev 19919)
+++ trunk/packages/figtree/trunk/debian/changelog 2015-08-12 08:41:35 UTC (rev 19920)
@@ -1,3 +1,10 @@
+figtree (1.4.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * d/control: use standards 3.9.6
+
+ -- Olivier Sallou <osallou at debian.org> Wed, 12 Aug 2015 09:35:33 +0200
+
figtree (1.4-2) unstable; urgency=low
* Force set of JAVA_HOME in debian/rules (Closes: #715225).
Modified: trunk/packages/figtree/trunk/debian/control
===================================================================
--- trunk/packages/figtree/trunk/debian/control 2015-08-12 08:05:22 UTC (rev 19919)
+++ trunk/packages/figtree/trunk/debian/control 2015-08-12 08:41:35 UTC (rev 19920)
@@ -8,6 +8,7 @@
javahelper (>=0.25),
default-jdk,
ant,
+ libbatik-java,
libjebl2-java,
libjam-java (>= 0.0.r304),
libtrove-java,
@@ -19,7 +20,7 @@
libfreehep-graphicsio-svg-java,
libfreehep-graphicsio-emf-java,
libitext5-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/figtree/trunk/
Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/figtree/trunk
Homepage: http://tree.bio.ed.ac.uk/software/figtree/
Modified: trunk/packages/figtree/trunk/debian/figtree.manifest
===================================================================
--- trunk/packages/figtree/trunk/debian/figtree.manifest 2015-08-12 08:05:22 UTC (rev 19919)
+++ trunk/packages/figtree/trunk/debian/figtree.manifest 2015-08-12 08:41:35 UTC (rev 19920)
@@ -1,3 +1,3 @@
usr/share/java/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/freehep-graphicsio-emf.jar /usr/share/java/freehep-graphicsio-swf.jar /usr/share/java/freehep-graphicsio-svg.jar /usr/share/java/freehep-export.jar /usr/share/java/itext5.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 /usr/share/java/itext5.jar /usr/share/java/batik-svggen.jar /usr/share/java/batik-dom.jar /usr/share/java/batik-awt-util.jar /usr/share/java/batik-ext.jar /usr/share/java/batik-util.jar /usr/share/java/batik-xml.jar
Main-Class: figtree/application/FigTreeApplication
Modified: trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch 2015-08-12 08:05:22 UTC (rev 19919)
+++ trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch 2015-08-12 08:41:35 UTC (rev 19920)
@@ -1,12 +1,8 @@
-Author: Andreas Tille <tille at debian.org>
-Date: Mon, 07 Feb 2011 12:02:43 +0100
-Description: Do not build targets figtree-pdf.jar and figtree.war
-
--- a/build.xml
+++ b/build.xml
-@@ -59,36 +59,6 @@
- </manifest>
- </jar>
+@@ -60,35 +60,6 @@
+ </manifest>
+ </jar>
- <jar jarfile="${dist}/figtree-pdf.jar">
- <zipgroupfileset dir="${lib}" includes="jebl.jar"/>
@@ -19,25 +15,24 @@
- </manifest>
- </jar>
-
-- <war destfile="${dist}/figtree.war"
+- <war destfile="${dist}/figtree.war"
- webxml="WebRoot/WEB-INF/web.xml">
-- <fileset dir="WebRoot"/>
-- <lib dir="${lib}/jwt">
-- <include name="commons-fileupload-1.2.1.jar" />
-- <include name="commons-io-1.4.jar" />
-- <include name="jwt-3.1.6.jar" />
-- </lib>
-- <lib dir="${lib}">
-- <include name="freehep.jar" />
-- <include name="iText.jar" />
-- <include name="jam.jar" />
-- <include name="jdom.jar" />
-- <include name="jebl.jar" />
-- </lib>
-- <classes dir="${build}"/>
-- </war>
+- <fileset dir="WebRoot"/>
+- <lib dir="${lib}/jwt">
+- <include name="commons-fileupload-1.2.1.jar" />
+- <include name="commons-io-1.4.jar" />
+- <include name="jwt-3.1.6.jar" />
+- </lib>
+- <lib dir="${lib}">
+- <include name="iText.jar" />
+- <include name="jam.jar" />
+- <include name="jdom.jar" />
+- <include name="jebl.jar" />
+- </lib>
+- <classes dir="${build}"/>
+- </war>
-
-
- </target>
+ </target>
- <property name="version" value="1.4.1" />
+ <property name="version" value="1.4.3" />
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 2015-08-12 08:05:22 UTC (rev 19919)
+++ trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch 2015-08-12 08:41:35 UTC (rev 19920)
@@ -6,19 +6,33 @@
--- a/build.xml
+++ b/build.xml
@@ -11,6 +11,7 @@
- <property name="build" location="build"/>
+ <property name="build" location="build"/>
- <property name="lib" location="lib"/>
-+ <property name="deblib" location="/usr/share/java"/>
- <property name="dist" location="dist"/>
+ <property name="lib" location="lib"/>
++ <property name="deblib" location="/usr/share/java"/>
+ <property name="dist" location="dist"/>
- <property environment="env"/>
+ <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-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:${deblib}/itext5.jar:${env.JAVA_HOME}/lib/sa-jdi.jar">
- <include name="figtree/**"/>
- </javac>
- <copy todir="${build}" verbose="true">
+ <target name="compile" depends="init">
+ <!-- Compile the java code from ${src} into ${build} -->
+ <javac source="1.6" target="1.6" srcdir="${src}" destdir="${build}"
+- classpath="${lib}/jebl.jar:${lib}/jam.jar:${lib}/batik-awt-util.jar:${lib}/batik-dom.jar:${lib}/batik-ext.jar:${lib}/batik-svggen.jar:${lib}/batik-util.jar:${lib}/batik-xml.jar:${lib}/xml-apis.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}/batik-awt-util.jar:${deblib}/batik-dom.jar:${deblib}/batik-ext.jar:${deblib}/batik-svggen.jar:${deblib}/batik-util.jar:${deblib}/batik-xml.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:${deblib}/itext5.jar:${env.JAVA_HOME}/lib/sa-jdi.jar">
+ <include name="figtree/**"/>
+ </javac>
+ <copy todir="${build}" verbose="true">
+@@ -48,11 +49,13 @@
+ <mkdir dir="${dist}"/>
+
+ <jar jarfile="${dist}/figtree.jar">
++ <!--
+ <zipgroupfileset dir="${lib}" includes="jebl.jar"/>
+ <zipgroupfileset dir="${lib}" includes="jam.jar"/>
+ <zipgroupfileset dir="${lib}" includes="batik*.jar"/>
+ <zipgroupfileset dir="${lib}" includes="xml-apis.jar"/>
+ <zipgroupfileset dir="${lib}" includes="iText.jar"/>
++ -->
+ <fileset dir="${build}" includes="**/*.class,**/*.properties,**/*.png,**/*.gif"/>
+ <manifest>
+ <attribute name="Built-By" value="${user.name}"/>
Modified: trunk/packages/figtree/trunk/debian/patches/ignore_quaqua.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/ignore_quaqua.patch 2015-08-12 08:05:22 UTC (rev 19919)
+++ trunk/packages/figtree/trunk/debian/patches/ignore_quaqua.patch 2015-08-12 08:41:35 UTC (rev 19920)
@@ -8,16 +8,15 @@
--- a/src/figtree/application/FigTreeApplication.java
+++ b/src/figtree/application/FigTreeApplication.java
-@@ -55,8 +55,6 @@
-
+@@ -51,7 +51,6 @@
+ import javax.imageio.ImageIO;
import javax.swing.*;
-import ch.randelshofer.quaqua.QuaquaManager;
--
- public class FigTreeApplication extends MultiDocApplication {
- public static final String VERSION = "1.4.1";
-@@ -321,41 +319,6 @@
+ /**
+ * Application class for FigTree including main() method for invoking it.
+@@ -336,40 +335,6 @@
System.setProperty("apple.awt.showGrowBox","true");
System.setProperty("apple.awt.graphics.UseQuartz","true");
@@ -55,12 +54,11 @@
- });
- } catch (Exception e) {
- }
--
+
UIManager.put("SystemFont", new Font("Lucida Grande", Font.PLAIN, 13));
UIManager.put("SmallSystemFont", new Font("Lucida Grande", Font.PLAIN, 11));
+@@ -465,4 +430,4 @@
}
-@@ -423,4 +386,4 @@
- }
}
-}
@@ -68,7 +66,7 @@
+}
--- a/src/figtree/treeviewer/TreeViewerController.java
+++ b/src/figtree/treeviewer/TreeViewerController.java
-@@ -86,13 +86,10 @@
+@@ -112,13 +112,10 @@
rectangularTreeToggle.setFocusable(false);
polarTreeToggle.setFocusable(false);
radialTreeToggle.setFocusable(false);
@@ -84,7 +82,7 @@
ButtonGroup buttonGroup = new ButtonGroup();
--- a/src/figtree/application/FigTreeFrame.java
+++ b/src/figtree/application/FigTreeFrame.java
-@@ -206,7 +206,6 @@
+@@ -224,7 +224,6 @@
// treeViewer.showStatistics();
// }
// });
@@ -92,7 +90,7 @@
// toolBar.addComponent(settingsToolButton);
// settingsToolButton.setEnabled(false);
-@@ -217,19 +216,16 @@
+@@ -235,19 +234,16 @@
toggle1.setFocusable(false);
toggle1.putClientProperty("JButton.buttonType", "segmentedTextured");
toggle1.putClientProperty("JButton.segmentPosition", "first");
@@ -112,7 +110,7 @@
ButtonGroup buttonGroup = new ButtonGroup();
buttonGroup.add(toggle1);
-@@ -283,7 +279,6 @@
+@@ -301,7 +297,6 @@
prevTreeToolButton.setFocusable(false);
prevTreeToolButton.putClientProperty("JButton.buttonType", "segmentedTextured");
prevTreeToolButton.putClientProperty("JButton.segmentPosition", "first");
@@ -120,7 +118,7 @@
final ToolbarAction nextTreeToolbarAction =
new ToolbarAction(null, "Next Tree...", nextIcon) {
-@@ -303,7 +298,6 @@
+@@ -321,7 +316,6 @@
nextTreeToolButton.setFocusable(false);
nextTreeToolButton.putClientProperty("JButton.buttonType", "segmentedTextured");
nextTreeToolButton.putClientProperty("JButton.segmentPosition", "last");
@@ -128,7 +126,7 @@
nextTreeToolbarAction.setEnabled(treeViewer.getCurrentTreeIndex() < treeViewer.getTreeCount() - 1);
prevTreeToolbarAction.setEnabled(treeViewer.getCurrentTreeIndex() > 0);
-@@ -1718,4 +1712,4 @@
+@@ -1852,4 +1846,4 @@
private AnnotationDialog annotationDialog = null;
private AnnotationDialog copyAnnotationDialog = null;
private SelectAnnotationDialog selectAnnotationDialog = null;
@@ -137,7 +135,7 @@
+}
--- a/src/figtree/treeviewer/ControllerOptionsPanel.java
+++ b/src/figtree/treeviewer/ControllerOptionsPanel.java
-@@ -25,7 +25,6 @@
+@@ -51,7 +51,6 @@
}
public static void setComponentLook(JComponent comp) {
Modified: trunk/packages/figtree/trunk/debian/patches/java7-compat.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/java7-compat.patch 2015-08-12 08:05:22 UTC (rev 19919)
+++ trunk/packages/figtree/trunk/debian/patches/java7-compat.patch 2015-08-12 08:41:35 UTC (rev 19920)
@@ -5,7 +5,7 @@
--- a/src/figtree/treeviewer/TreePane.java
+++ b/src/figtree/treeviewer/TreePane.java
-@@ -8,6 +8,7 @@
+@@ -28,6 +28,7 @@
import figtree.treeviewer.decorators.*;
import figtree.treeviewer.painters.*;
import figtree.treeviewer.treelayouts.*;
@@ -13,7 +13,7 @@
import javax.swing.*;
import java.awt.*;
-@@ -2231,4 +2232,4 @@
+@@ -2349,4 +2350,4 @@
private Map<Node, Shape> calloutPaths = new HashMap<Node, Shape>();
Modified: trunk/packages/figtree/trunk/debian/patches/series
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/series 2015-08-12 08:05:22 UTC (rev 19919)
+++ trunk/packages/figtree/trunk/debian/patches/series 2015-08-12 08:41:35 UTC (rev 19920)
@@ -1,6 +1,10 @@
+#build_figtree_gui_only.patch
+#ignore_quaqua.patch
+remove_webui.patch
+#fix_classpath_in_build_xml.patch
+java7-compat.patch
build_figtree_gui_only.patch
ignore_quaqua.patch
-remove_webui.patch
fix_classpath_in_build_xml.patch
-java7-compat.patch
fix_itext_api_change.patch
+fix_jebl.patch
More information about the debian-med-commit
mailing list