[Git][java-team/openhft-chronicle-threads][master] 5 commits: Add patch for FTBFS #917738

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / openhft-chronicle-threads


Commits:
207cfdc6 by tony mancill at 2019-03-10T22:56:26Z
Add patch for FTBFS #917738

- - - - -
788da922 by tony mancill at 2019-03-10T22:56:26Z
Bump Standards-Version to 4.3.0

- - - - -
d9dea2f4 by tony mancill at 2019-03-10T22:56:26Z
Update Vcs- URLs to point to Salsa

- - - - -
1448b803 by tony mancill at 2019-03-10T22:56:26Z
Use debhelper 12

- - - - -
4bb00a5c by tony mancill at 2019-03-10T22:56:26Z
prepare changelog for upload

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/remove-WebServiceException.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+openhft-chronicle-threads (1.1.6-2) unstable; urgency=medium
+
+  * Team upload
+  * Add patch for FTBFS (Closes: #917738)
+    Thank you to Joe Lee for providing the patch.
+  * Bump Standards-Version to 4.3.0
+  * Update Vcs- URLs to point to Salsa
+  * Use debhelper 12
+
+ -- tony mancill <tmancill at debian.org>  Sun, 10 Mar 2019 15:51:46 -0700
+
 openhft-chronicle-threads (1.1.6-1) unstable; urgency=medium
 
   * Initial release (Closes: #832927)


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


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
 Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 12),
  default-jdk,
  junit4,
  libintellij-annotations-java,
@@ -13,9 +13,9 @@ Build-Depends:
  libopenhft-chronicle-core-java,
  libslf4j-java,
  maven-debian-helper (>= 2.1)
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/openhft-chronicle-threads.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/openhft-chronicle-threads.git
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/openhft-chronicle-threads.git
+Vcs-Browser: https://salsa.debian.org/java-team/openhft-chronicle-threads
 Homepage: https://github.com/OpenHFT/Chronicle-Threads
 
 Package: libopenhft-chronicle-threads-java


=====================================
debian/patches/remove-WebServiceException.patch
=====================================
@@ -0,0 +1,26 @@
+Description: remove WebServiceException
+Origin: upstream, https://github.com/OpenHFT/Chronicle-Threads/commit/bb1d4edfc7a783ebdc7c58bfc2f278f665e2539e#diff-e5af304c7efa4fec7930553b2fab754b
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917738
+
+Index: openhft-chronicle-threads-1.1.6/src/main/java/net/openhft/chronicle/threads/MonitorEventLoop.java
+===================================================================
+--- openhft-chronicle-threads-1.1.6.orig/src/main/java/net/openhft/chronicle/threads/MonitorEventLoop.java
++++ openhft-chronicle-threads-1.1.6/src/main/java/net/openhft/chronicle/threads/MonitorEventLoop.java
+@@ -25,7 +25,6 @@ import org.jetbrains.annotations.NotNull
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+-import javax.xml.ws.WebServiceException;
+ import java.io.Closeable;
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -120,7 +119,8 @@ public class MonitorEventLoop implements
+     }
+ 
+     @Override
+-    public void close() throws WebServiceException {
++    public void close() {
++        stop();
+         service.shutdown();
+         try {
+             if (!service.awaitTermination(100, TimeUnit.MILLISECONDS))


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+remove-WebServiceException.patch



View it on GitLab: https://salsa.debian.org/java-team/openhft-chronicle-threads/compare/a488923e5d41f27cc61dadec9886a77c6f8f466c...4bb00a5c06b377cd35b9b48ef9b0909cb5d6e319

-- 
View it on GitLab: https://salsa.debian.org/java-team/openhft-chronicle-threads/compare/a488923e5d41f27cc61dadec9886a77c6f8f466c...4bb00a5c06b377cd35b9b48ef9b0909cb5d6e319
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/20190310/c976c23e/attachment.html>