[med-svn] [jmodeltest] 01/02: Import patch from Ole Streicher

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository jmodeltest.

commit 00cdb0cc190d315f58002bd98ef35b721629d98f
Author: Andreas Tille <tille at debian.org>
Date:   Fri Mar 31 08:24:17 2017 +0200

    Import patch from Ole Streicher
---
 debian/changelog                                   |  7 +++
 .../patches/remove_BrowserLauncher_reference.patch | 53 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 61 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3915e44..a803a82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jmodeltest (2.1.10+dfsg-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Remove BrowserLauncher dependency. Closes: #859107
+
+ -- Ole Streicher <olebole at debian.org>  Thu, 30 Mar 2017 16:33:57 +0200
+
 jmodeltest (2.1.10+dfsg-3) unstable; urgency=medium
 
   * Add missing command line arguments to wrapper
diff --git a/debian/patches/remove_BrowserLauncher_reference.patch b/debian/patches/remove_BrowserLauncher_reference.patch
new file mode 100644
index 0000000..285f15d
--- /dev/null
+++ b/debian/patches/remove_BrowserLauncher_reference.patch
@@ -0,0 +1,53 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Remove BrowserLauncher references.
+
+They were just a fallback if java.awt.Desktop.getDesktop() is not available.
+
+--- a/src/main/java/es/uvigo/darwin/jmodeltest/gui/FrameMain.java
++++ b/src/main/java/es/uvigo/darwin/jmodeltest/gui/FrameMain.java
+@@ -56,7 +56,6 @@
+ import javax.swing.text.DefaultCaret;
+ 
+ import pal.tree.Tree;
+-import edu.stanford.ejalbert.BrowserLauncher;
+ import es.uvigo.darwin.jmodeltest.ModelTest;
+ import es.uvigo.darwin.jmodeltest.ModelTestConfiguration;
+ import es.uvigo.darwin.jmodeltest.ModelTestService;
+@@ -1096,9 +1095,6 @@
+ 				Desktop desktop = Desktop.getDesktop();
+ 				URI wikiURI = new URI(ModelTest.WIKI);
+ 				desktop.browse(wikiURI);
+-			} else {
+-				BrowserLauncher launcher = new BrowserLauncher();
+-				launcher.openURLinBrowser(ModelTest.WIKI);
+ 			}
+ 		} catch (Exception f) {
+ 			JOptionPane.showMessageDialog(new JFrame(), f.getMessage(),
+@@ -1113,9 +1109,6 @@
+ 				Desktop desktop = Desktop.getDesktop();
+ 				URI groupURI = new URI(ModelTest.DISCUSSION_GROUP);
+ 				desktop.browse(groupURI);
+-			} else {
+-				BrowserLauncher launcher = new BrowserLauncher();
+-				launcher.openURLinBrowser(ModelTest.DISCUSSION_GROUP);
+ 			}
+ 		} catch (Exception f) {
+ 			JOptionPane.showMessageDialog(new JFrame(), f.getMessage(),
+@@ -1129,9 +1122,6 @@
+ 				Desktop desktop = Desktop.getDesktop();
+ 				URI jModelTestURI = new URI(ModelTest.URL);
+ 				desktop.browse(jModelTestURI);
+-			} else {
+-				BrowserLauncher launcher = new BrowserLauncher();
+-				launcher.openURLinBrowser(ModelTest.URL);
+ 			}
+ 		} catch (Exception f) {
+ 			JOptionPane.showMessageDialog(new JFrame(), f.getMessage(),
+@@ -1145,7 +1135,6 @@
+ 			credits += "Alignment conversion with ALTER by Daniel Glez-Pena et al.\n";
+ 			credits += "Phylogenetic trees management with PAL: Phylogenetic Analysis Library by A. Drummond and K. Strimmer\n";
+ 			credits += "Table utilities by Philip Milne\n";
+-			credits += "BrowserLauncher by Eric Albert and Jeff Chapman\n";
+ 
+ 			JOptionPane.showMessageDialog(new JFrame(), credits,
+ 					"jModelTest - CREDITS", JOptionPane.INFORMATION_MESSAGE,
diff --git a/debian/patches/series b/debian/patches/series
index 7d427fb..b7a87f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ use_debian_packaged_jars.patch
 do_not_chmod_anything_in_usr_bin.patch
 adapt_config.patch
 replace_natbib_bst_by_plainnat.patch
+remove_BrowserLauncher_reference.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jmodeltest.git