[Git][java-team/svnkit][master] 6 commits: Switch to compat level 11.

Markus Koschany gitlab at salsa.debian.org
Fri May 11 23:03:02 BST 2018 

Markus Koschany pushed to branch master at Debian Java Maintainers / svnkit


Commits:
94c19331 by Markus Koschany at 2018-05-11T21:42:21+02:00
Switch to compat level 11.

- - - - -
abfaae16 by Markus Koschany at 2018-05-11T21:42:36+02:00
Declare compliance with Debian Policy 4.1.4.

- - - - -
95d7e58a by Markus Koschany at 2018-05-11T23:52:23+02:00
Fix FTBFS with libsvn-java 1.10.0-1.

- - - - -
299d61cb by Markus Koschany at 2018-05-11T23:54:59+02:00
Use source/target 1.7.

- - - - -
92763568 by Markus Koschany at 2018-05-11T23:55:46+02:00
Update copyright years.

- - - - -
54ab3c82 by Markus Koschany at 2018-05-11T23:59:30+02:00
Update changelog

- - - - -


7 changed files:

- debian/ant.properties
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- + debian/patches/libsvn-java-1.10.0-1.patch
- debian/patches/series


Changes:

=====================================
debian/ant.properties
=====================================
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,4 +1,4 @@
 # Ensure that source and target are 1.5
 # For backwards compat on Java 7
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
+ant.build.javac.source=1.7
+ant.build.javac.target=1.7


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,19 @@
-svnkit (1.8.14-2) UNRELEASED; urgency=medium
+svnkit (1.8.14-2) unstable; urgency=medium
 
   * Team upload.
+
+  [ Miguel Landaeta ]
   * Remove myself from uploaders list. (Closes: #871890)
   * Simplify d/rules.
-  * Update copyright info.
+  * Update copyright information.
+
+  [ Markus Koschany ]
+  * Switch to compat level 11.
+  * Declare compliance with Debian Policy 4.1.4.
+  * Fix FTBFS with libsvn-java 1.10.0-1. (Closes: #897132)
+  * Use source/target 1.7.
 
- -- Miguel Landaeta <nomadium at debian.org>  Thu, 10 Aug 2017 21:15:10 +0100
+ -- Markus Koschany <apo at debian.org>  Fri, 11 May 2018 23:56:14 +0200
 
 svnkit (1.8.14-1) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/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 (>= 10),
+               debhelper (>= 11),
                default-jdk,
                eclipse-rcp,
                javahelper,
@@ -15,7 +15,7 @@ Build-Depends: ant,
                libtrilead-ssh2-java (>= 6401+svn158),
                perl,
                maven-repo-helper
-Standards-Version: 3.9.8
+Standards-Version: 4.1.4
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/svnkit.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/svnkit.git
 Homepage: http://svnkit.com


=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ License: The-TMate-Open-Source-License
 Files: debian/*
 Copyright: 2010-2011,2014 Miguel Landaeta <nomadium at debian.org>
            2012,          Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-           2015-2016,     Markus Koschany <apo at debian.org>
+           2015-2018,     Markus Koschany <apo at debian.org>
 License: Apache-2.0
 
 Files: debian/build.xml


=====================================
debian/patches/libsvn-java-1.10.0-1.patch
=====================================
--- /dev/null
+++ b/debian/patches/libsvn-java-1.10.0-1.patch
@@ -0,0 +1,60 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 11 May 2018 23:23:07 +0200
+Subject: libsvn-java 1.10.0-1
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=897132
+Forwarded: no
+---
+ .../src/main/java/org/apache/subversion/javahl/SVNClient.java    | 9 +++++++++
+ .../src/main/java/org/apache/subversion/javahl/SVNRepos.java     | 5 +++++
+ .../main/java/org/tmatesoft/svn/core/javahl17/SVNClientImpl.java | 7 +++++++
+ 3 files changed, 21 insertions(+)
+
+diff --git a/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNClient.java b/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNClient.java
+index b709012..b994ad9 100644
+--- a/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNClient.java
++++ b/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNClient.java
+@@ -445,4 +445,13 @@ public class SVNClient implements ISVNClient {
+     public void getMergeinfoLog(LogKind kind, String pathOrUrl, Revision pegRevision, String mergeSourceUrl, Revision srcPegRevision, Revision srcStartRevision, Revision srcEndRevision, boolean discoverChangedPaths, Depth depth, Set<String> revProps, LogMessageCallback callback) throws ClientException {
+         delegate.getMergeinfoLog(kind, pathOrUrl, pegRevision, mergeSourceUrl, srcPegRevision, srcStartRevision, srcEndRevision, discoverChangedPaths, depth, revProps, callback);
+     }
++
++    public void logMessages(String bla ,Revision blup ,List<RevisionRange> kra,boolean tup,boolean tap ,boolean tep ,Set<String> iup ,boolean tre ,long kos ,LogMessageCallback oop)
++        {
++        }
++
++    public void
++        list(String adad, Revision adadadad, Revision iadaf, List<String> jdhf, Depth sdsd, int urnsd, boolean kkd, boolean jshsd, ListItemCallback jsjss)
++        {
++        }
+ }
+diff --git a/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNRepos.java b/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNRepos.java
+index c1035ec..5534437 100644
+--- a/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNRepos.java
++++ b/svnkit-javahl16/src/main/java/org/apache/subversion/javahl/SVNRepos.java
+@@ -131,4 +131,9 @@ public class SVNRepos implements ISVNRepos {
+     public void freeze(ReposFreezeAction action, File... paths) throws ClientException {
+         delegate.freeze(action, paths);
+     }
++
++    public void
++        load(File us, InputStream sdsd,Revision sdsdsd,Revision sdsdsdsds,boolean blu,boolean blapa,boolean uadada,boolean adad,boolean kafjkaj,boolean isdad,boolean iadad,String oaodad ,ReposNotifyCallback adadss)
++        {
++        }
+ }
+diff --git a/svnkit-javahl16/src/main/java/org/tmatesoft/svn/core/javahl17/SVNClientImpl.java b/svnkit-javahl16/src/main/java/org/tmatesoft/svn/core/javahl17/SVNClientImpl.java
+index 0d6dd3b..503cd30 100644
+--- a/svnkit-javahl16/src/main/java/org/tmatesoft/svn/core/javahl17/SVNClientImpl.java
++++ b/svnkit-javahl16/src/main/java/org/tmatesoft/svn/core/javahl17/SVNClientImpl.java
+@@ -3533,4 +3533,11 @@ public class SVNClientImpl implements ISVNClient {
+     public VersionExtended getVersionExtended(boolean verbose) {
+         return null;
+     }
++
++    public void logMessages(String isdsd,Revision sdsd,List<RevisionRange> iiiiisd,boolean ujsd,boolean isdsc,boolean nvhsd,Set<String> sdsdiue,boolean kkks,long kdfd,LogMessageCallback jsdhgg)
++        {
++        }
++    public void list(String isdsd, Revision bvs, Revision sdsds, List<String> ncdf, Depth uerh ,int jdhf ,boolean hdhdhg, boolean kdkf, ListItemCallback isd)
++        {
++        }
+ }


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-logging-path.patch
 script-fix-classpath.patch
+libsvn-java-1.10.0-1.patch



View it on GitLab: https://salsa.debian.org/java-team/svnkit/compare/b1c27bc6c8cc8b8fa7fb7e81a65235dbc7af8515...54ab3c824a4ed34ec50728e403cb573141afade7

---
View it on GitLab: https://salsa.debian.org/java-team/svnkit/compare/b1c27bc6c8cc8b8fa7fb7e81a65235dbc7af8515...54ab3c824a4ed34ec50728e403cb573141afade7
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/20180511/fec1cb93/attachment.html>

More information about the pkg-java-commits mailing list