[Git][java-team/jalview][master] 2 commits: Correcting the BS package in dependency jmol, adding versioned dependency

[Pierre Gruet (@pgt)]

Pierre Gruet pushed to branch master at Debian Java Maintainers / jalview


Commits:
456764ec by Pierre Gruet at 2021-10-12T09:28:52+02:00
Correcting the BS package in dependency jmol, adding versioned dependency

- - - - -
6bb75c2f by Pierre Gruet at 2021-10-12T10:25:29+02:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/control
- + debian/patches/BS_package.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+jalview (2.11.1.4+dfsg-2) unstable; urgency=medium
+
+  * Correcting the BS package in dependency jmol, adding versioned dependency
+
+ -- Pierre Gruet <pgt at debian.org>  Tue, 12 Oct 2021 09:29:07 +0200
+
 jalview (2.11.1.4+dfsg-1) unstable; urgency=medium
 
   * New upstream version 2.11.1.4+dfsg


=====================================
debian/control
=====================================
@@ -24,7 +24,7 @@ Build-Depends: debhelper-compat (= 13),
                libjersey1-core-java,
                libjetty9-java,
                libjfreesvg-java,
-               libjmol-java (>= 12.1.42),
+               libjmol-java (>= 14.30.2+dfsg-1~),
                libjson-simple-java,
                libjsoup-java,
                libjswingreader-java,


=====================================
debian/patches/BS_package.patch
=====================================
@@ -0,0 +1,38 @@
+Description: The package of class BS has changed in jmol 14.30.2
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: jalview-dev at jalview.org
+Last-Update: 2021-10-08
+
+--- a/src/jalview/appletgui/AppletJmolBinding.java
++++ b/src/jalview/appletgui/AppletJmolBinding.java
+@@ -32,7 +32,7 @@
+ 
+ import org.jmol.api.JmolAppConsoleInterface;
+ import org.jmol.console.AppletConsole;
+-import org.jmol.java.BS;
++import javajs.util.BS;
+ 
+ class AppletJmolBinding extends JalviewJmolBinding
+ {
+--- a/src/jalview/appletgui/ExtJmol.java
++++ b/src/jalview/appletgui/ExtJmol.java
+@@ -35,7 +35,7 @@
+ import java.util.Vector;
+ 
+ import org.jmol.api.JmolAppConsoleInterface;
+-import org.jmol.java.BS;
++import javajs.util.BS;
+ import org.jmol.viewer.Viewer;
+ 
+ /**
+--- a/src/jalview/gui/AppJmolBinding.java
++++ b/src/jalview/gui/AppJmolBinding.java
+@@ -33,7 +33,7 @@
+ import java.util.Map;
+ 
+ import org.jmol.api.JmolAppConsoleInterface;
+-import org.jmol.java.BS;
++import javajs.util.BS;
+ import org.openscience.jmol.app.jmolpanel.console.AppConsole;
+ 
+ public class AppJmolBinding extends JalviewJmolBinding


=====================================
debian/patches/series
=====================================
@@ -10,3 +10,4 @@ deactivate_google_analytics.patch
 build_gradle.patch
 selecting_tests_in_build_gradle.patch
 write_build_properties.patch
+BS_package.patch



View it on GitLab: https://salsa.debian.org/java-team/jalview/-/compare/fd006b9feaf269baf051db191ccd1ef7a51b235b...6bb75c2f8519b315762e72a4d6b163049c225603

-- 
View it on GitLab: https://salsa.debian.org/java-team/jalview/-/compare/fd006b9feaf269baf051db191ccd1ef7a51b235b...6bb75c2f8519b315762e72a4d6b163049c225603
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/pkg-java-commits/attachments/20211012/6b1d3722/attachment.htm>