Import Debian changes 1.8.14-4

svnkit (1.8.14-4) unstable; urgency=medium

  * Team upload.
  * Fix FTBFS. (Closes: #952103)
  * Update Standards-Version to 4.5.0
  * Use debhelper-compat.
    - Update compat level to 12.

debian/changelog

+svnkit (1.8.14-4) unstable; urgency=medium
+
+  * Team upload.
+  * Fix FTBFS. (Closes: #952103)
+  * Update Standards-Version to 4.5.0
+  * Use debhelper-compat.
+    - Update compat level to 12.
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com>  Fri, 10 Apr 2020 16:45:46 +0100
+
 svnkit (1.8.14-3) unstable; urgency=medium
 
   * Team upload.

debian/compat

-11

debian/control

@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam@ktknet.cz>
 Build-Depends: ant,
-               debhelper (>= 11),
+               debhelper-compat (= 12),
                default-jdk,
                javahelper,
                libeclipse-core-runtime-java,
@@ -16,7 +16,7 @@ Build-Depends: ant,
                libtrilead-ssh2-java (>= 6401+svn158),
                perl,
                maven-repo-helper
-Standards-Version: 4.1.4
+Standards-Version: 4.5.0
 Vcs-Git: https://salsa.debian.org/java-team/svnkit.git
 Vcs-Browser: https://salsa.debian.org/java-team/svnkit
 Homepage: http://svnkit.com

debian/patches/fix_abstract.patch

+Description: Override the abstract method
+
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Bug-Debian: https://bugs.debian.org/952103
+
+---
+
+--- svnkit-1.8.14.orig/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNClient.java
++++ svnkit-1.8.14/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNClient.java
+@@ -263,6 +263,10 @@ public class SVNClient implements ISVNCl
+         delegate.blame(path, pegRevision, revisionStart, revisionEnd, ignoreMimeType, includeMergedRevisions, callback);
+     }
+ 
++    public void blame(String path, Revision pegRevision, Revision revisionStart, Revision revisionEnd, boolean ignoreMimeType, boolean includeMergedRevisions, DiffOptions options, BlameRangeCallback rangeCallback, BlameLineCallback lineCallback) throws ClientException {
++        delegate.blame(path, pegRevision, revisionStart, revisionEnd, ignoreMimeType, includeMergedRevisions, options, rangeCallback, lineCallback);
++    }
++
+     public void setConfigDirectory(String configDir) throws ClientException {
+         delegate.setConfigDirectory(configDir);
+     }
+--- svnkit-1.8.14.orig/svnkit-javahl16/src/main/java/org/tmatesoft/svn/core/javahl17/SVNClientImpl.java
++++ svnkit-1.8.14/svnkit-javahl16/src/main/java/org/tmatesoft/svn/core/javahl17/SVNClientImpl.java
+@@ -1531,6 +1531,13 @@ public class SVNClientImpl implements IS
+         blame(path, pegRevision, revisionStart, revisionEnd, ignoreMimeType, includeMergedRevisions, callback, null);
+     }
+ 
++    public void blame(String path, Revision pegRevision,
++            Revision revisionStart, Revision revisionEnd,
++            boolean ignoreMimeType, boolean includeMergedRevisions,
++            DiffOptions options, BlameRangeCallback rangeCallback,
++            BlameLineCallback lineCallback) throws ClientException {
++    }
++
+     public static ClientException getClientException(Throwable e) throws ClientException {
+         ClientException ce = ClientException.fromException(e);
+         ce.initCause(e);

debian/patches/series

 fix-logging-path.patch
 script-fix-classpath.patch
 libsvn-java-1.10.0-1.patch
+fix_abstract.patch