This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository svnkit.
commit 125f93eff6e06c16e2dfb9b32e864fd671eede52 Author: Markus Koschany <[email protected]> Date: Sat Oct 8 23:30:54 2016 +0200 Drop libsvn-java-1.9.2.patch --- debian/patches/libsvn-java-1.9.2.patch | 330 --------------------------------- debian/patches/series | 1 - 2 files changed, 331 deletions(-) diff --git a/debian/patches/libsvn-java-1.9.2.patch b/debian/patches/libsvn-java-1.9.2.patch deleted file mode 100644 index 362e9f5..0000000 --- a/debian/patches/libsvn-java-1.9.2.patch +++ /dev/null @@ -1,330 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Tue, 8 Dec 2015 23:31:03 +0100 -Subject: libsvn-java 1.9.2 - -Implement abstract methods to prevent a FTBFS with libsvn-java 1.9.2. - -Forwarded: no -Bug: https://bugs.debian.org/802356 ---- - .../org/apache/subversion/javahl/SVNClient.java | 100 ++++++++++++++++++++ - .../org/apache/subversion/javahl/SVNRepos.java | 16 ++++ - .../tmatesoft/svn/core/javahl17/SVNClientImpl.java | 101 +++++++++++++++++++++ - 3 files changed, 217 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 d755aed..b6ca664 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 -@@ -5,12 +5,14 @@ import java.util.Collection; - import java.util.List; - import java.util.Map; - import java.util.Set; -+import org.apache.subversion.javahl.callback.AuthnCallback; - - import org.apache.subversion.javahl.callback.BlameCallback; - import org.apache.subversion.javahl.callback.ChangelistCallback; - import org.apache.subversion.javahl.callback.ClientNotifyCallback; - import org.apache.subversion.javahl.callback.CommitCallback; - import org.apache.subversion.javahl.callback.CommitMessageCallback; -+import org.apache.subversion.javahl.callback.ConfigEvent; - import org.apache.subversion.javahl.callback.ConflictResolverCallback; - import org.apache.subversion.javahl.callback.DiffSummaryCallback; - import org.apache.subversion.javahl.callback.ImportFilterCallback; -@@ -22,14 +24,17 @@ import org.apache.subversion.javahl.callback.PatchCallback; - import org.apache.subversion.javahl.callback.ProgressCallback; - import org.apache.subversion.javahl.callback.ProplistCallback; - import org.apache.subversion.javahl.callback.StatusCallback; -+import org.apache.subversion.javahl.callback.TunnelAgent; - import org.apache.subversion.javahl.callback.UserPasswordCallback; - import org.apache.subversion.javahl.types.CopySource; - import org.apache.subversion.javahl.types.Depth; - import org.apache.subversion.javahl.types.DiffOptions; -+import org.apache.subversion.javahl.types.ExternalItem; - import org.apache.subversion.javahl.types.Mergeinfo; - import org.apache.subversion.javahl.types.Mergeinfo.LogKind; - import org.apache.subversion.javahl.types.Revision; - import org.apache.subversion.javahl.types.RevisionRange; -+import org.apache.subversion.javahl.types.RuntimeVersion; - import org.apache.subversion.javahl.types.Version; - import org.apache.subversion.javahl.types.VersionExtended; - import org.tmatesoft.svn.core.javahl17.SVNClientImpl; -@@ -392,4 +397,99 @@ 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); - } -+ -+ @Override -+ public RuntimeVersion getRuntimeVersion() { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void status(String string, Depth depth, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4, boolean bln5, Collection<String> clctn, StatusCallback sc) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void setPrompt(AuthnCallback ac) { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void setTunnelAgent(TunnelAgent ta) { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void revert(Set<String> set, Depth depth, Collection<String> clctn, boolean bln, boolean bln1) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void revert(Set<String> set, Depth depth, Collection<String> clctn) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void copy(List<CopySource> list, String string, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4, Map<String, List<ExternalItem>> map, Map<String, String> map1, CommitMessageCallback cmc, CommitCallback cc) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void cleanup(String string, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public long doExport(String string, String string1, Revision rvsn, Revision rvsn1, boolean bln, boolean bln1, boolean bln2, Depth depth, String string2) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void merge(String string, Revision rvsn, String string1, Revision rvsn1, String string2, boolean bln, Depth depth, boolean bln1, boolean bln2, boolean bln3, boolean bln4, boolean bln5) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void merge(String string, Revision rvsn, List<RevisionRange> list, String string1, boolean bln, Depth depth, boolean bln1, boolean bln2, boolean bln3, boolean bln4, boolean bln5) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public Map<String, byte[]> streamFileContent(String string, Revision rvsn, Revision rvsn1, boolean bln, boolean bln1, OutputStream out) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void blame(String string, Revision rvsn, Revision rvsn1, Revision rvsn2, boolean bln, boolean bln1, BlameCallback bc, DiffOptions d) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void setConfigEventHandler(ConfigEvent ce) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public ConfigEvent getConfigEventHandler() throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void info(String string, Revision rvsn, Revision rvsn1, Depth depth, boolean bln, boolean bln1, boolean bln2, Collection<String> clctn, InfoCallback ic) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void vacuum(String string, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public ISVNRemote openRemoteSession(String string) throws ClientException, SubversionException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public ISVNRemote openRemoteSession(String string, int i) throws ClientException, SubversionException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } - } -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 cf4a681..8931636 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 -@@ -7,6 +7,7 @@ import java.util.Set; - - import org.apache.subversion.javahl.callback.ReposFreezeAction; - import org.apache.subversion.javahl.callback.ReposNotifyCallback; -+import org.apache.subversion.javahl.callback.ReposVerifyCallback; - import org.apache.subversion.javahl.types.Depth; - import org.apache.subversion.javahl.types.Lock; - import org.apache.subversion.javahl.types.Revision; -@@ -118,4 +119,19 @@ public class SVNRepos implements ISVNRepos { - public void freeze(ReposFreezeAction action, File... paths) throws ClientException { - delegate.freeze(action, paths); - } -+ -+ @Override -+ public void hotcopy(File file, File file1, boolean bln, boolean bln1, ReposNotifyCallback rnc) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void load(File file, InputStream in, Revision rvsn, Revision rvsn1, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4, boolean bln5, String string, ReposNotifyCallback rnc) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void verify(File file, Revision rvsn, Revision rvsn1, boolean bln, boolean bln1, ReposNotifyCallback rnc, ReposVerifyCallback rvc) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } - } -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 1975bc5..215a960 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 -@@ -27,13 +27,16 @@ import org.apache.subversion.javahl.ConflictResult; - import org.apache.subversion.javahl.ConflictResult.Choice; - import org.apache.subversion.javahl.DiffSummary; - import org.apache.subversion.javahl.ISVNClient; -+import org.apache.subversion.javahl.ISVNRemote; - import org.apache.subversion.javahl.JavaHLObjectFactory; - import org.apache.subversion.javahl.SubversionException; -+import org.apache.subversion.javahl.callback.AuthnCallback; - import org.apache.subversion.javahl.callback.BlameCallback; - import org.apache.subversion.javahl.callback.ChangelistCallback; - import org.apache.subversion.javahl.callback.ClientNotifyCallback; - import org.apache.subversion.javahl.callback.CommitCallback; - import org.apache.subversion.javahl.callback.CommitMessageCallback; -+import org.apache.subversion.javahl.callback.ConfigEvent; - import org.apache.subversion.javahl.callback.ConflictResolverCallback; - import org.apache.subversion.javahl.callback.DiffSummaryCallback; - import org.apache.subversion.javahl.callback.ImportFilterCallback; -@@ -45,6 +48,7 @@ import org.apache.subversion.javahl.callback.PatchCallback; - import org.apache.subversion.javahl.callback.ProgressCallback; - import org.apache.subversion.javahl.callback.ProplistCallback; - import org.apache.subversion.javahl.callback.StatusCallback; -+import org.apache.subversion.javahl.callback.TunnelAgent; - import org.apache.subversion.javahl.callback.UserPasswordCallback; - import org.apache.subversion.javahl.types.ChangePath; - import org.apache.subversion.javahl.types.Checksum; -@@ -53,6 +57,7 @@ import org.apache.subversion.javahl.types.CopySource; - import org.apache.subversion.javahl.types.Depth; - import org.apache.subversion.javahl.types.DiffOptions; - import org.apache.subversion.javahl.types.DirEntry; -+import org.apache.subversion.javahl.types.ExternalItem; - import org.apache.subversion.javahl.types.Info; - import org.apache.subversion.javahl.types.JavaHLTypesObjectFactory; - import org.apache.subversion.javahl.types.Lock; -@@ -61,6 +66,7 @@ import org.apache.subversion.javahl.types.Mergeinfo.LogKind; - import org.apache.subversion.javahl.types.NodeKind; - import org.apache.subversion.javahl.types.Revision; - import org.apache.subversion.javahl.types.RevisionRange; -+import org.apache.subversion.javahl.types.RuntimeVersion; - import org.apache.subversion.javahl.types.Status; - import org.apache.subversion.javahl.types.Tristate; - import org.apache.subversion.javahl.types.Version; -@@ -2082,6 +2088,101 @@ public class SVNClientImpl implements ISVNClient { - return inheritedItems; - } - -+ @Override -+ public RuntimeVersion getRuntimeVersion() { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void status(String string, Depth depth, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4, boolean bln5, Collection<String> clctn, StatusCallback sc) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void setPrompt(AuthnCallback ac) { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void setTunnelAgent(TunnelAgent ta) { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void revert(Set<String> set, Depth depth, Collection<String> clctn, boolean bln, boolean bln1) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void revert(Set<String> set, Depth depth, Collection<String> clctn) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void copy(List<CopySource> list, String string, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4, Map<String, List<ExternalItem>> map, Map<String, String> map1, CommitMessageCallback cmc, CommitCallback cc) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void cleanup(String string, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public long doExport(String string, String string1, Revision rvsn, Revision rvsn1, boolean bln, boolean bln1, boolean bln2, Depth depth, String string2) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void merge(String string, Revision rvsn, String string1, Revision rvsn1, String string2, boolean bln, Depth depth, boolean bln1, boolean bln2, boolean bln3, boolean bln4, boolean bln5) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void merge(String string, Revision rvsn, List<RevisionRange> list, String string1, boolean bln, Depth depth, boolean bln1, boolean bln2, boolean bln3, boolean bln4, boolean bln5) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public Map<String, byte[]> streamFileContent(String string, Revision rvsn, Revision rvsn1, boolean bln, boolean bln1, OutputStream out) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void blame(String string, Revision rvsn, Revision rvsn1, Revision rvsn2, boolean bln, boolean bln1, BlameCallback bc, DiffOptions d) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void setConfigEventHandler(ConfigEvent ce) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public ConfigEvent getConfigEventHandler() throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void info(String string, Revision rvsn, Revision rvsn1, Depth depth, boolean bln, boolean bln1, boolean bln2, Collection<String> clctn, InfoCallback ic) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public void vacuum(String string, boolean bln, boolean bln1, boolean bln2, boolean bln3, boolean bln4) throws ClientException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public ISVNRemote openRemoteSession(String string) throws ClientException, SubversionException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ -+ @Override -+ public ISVNRemote openRemoteSession(String string, int i) throws ClientException, SubversionException { -+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. -+ } -+ - private static class PropertiesReceiverProvider { - - private final InheritedProplistCallback callback; diff --git a/debian/patches/series b/debian/patches/series index 7f29ae5..666c19f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ fix-logging-path.patch -libsvn-java-1.9.2.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/svnkit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
