Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package jmodeltest
Applied the patch from Ole Streicher to fix #859107
unblock jmodeltest/2.1.10+dfsg-4
-- System Information:
Debian Release: 8.7
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru jmodeltest-2.1.10+dfsg/debian/changelog jmodeltest-2.1.10+dfsg/debian/changelog
--- jmodeltest-2.1.10+dfsg/debian/changelog 2016-08-17 15:43:53.000000000 +0200
+++ jmodeltest-2.1.10+dfsg/debian/changelog 2017-03-31 08:24:53.000000000 +0200
@@ -1,3 +1,10 @@
+jmodeltest (2.1.10+dfsg-4) unstable; urgency=medium
+
+ [ Ole Streicher ]
+ * Remove BrowserLauncher dependency. Closes: #859107
+
+ -- Andreas Tille <ti...@debian.org> Fri, 31 Mar 2017 08:24:53 +0200
+
jmodeltest (2.1.10+dfsg-3) unstable; urgency=medium
* Add missing command line arguments to wrapper
diff -Nru jmodeltest-2.1.10+dfsg/debian/patches/remove_BrowserLauncher_reference.patch jmodeltest-2.1.10+dfsg/debian/patches/remove_BrowserLauncher_reference.patch
--- jmodeltest-2.1.10+dfsg/debian/patches/remove_BrowserLauncher_reference.patch 1970-01-01 01:00:00.000000000 +0100
+++ jmodeltest-2.1.10+dfsg/debian/patches/remove_BrowserLauncher_reference.patch 2017-03-31 08:24:53.000000000 +0200
@@ -0,0 +1,53 @@
+Author: Ole Streicher <oleb...@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 -Nru jmodeltest-2.1.10+dfsg/debian/patches/series jmodeltest-2.1.10+dfsg/debian/patches/series
--- jmodeltest-2.1.10+dfsg/debian/patches/series 2016-08-17 15:43:53.000000000 +0200
+++ jmodeltest-2.1.10+dfsg/debian/patches/series 2017-03-31 08:24:53.000000000 +0200
@@ -2,3 +2,4 @@
do_not_chmod_anything_in_usr_bin.patch
adapt_config.patch
replace_natbib_bst_by_plainnat.patch
+remove_BrowserLauncher_reference.patch
