[med-svn] [Git][med-team/beast2-mcmc][master] 4 commits: Fix BEAUti startup by registering BEAST.app services (Closes: #1025830)
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sun Nov 1 18:54:24 GMT 2026
Andreas Tille pushed to branch master at Debian Med / beast2-mcmc
Commits:
4b0fae18 by Andreas Tille at 2026-11-01T18:57:24+01:00
Fix BEAUti startup by registering BEAST.app services (Closes: #1025830)
BEAUti hung forever on its "Initialising BEAUti . . ." splash screen
because the package only installed BEAST.base's version.xml. BEAST.app
ships its own version.xml listing the services it provides, including
beastfx.app.inputeditor.InputEditor. Without it
PackageManager.listServices("beastfx.app.inputeditor.InputEditor")
returned null, InputEditorFactory.init() threw a NullPointerException
and the JavaFX start-up Task ended up FAILED, but Beauti only listens
for SUCCEEDED, so the splash screen stayed up.
Install beastfx/version.xml as beast.app.version.xml and make the
Debian-specific lookup in BEASTClassLoader also register that file from
/usr/share/beast2-mcmc.
- - - - -
db9ddf21 by Andreas Tille at 2026-11-01T18:58:13+01:00
Changes made by cme
- - - - -
0e03e3a1 by Andreas Tille at 2026-11-01T18:58:26+01:00
debputy lint --auto-fix (routine-update)
- - - - -
336675c3 by Andreas Tille at 2026-11-01T19:21:05+01:00
routine-update: Ready to upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/patches/location_of_shipped_version_xml.patch
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+beast2-mcmc (2.7.8+dfsg-2) unstable; urgency=medium
+
+ * Install the BEAST.app version.xml as beast.app.version.xml and register
+ its services at start-up
+ Closes: #1025830
+ * Reflow Uploaders field (cme)
+ * debputy lint --auto-fix (routine-update)
+
+ -- Andreas Tille <tille at debian.org> Sun, 01 Nov 2026 18:58:28 +0100
+
beast2-mcmc (2.7.8+dfsg-1) unstable; urgency=medium
* New upstream version 2.7.8+dfsg
=====================================
debian/control
=====================================
@@ -1,34 +1,37 @@
Source: beast2-mcmc
+Standards-Version: 4.7.4
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>,
- Olivier Sallou <osallou at debian.org>,
- Pierre Gruet <pgt at debian.org>
+Uploaders:
+ Andreas Tille <tille at debian.org>,
+ Olivier Sallou <osallou at debian.org>,
+ Pierre Gruet <pgt at debian.org>,
Section: science
-Build-Depends: debhelper-compat (= 14),
- javahelper,
- ant,
- ant-optional,
- antlr4,
- default-jdk,
- libjam-java,
- libhmsbeagle-java,
- libcolt-free-java,
- libcommons-math3-java,
- libfest-util-java,
- libantlr4-runtime-java,
- libassertj-core-java,
- libopenjfx-java,
- junit5
-Standards-Version: 4.7.4
+Build-Depends:
+ debhelper-compat (= 14),
+ ant,
+ ant-optional,
+ antlr4,
+ default-jdk,
+ javahelper,
+ junit5,
+ libantlr4-runtime-java,
+ libassertj-core-java,
+ libcolt-free-java,
+ libcommons-math3-java,
+ libfest-util-java,
+ libhmsbeagle-java,
+ libjam-java,
+ libopenjfx-java,
Vcs-Browser: https://salsa.debian.org/med-team/beast2-mcmc
Vcs-Git: https://salsa.debian.org/med-team/beast2-mcmc.git
Homepage: https://www.beast2.org
Package: beast2-mcmc
Architecture: all
-Depends: ${java:Depends},
- default-jre,
- openjfx
+Depends:
+ default-jre,
+ openjfx,
+ ${java:Depends},
Description: Bayesian MCMC phylogenetic inference
BEAST is a cross-platform program for Bayesian MCMC analysis of molecular
sequences. It is entirely orientated towards rooted, time-measured
@@ -45,9 +48,10 @@ Description: Bayesian MCMC phylogenetic inference
Package: beast2-mcmc-examples
Architecture: all
-Section: doc
-Enhances: beast2-mcmc
Multi-Arch: foreign
+Section: doc
+Enhances:
+ beast2-mcmc,
Description: Bayesian MCMC phylogenetic inference - example data
BEAST is a cross-platform program for Bayesian MCMC analysis of molecular
sequences. It is entirely orientated towards rooted, time-measured
=====================================
debian/patches/location_of_shipped_version_xml.patch
=====================================
@@ -1,17 +1,22 @@
Description: putting the place where we will install the version.xml file on a
- Debian system.
+ Debian system, as well as the BEAST.app one, so all service providers of both
+ BEAST.base and BEAST.app are registered at start-up.
Author: Pierre Gruet <pgt at debian.org>
Forwarded: not-needed
-Last-Update: 2022-11-13
+Last-Update: 2026-10-31
+Assisted-By: DeepSeek V4.1 Flash Free
--- a/src/beast/pkgmgmt/BEASTClassLoader.java
+++ b/src/beast/pkgmgmt/BEASTClassLoader.java
-@@ -197,6 +197,9 @@
+@@ -197,6 +197,12 @@
if (new File("../version.xml").exists()) {
addServices("../version.xml");
}
+ if (new File("/usr/share/beast2-mcmc/version.xml").exists()) {
+ addServices("/usr/share/beast2-mcmc/version.xml");
++ }
++ if (new File("/usr/share/beast2-mcmc/beast.app.version.xml").exists()) {
++ addServices("/usr/share/beast2-mcmc/beast.app.version.xml");
+ }
String parentDir = jarFile.isDirectory() ?
(jarFile.getParentFile() == null ? File.pathSeparator :jarFile.getParentFile().getPath()) :
=====================================
debian/rules
=====================================
@@ -58,6 +58,15 @@ execute_before_dh_auto_configure:
override_dh_auto_build:
ant -Duser.name debian -f beastfx/build.xml dist_all_BEAST dist_all_BeastFX
+override_dh_install:
+ dh_install
+ # BEAST.app has its own version.xml, which lists the services provided by
+ # BEAST.app (such as the BEAUti input editors). It must be installed
+ # separately from BEAST.base's version.xml so that the launcher can
+ # register both sets of services at start-up.
+ install -D -m644 beastfx/version.xml \
+ debian/beast2-mcmc/usr/share/beast2-mcmc/beast.app.version.xml
+
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
ant -Duser.name debian -f beastfx/build.xml junit
=====================================
debian/watch
=====================================
@@ -3,14 +3,14 @@ Version: 5
Template: Github
Compression: xz
Dist: https://github.com/CompEvol/beast2
-Dversionmangle: auto
+Dversion-Mangle: auto
Repack: yes
-Repacksuffix: +dfsg
-Uversionmangle: s/(\d)[_\.\-\+]?((RC|rc|pre)\d*)$/$1~$2/
+Repack-Suffix: +dfsg
+Uversion-Mangle: s/(\d)[_\.\-\+]?((RC|rc|pre)\d*)$/$1~$2/
Component: beastfx
Source: https://github.com/CompEvol/BeastFX.git
Matching-Pattern: HEAD
Mode: git
-Pgpmode: none
+Pgp-Mode: none
Version-Schema: ignore
View it on GitLab: https://salsa.debian.org/med-team/beast2-mcmc/-/compare/32f1516fa24f6c56ae37a6308c452b68386e9f3d...336675c35037c967cce53dde1fc3dfc7098bf210
--
View it on GitLab: https://salsa.debian.org/med-team/beast2-mcmc/-/compare/32f1516fa24f6c56ae37a6308c452b68386e9f3d...336675c35037c967cce53dde1fc3dfc7098bf210
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261101/c6186d52/attachment-0001.htm>
More information about the debian-med-commit
mailing list