[Git][java-team/svnkit][master] 4 commits: Import Debian changes 1.8.14-4

[Tony Mancill]

Tony Mancill pushed to branch master at Debian Java Maintainers / svnkit


Commits:
b077a4f7 by Sudip Mukherjee at 2020-04-10T11:13:00-07:00
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.

- - - - -
2ef4474e by tony mancill at 2020-04-10T11:46:13-07:00
Set "Rules-Requires-Root: no" in debian/control

- - - - -
bbc5eee1 by tony mancill at 2020-04-10T11:50:05-07:00
Use https URL for Homepage in debian/control

- - - - -
26323ed4 by tony mancill at 2020-04-10T11:50:05-07:00
prepare changelog for upload to unstable

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/fix_abstract.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+svnkit (1.8.14-4) unstable; urgency=medium
+
+  [ Sudip Mukherjee ]
+  * Team upload.
+  * Fix FTBFS. (Closes: #952103)
+  * Update Standards-Version to 4.5.0
+  * Use debhelper-compat.
+    - Update compat level to 12.
+
+  [ tony mancill ]
+  * Set "Rules-Requires-Root: no" in debian/control
+  * Use https URLs for Homepage and Source in debian/control and copyright
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com>  Fri, 10 Apr 2020 16:45:46 +0100
+
 svnkit (1.8.14-3) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: ant,
-               debhelper (>= 11),
+               debhelper-compat (= 12),
                default-jdk,
                javahelper,
                libeclipse-core-runtime-java,
@@ -16,10 +16,11 @@ 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
+Homepage: https://svnkit.com
+Rules-Requires-Root: no
 
 Package: svnkit
 Architecture: all


=====================================
debian/copyright
=====================================
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SVNKit
 Upstream-Contact: TMate Software Ltd. <support at svnkit.com>
-Source: http://svnkit.com/download.php
+Source: https://svnkit.com/download.php
 
 Files: *
 Copyright: 2004-2011, TMate Software Ltd. <support at svnkit.com>


=====================================
debian/patches/fix_abstract.patch
=====================================
@@ -0,0 +1,36 @@
+Description: Override the abstract method
+
+Author: Sudip Mukherjee <sudipm.mukherjee at 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
=====================================
@@ -1,3 +1,4 @@
 fix-logging-path.patch
 script-fix-classpath.patch
 libsvn-java-1.10.0-1.patch
+fix_abstract.patch



View it on GitLab: https://salsa.debian.org/java-team/svnkit/-/compare/633e647c1826761cf933f557d4f881c2d88e76f1...26323ed4b88dd048880d19e2fd362ab7b4f546e7

-- 
View it on GitLab: https://salsa.debian.org/java-team/svnkit/-/compare/633e647c1826761cf933f557d4f881c2d88e76f1...26323ed4b88dd048880d19e2fd362ab7b4f546e7
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/20200410/b471e202/attachment.html>