[med-svn] [figtree] 08/08: Upload to unstable after refreshinig patches, version also closes #785374
Andreas Tille
tille at debian.org
Tue Dec 1 10:56:01 UTC 2015
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository figtree.
commit 43ba7670e09a3d57b55b08623474ee6545f95f6a
Author: Andreas Tille <tille at debian.org>
Date: Tue Dec 1 11:25:43 2015 +0100
Upload to unstable after refreshinig patches, version also closes #785374
---
debian/changelog | 6 ++++--
debian/patches/build_figtree_gui_only.patch | 2 +-
debian/patches/fix_jebl.patch | 2 +-
debian/patches/ignore_quaqua.patch | 20 ++++++++++----------
debian/patches/java7-compat.patch | 4 ++--
5 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a9e41a6..1c7dda0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,14 @@
-figtree (1.4.2+dfsg-1) UNRELEASED; urgency=medium
+figtree (1.4.2+dfsg-1) unstable; urgency=medium
* Moved to Git
* cme fix dpkg-control (removed versioned javahelper dependency)
* debian/watch now points to Github
* Fix source location in debian/copyright
* Use Files-Excluded to strip down tarball and add +dfsg suffix
+ * Verified that version 1.4.2 does not output garbage
+ Closes: #785374
- -- Andreas Tille <tille at debian.org> Tue, 01 Dec 2015 09:25:51 +0100
+ -- Andreas Tille <tille at debian.org> Tue, 01 Dec 2015 11:25:37 +0100
figtree (1.4.2-1) unstable; urgency=medium
diff --git a/debian/patches/build_figtree_gui_only.patch b/debian/patches/build_figtree_gui_only.patch
index d5a34ec..4de3e1a 100644
--- a/debian/patches/build_figtree_gui_only.patch
+++ b/debian/patches/build_figtree_gui_only.patch
@@ -38,4 +38,4 @@ Description: Do not build targets figtree-pdf.jar and figtree.war
-
</target>
- <property name="version" value="1.4.3" />
+ <property name="version" value="1.4.2" />
diff --git a/debian/patches/fix_jebl.patch b/debian/patches/fix_jebl.patch
index 58e948e..8b133a1 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 @@
+@@ -930,7 +930,7 @@ public class FigTreeFrame extends Docume
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 9e4becb..3f9a214 100644
--- a/debian/patches/ignore_quaqua.patch
+++ b/debian/patches/ignore_quaqua.patch
@@ -8,7 +8,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
--- a/src/figtree/application/FigTreeApplication.java
+++ b/src/figtree/application/FigTreeApplication.java
-@@ -51,7 +51,6 @@
+@@ -51,7 +51,6 @@ import jebl.evolution.trees.Tree;
import javax.imageio.ImageIO;
import javax.swing.*;
@@ -16,7 +16,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
/**
* Application class for FigTree including main() method for invoking it.
-@@ -336,40 +335,6 @@
+@@ -336,40 +335,6 @@ public class FigTreeApplication extends
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 @@
+@@ -465,4 +430,4 @@ public class FigTreeApplication extends
}
}
@@ -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 @@
+@@ -112,13 +112,10 @@ public class TreeViewerController extend
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 @@
+@@ -224,7 +224,6 @@ public class FigTreeFrame extends Docume
// treeViewer.showStatistics();
// }
// });
@@ -90,7 +90,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
// toolBar.addComponent(settingsToolButton);
// settingsToolButton.setEnabled(false);
-@@ -235,19 +234,16 @@
+@@ -235,19 +234,16 @@ public class FigTreeFrame extends Docume
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 @@
+@@ -301,7 +297,6 @@ public class FigTreeFrame extends Docume
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 @@
+@@ -321,7 +316,6 @@ public class FigTreeFrame extends Docume
nextTreeToolButton.setFocusable(false);
nextTreeToolButton.putClientProperty("JButton.buttonType", "segmentedTextured");
nextTreeToolButton.putClientProperty("JButton.segmentPosition", "last");
@@ -126,7 +126,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
nextTreeToolbarAction.setEnabled(treeViewer.getCurrentTreeIndex() < treeViewer.getTreeCount() - 1);
prevTreeToolbarAction.setEnabled(treeViewer.getCurrentTreeIndex() > 0);
-@@ -1852,4 +1846,4 @@
+@@ -1852,4 +1846,4 @@ public class FigTreeFrame extends Docume
private AnnotationDialog annotationDialog = null;
private AnnotationDialog copyAnnotationDialog = null;
private SelectAnnotationDialog selectAnnotationDialog = null;
@@ -135,7 +135,7 @@ Description: Quaqua (http://www.randelshofer.ch/quaqua/)
+}
--- a/src/figtree/treeviewer/ControllerOptionsPanel.java
+++ b/src/figtree/treeviewer/ControllerOptionsPanel.java
-@@ -51,7 +51,6 @@
+@@ -51,7 +51,6 @@ public class ControllerOptionsPanel exte
}
public static void setComponentLook(JComponent comp) {
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
index 05f79cf..6839ab3 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 @@
+@@ -28,6 +28,7 @@ import jebl.evolution.trees.*;
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.*;
-@@ -2349,4 +2350,4 @@
+@@ -2341,4 +2342,4 @@ public class TreePane extends JComponent
private Map<Node, Shape> calloutPaths = new HashMap<Node, Shape>();
--
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