Control: tags 843464 + patch Control: tags 843464 + pending Dear maintainer,
I've prepared an NMU for jmol (versioned as 12.2.32+dfsg2-1.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer or cancel it. The upload contains a patch to address the FTBFS introduced by the upload of libnaga-java 3.0 to Debian. I have tested locally that jmol starts correctly, but am not a jmol user and so cannot speak to all of the functionality. (However, the patch is a simple interface change, so I am reasonably confident that it does not introduce regressions.) Regards, tony
diff -Nru jmol-12.2.32+dfsg2/debian/changelog jmol-12.2.32+dfsg2/debian/changelog
--- jmol-12.2.32+dfsg2/debian/changelog 2012-11-12 05:14:02.000000000 -0800
+++ jmol-12.2.32+dfsg2/debian/changelog 2016-12-04 11:17:26.000000000 -0800
@@ -1,3 +1,10 @@
+jmol (12.2.32+dfsg2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Patch for FTBFS against libnaga-java (>= 3.0). (Closes: #843464)
+
+ -- tony mancill <tmanc...@debian.org> Sun, 04 Dec 2016 11:17:26 -0800
+
jmol (12.2.32+dfsg2-1) unstable; urgency=low
* New repackaged upstream tarball, removing the src/com/json directory due
diff -Nru jmol-12.2.32+dfsg2/debian/control jmol-12.2.32+dfsg2/debian/control
--- jmol-12.2.32+dfsg2/debian/control 2012-11-11 04:51:12.000000000 -0800
+++ jmol-12.2.32+dfsg2/debian/control 2016-12-04 10:08:56.000000000 -0800
@@ -15,7 +15,7 @@
libcommons-cli-java,
libitext1-java,
libjaxp1.3-java,
- libnaga-java,
+ libnaga-java (>= 3.0~),
libsaxon-java,
libvecmath-java,
xsltproc
diff -Nru jmol-12.2.32+dfsg2/debian/patches/libnaga-java-3.0.patch jmol-12.2.32+dfsg2/debian/patches/libnaga-java-3.0.patch
--- jmol-12.2.32+dfsg2/debian/patches/libnaga-java-3.0.patch 1969-12-31 16:00:00.000000000 -0800
+++ jmol-12.2.32+dfsg2/debian/patches/libnaga-java-3.0.patch 2016-12-04 11:14:21.000000000 -0800
@@ -0,0 +1,67 @@
+Description: patch to build against libnaga-java (>= 3.0)
+Author: tony mancill <tmanc...@debian.org>
+
+--- a/src/org/openscience/jmol/app/jmolpanel/JsonNioService.java
++++ b/src/org/openscience/jmol/app/jmolpanel/JsonNioService.java
+@@ -240,7 +240,7 @@
+
+ inSocket = openSocket("127.0.0.1", port);
+ inSocket.setPacketReader(new AsciiLinePacketReader());
+- inSocket.setPacketWriter(new RawPacketWriter());
++ inSocket.setPacketWriter(RawPacketWriter.INSTANCE);
+ inSocket.listen(new SocketObserver() {
+
+ public void connectionOpened(NIOSocket nioSocket) {
+@@ -255,6 +255,11 @@
+ halt = true;
+ Logger.info(Thread.currentThread().getName() + " inSocket connectionBroken");
+ }
++
++ public void packetSent(NIOSocket nioSocket, Object tag) {
++ // callback on the NIO thread when a packet has finished writing added in naga 3.0
++ }
++
+ });
+
+ // outSocket is used to send JSON commands to the NIO server
+@@ -262,7 +267,7 @@
+
+ outSocket = openSocket("127.0.0.1", port);
+ outSocket.setPacketReader(new AsciiLinePacketReader());
+- outSocket.setPacketWriter(new RawPacketWriter());
++ outSocket.setPacketWriter(RawPacketWriter.INSTANCE);
+ outSocket.listen(new SocketObserver() {
+
+ public void connectionOpened(NIOSocket nioSocket) {
+@@ -278,6 +283,11 @@
+ halt = true;
+ Logger.info(Thread.currentThread().getName() + " outSocket connectionBroken");
+ }
++
++ public void packetSent(NIOSocket nioSocket, Object tag) {
++ // callback on the NIO thread when a packet has finished writing added in naga 3.0
++ }
++
+ });
+
+ thread = new Thread(new JsonNioThread(), "JsonNiosThread" + myName);
+@@ -347,7 +357,7 @@
+ + " Received connection: " + nioSocket);
+
+ nioSocket.setPacketReader(new AsciiLinePacketReader());
+- nioSocket.setPacketWriter(new RawPacketWriter());
++ nioSocket.setPacketWriter(RawPacketWriter.INSTANCE);
+ nioSocket.listen(new SocketObserverAdapter() {
+
+ @Override
+--- a/build.xml
++++ b/build.xml
+@@ -43,7 +43,7 @@
+ <property name="docbook-xsl" value="docbook-xsl-1.75.2" />
+ <property name="docbook-xml" value="docbook-xml-4.4" />
+ <property name="vecmath.jar" value="vecmath1.2-1.14.jar" />
+- <property name="naga.jar" value="naga-2_1-r42.jar" />
++ <property name="naga.jar" value="naga-3_0.jar" />
+ <property name="itext.jar" value="itext-1.4.5.jar" />
+ <property name="commons-cli.jar" value="commons-cli-1.0.jar" />
+
diff -Nru jmol-12.2.32+dfsg2/debian/patches/series jmol-12.2.32+dfsg2/debian/patches/series
--- jmol-12.2.32+dfsg2/debian/patches/series 2012-11-11 06:24:12.000000000 -0800
+++ jmol-12.2.32+dfsg2/debian/patches/series 2016-12-04 10:13:02.000000000 -0800
@@ -4,3 +4,4 @@
right_cgi_diretory.patch
cgi_fix_shebang.patch
remove_json.patch
+libnaga-java-3.0.patch
signature.asc
Description: PGP signature
