diff --git a/debian/changelog b/debian/changelog index 86fdbf1f33422195722f0a9d86547944a7bf66a0..63d49e94f78fb22dd355dcad8814510d9cef8da0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de3947675361a7770d29b8982c407b0ec6b2a0..0000000000000000000000000000000000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index e4dd24f56eb0685d1719e30f4e6ff3c8a725183f..4dd677ee0f78e6602f0d832e36aba5bc338c7cad 100644 --- a/debian/control +++ b/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 diff --git a/debian/patches/fix_abstract.patch b/debian/patches/fix_abstract.patch new file mode 100644 index 0000000000000000000000000000000000000000..dde25a5ebb38db4b1912ab42a3528276a816e1c5 --- /dev/null +++ b/debian/patches/fix_abstract.patch @@ -0,0 +1,36 @@ +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); diff --git a/debian/patches/series b/debian/patches/series index 95ccbaeed379fb2467c421c36fedab2d581ce371..afb949650e9aa434f293dd744391c2c839b34dc4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ fix-logging-path.patch script-fix-classpath.patch libsvn-java-1.10.0-1.patch +fix_abstract.patch