[med-svn] [Git][med-team/beast2-mcmc][master] 4 commits: Avoid Mac only code

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / beast2-mcmc


Commits:
3e3ecf58 by Andreas Tille at 2019-01-26T07:10:09Z
Avoid Mac only code

- - - - -
cea8c31d by Andreas Tille at 2019-01-26T07:10:25Z
debhelper 12

- - - - -
e8141b47 by Andreas Tille at 2019-01-26T07:10:27Z
Standards-Version: 4.3.0

- - - - -
e176bb79 by Andreas Tille at 2019-01-26T07:14:20Z
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/remove_mac_only_code.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+beast2-mcmc (2.5.1+dfsg-2) unstable; urgency=medium
+
+  * Avoid Mac only code which is not needed and fails due missing
+    support in latest libjam-java
+    Closes: #919728
+  * debhelper 12
+  * Standards-Version: 4.3.0
+
+ -- Andreas Tille <tille at debian.org>  Sat, 26 Jan 2019 08:10:27 +0100
+
 beast2-mcmc (2.5.1+dfsg-1) unstable; urgency=medium
 
   [ Steffen Moeller ]


=====================================
debian/compat
=====================================
@@ -1 +1 @@
-11
+12


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>,
            Olivier Sallou <osallou at debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper (>= 12~),
                javahelper,
                ant,
                ant-optional,
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 11~),
                junit4,
                texlive-latex-base,
                texlive-latex-extra
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/beast2-mcmc
 Vcs-Git: https://salsa.debian.org/med-team/beast2-mcmc.git
 Homepage: http://www.beast2.org


=====================================
debian/patches/remove_mac_only_code.patch
=====================================
@@ -0,0 +1,35 @@
+Description: Avoid Mac only code which is not needed and fails due missing
+    support in latest libjam-java
+Bug-Debian: https://bugs.debian.org/919728
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sat, 26 Jan 2019 08:08:17 +0100
+
+--- a/src/beast/app/beauti/Beauti.java
++++ b/src/beast/app/beauti/Beauti.java
+@@ -1231,6 +1231,7 @@ public class Beauti extends JTabbedPane
+             if (Utils.isMac() && Utils6.isMajorAtLeast(Utils6.JAVA_1_8)) {
+                 // set up application about-menu for Mac
+                 // Mac-only stuff
++/*
+                 try {
+                     URL url = ClassLoader.getSystemResource(ModelBuilder.ICONPATH + "beauti.png");
+                     Icon icon = null;
+@@ -1268,10 +1269,7 @@ public class Beauti extends JTabbedPane
+                     };
+ 
+                     // https://github.com/CompEvol/beast2/issues/805
+-                    if (Utils6.isMajorAtLeast(Utils6.JAVA_9)) // >= Java 9
+                         beast.app.util.Utils.macOSXRegistration(application);
+-                    else // <= Java 8
+-                        jam.mac.Utils.macOSXRegistration(application);
+                 } catch (Exception e) {
+                     // ignore
+                 }
+@@ -1284,6 +1282,7 @@ public class Beauti extends JTabbedPane
+                         // ignore
+                     }
+                 }
++ */
+             }
+             beauti.setUpPanels();
+ 


=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@ remove_appbundler.patch
 # reverted_to_antlr_4.5_deacdc96.patch
 # revert_NewickLexer.java_to_antlr_4.5.patch
 antlr-compatibility.patch
+remove_mac_only_code.patch



View it on GitLab: https://salsa.debian.org/med-team/beast2-mcmc/compare/9a136acf643f3e41141455b6cc667ecd3c89c1b2...e176bb7923036a05faf97a010834b83f474fbb6a

-- 
View it on GitLab: https://salsa.debian.org/med-team/beast2-mcmc/compare/9a136acf643f3e41141455b6cc667ecd3c89c1b2...e176bb7923036a05faf97a010834b83f474fbb6a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190126/945e8f3d/attachment-0001.html>