[med-svn] r12641 - in trunk/packages/figtree/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Mon Dec 17 12:35:49 UTC 2012
Author: tille
Date: 2012-12-17 12:35:49 +0000 (Mon, 17 Dec 2012)
New Revision: 12641
Modified:
trunk/packages/figtree/trunk/debian/changelog
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/remove_webui.patch
Log:
New upstream version + adapted patches
Modified: trunk/packages/figtree/trunk/debian/changelog
===================================================================
--- trunk/packages/figtree/trunk/debian/changelog 2012-12-17 10:24:27 UTC (rev 12640)
+++ trunk/packages/figtree/trunk/debian/changelog 2012-12-17 12:35:49 UTC (rev 12641)
@@ -1,3 +1,9 @@
+figtree (1.4-1) UNRELEASED; urgency=low
+
+ * New upstream version (adapted quilt patches)
+
+ -- Andreas Tille <tille at debian.org> Mon, 17 Dec 2012 13:32:34 +0100
+
figtree (1.3.1-2) unstable; urgency=low
* Apply patch provided by James Page <james.page at ubuntu.com> to build
Modified: trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch 2012-12-17 10:24:27 UTC (rev 12640)
+++ trunk/packages/figtree/trunk/debian/patches/build_figtree_gui_only.patch 2012-12-17 12:35:49 UTC (rev 12641)
@@ -2,8 +2,8 @@
Date: Mon, 07 Feb 2011 12:02:43 +0100
Description: Do not build targets figtree-pdf.jar and figtree.war
---- figtree-1.3.1.orig/build.xml
-+++ figtree-1.3.1/build.xml
+--- a/build.xml
++++ b/build.xml
@@ -59,36 +59,6 @@
</manifest>
</jar>
@@ -40,4 +40,4 @@
-
</target>
- <property name="version" value="1.3.1" />
+ <property name="version" value="1.4.0" />
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 2012-12-17 10:24:27 UTC (rev 12640)
+++ trunk/packages/figtree/trunk/debian/patches/fix_classpath_in_build_xml.patch 2012-12-17 12:35:49 UTC (rev 12641)
@@ -2,8 +2,8 @@
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
+--- a/build.xml
++++ b/build.xml
@@ -11,6 +11,7 @@
<property name="build" location="build"/>
Modified: trunk/packages/figtree/trunk/debian/patches/ignore_quaqua.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/ignore_quaqua.patch 2012-12-17 10:24:27 UTC (rev 12640)
+++ trunk/packages/figtree/trunk/debian/patches/ignore_quaqua.patch 2012-12-17 12:35:49 UTC (rev 12641)
@@ -6,26 +6,18 @@
simply deleted all lines containing the string [qQ]aqua
which seems to lead to a usable application.
---- figtree-1.3.1.orig/src/figtree/application/FigTreeApplication.java
-+++ figtree-1.3.1/src/figtree/application/FigTreeApplication.java
-@@ -29,7 +29,6 @@
- import java.util.*;
- import java.util.List;
+--- a/src/figtree/application/FigTreeApplication.java
++++ b/src/figtree/application/FigTreeApplication.java
+@@ -55,8 +55,6 @@ import jebl.evolution.trees.Tree;
--//import ch.randelshofer.quaqua.QuaquaManager;
- import jebl.evolution.io.ImportException;
- import jebl.evolution.io.NewickImporter;
- import jebl.evolution.trees.Tree;
-@@ -37,8 +36,6 @@
-
import javax.swing.*;
-import ch.randelshofer.quaqua.QuaquaManager;
-
public class FigTreeApplication extends MultiDocApplication {
- public static final String VERSION = "1.3.1";
-@@ -303,34 +300,6 @@
+ public static final String VERSION = "1.4.0";
+@@ -321,34 +319,6 @@ public class FigTreeApplication extends
System.setProperty("apple.awt.showGrowBox","true");
System.setProperty("apple.awt.graphics.UseQuartz","true");
@@ -60,16 +52,16 @@
UIManager.put("SystemFont", new Font("Lucida Grande", Font.PLAIN, 13));
UIManager.put("SmallSystemFont", new Font("Lucida Grande", Font.PLAIN, 11));
}
-@@ -389,4 +358,4 @@
+@@ -407,4 +377,4 @@ public class FigTreeApplication extends
}
}
-}
\ No newline at end of file
+}
---- figtree-1.3.1.orig/src/figtree/treeviewer/TreeViewerController.java
-+++ figtree-1.3.1/src/figtree/treeviewer/TreeViewerController.java
-@@ -85,13 +85,10 @@
+--- a/src/figtree/treeviewer/TreeViewerController.java
++++ b/src/figtree/treeviewer/TreeViewerController.java
+@@ -86,13 +86,10 @@ public class TreeViewerController extend
rectangularTreeToggle.setFocusable(false);
polarTreeToggle.setFocusable(false);
radialTreeToggle.setFocusable(false);
@@ -83,9 +75,9 @@
radialTreeToggle.putClientProperty("JButton.buttonType", "segmentedTextured");
radialTreeToggle.putClientProperty("JButton.segmentPosition", "last");
ButtonGroup buttonGroup = new ButtonGroup();
---- figtree-1.3.1.orig/src/figtree/application/FigTreeFrame.java
-+++ figtree-1.3.1/src/figtree/application/FigTreeFrame.java
-@@ -183,7 +183,6 @@
+--- a/src/figtree/application/FigTreeFrame.java
++++ b/src/figtree/application/FigTreeFrame.java
+@@ -205,7 +205,6 @@ public class FigTreeFrame extends Docume
// treeViewer.showStatistics();
// }
// });
@@ -93,7 +85,7 @@
// toolBar.addComponent(settingsToolButton);
// settingsToolButton.setEnabled(false);
-@@ -194,19 +193,16 @@
+@@ -216,19 +215,16 @@ public class FigTreeFrame extends Docume
toggle1.setFocusable(false);
toggle1.putClientProperty("JButton.buttonType", "segmentedTextured");
toggle1.putClientProperty("JButton.segmentPosition", "first");
@@ -113,7 +105,7 @@
ButtonGroup buttonGroup = new ButtonGroup();
buttonGroup.add(toggle1);
-@@ -252,7 +248,6 @@
+@@ -282,7 +278,6 @@ public class FigTreeFrame extends Docume
prevTreeToolButton.setFocusable(false);
prevTreeToolButton.putClientProperty("JButton.buttonType", "segmentedTextured");
prevTreeToolButton.putClientProperty("JButton.segmentPosition", "first");
@@ -121,7 +113,7 @@
final ToolbarAction nextTreeToolbarAction =
new ToolbarAction(null, "Next Tree...", nextIcon) {
-@@ -264,7 +259,6 @@
+@@ -302,7 +297,6 @@ public class FigTreeFrame extends Docume
nextTreeToolButton.setFocusable(false);
nextTreeToolButton.putClientProperty("JButton.buttonType", "segmentedTextured");
nextTreeToolButton.putClientProperty("JButton.segmentPosition", "last");
@@ -129,16 +121,16 @@
nextTreeToolbarAction.setEnabled(treeViewer.getCurrentTreeIndex() < treeViewer.getTreeCount() - 1);
prevTreeToolbarAction.setEnabled(treeViewer.getCurrentTreeIndex() > 0);
-@@ -1597,4 +1591,4 @@
+@@ -1635,4 +1629,4 @@ public class FigTreeFrame extends Docume
private AnnotationDialog annotationDialog = null;
private AnnotationDialog copyAnnotationDialog = null;
private SelectAnnotationDialog selectAnnotationDialog = null;
-}
\ No newline at end of file
+}
---- figtree-1.3.1.orig/src/figtree/treeviewer/ControllerOptionsPanel.java
-+++ figtree-1.3.1/src/figtree/treeviewer/ControllerOptionsPanel.java
-@@ -24,7 +24,6 @@
+--- a/src/figtree/treeviewer/ControllerOptionsPanel.java
++++ b/src/figtree/treeviewer/ControllerOptionsPanel.java
+@@ -25,7 +25,6 @@ public class ControllerOptionsPanel exte
}
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 2012-12-17 10:24:27 UTC (rev 12640)
+++ trunk/packages/figtree/trunk/debian/patches/java7-compat.patch 2012-12-17 12:35:49 UTC (rev 12641)
@@ -3,9 +3,9 @@
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 @@
+--- a/src/figtree/treeviewer/TreePane.java
++++ b/src/figtree/treeviewer/TreePane.java
+@@ -7,6 +7,7 @@ import jebl.evolution.trees.*;
import figtree.treeviewer.decorators.*;
import figtree.treeviewer.painters.*;
import figtree.treeviewer.treelayouts.*;
@@ -13,7 +13,7 @@
import javax.swing.*;
import java.awt.*;
-@@ -1964,4 +1965,4 @@
+@@ -2084,4 +2085,4 @@ public class TreePane extends JComponent
private Map<Node, Shape> calloutPaths = new HashMap<Node, Shape>();
Modified: trunk/packages/figtree/trunk/debian/patches/remove_webui.patch
===================================================================
--- trunk/packages/figtree/trunk/debian/patches/remove_webui.patch 2012-12-17 10:24:27 UTC (rev 12640)
+++ trunk/packages/figtree/trunk/debian/patches/remove_webui.patch 2012-12-17 12:35:49 UTC (rev 12641)
@@ -6,7 +6,7 @@
is one further step in the direction to remove binary only code
from the tarball
---- figtree-1.3.1.orig/src/figtree/webui/FigTreeWebApplication.java
+--- a/src/figtree/webui/FigTreeWebApplication.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package figtree.webui;
@@ -307,7 +307,7 @@
- return true;
- }
-}
---- figtree-1.3.1.orig/src/figtree/webui/FileUploadWidget.java
+--- a/src/figtree/webui/FileUploadWidget.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package figtree.webui;
@@ -366,7 +366,7 @@
- return fileUploaded;
- }
-}
---- figtree-1.3.1.orig/src/figtree/webui/Main.java
+--- a/src/figtree/webui/Main.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package figtree.webui;
@@ -387,7 +387,7 @@
- }
-
-}
---- figtree-1.3.1.orig/src/figtree/webui/TreeWidget.java
+--- a/src/figtree/webui/TreeWidget.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package figtree.webui;
More information about the debian-med-commit
mailing list