[SCM] SVNKIT: pure Java Subversion client/library branch, master, updated. debian/1.3.5+dfsg-1-1-ga6b4f44
Miguel Landaeta
miguel at miguel.cc
Thu Jun 21 17:46:37 UTC 2012
The following commit has been merged in the master branch:
commit a6b4f44cbcbc913d8983988260c5215168636882
Author: Miguel Landaeta <miguel at miguel.cc>
Date: Thu Jun 21 07:53:19 2012 -0430
Prepare 1.3.5+dfsg-2 upload
* Fix FTBFS due to changes introduced in subversion 1.7.5. (Closes: #678308).
* Bump Standards-Version to 3.9.3. No changes were required.
* Update copyright file.
diff --git a/debian/changelog b/debian/changelog
index 44fd1e4..98ae47d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+svnkit (1.3.5+dfsg-2) UNRELEASED; urgency=low
+
+ * Fix FTBFS due to changes introduced in subversion 1.7.5. (Closes: #678308).
+ * Bump Standards-Version to 3.9.3. No changes were required.
+ * Update copyright file.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Thu, 21 Jun 2012 07:54:44 -0430
+
svnkit (1.3.5+dfsg-1) unstable; urgency=low
[Miguel Landaeta]
diff --git a/debian/control b/debian/control
index 262672e..c3f8bb5 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Priority: optional
Build-Depends: debhelper (>> 7.0.50), ant, default-jdk, javahelper,
libtrilead-ssh2-java (>= 6401), libjna-java, antlr3,
libsvn-java (>= 1.6.4dfsg), perl
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://svnkit.com/
Vcs-Git: git://git.debian.org/git/pkg-java/svnkit.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/svnkit.git
diff --git a/debian/copyright b/debian/copyright
index a9a1792..b05db26 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://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
diff --git a/debian/patches/04_subversion_1.7.5.diff b/debian/patches/04_subversion_1.7.5.diff
new file mode 100644
index 0000000..ee6fc82
--- /dev/null
+++ b/debian/patches/04_subversion_1.7.5.diff
@@ -0,0 +1,67 @@
+Description: Dummy compatibility with Subversion 1.7.5 Java APIs
+Author: Miguel Landaeta <miguel at miguel.cc>
+Bug-Debian: http://bugs.debian.org/678308
+Forwarded: no
+Last-Update: <2012-06-21>
+
+--- svnkit-1.3.5+dfsg.orig/svnkit/src/org/tigris/subversion/javahl/SVNClient.java
++++ svnkit-1.3.5+dfsg/svnkit/src/org/tigris/subversion/javahl/SVNClient.java
+@@ -581,4 +581,27 @@ public class SVNClient implements SVNCli
+ myDelegate.setRevProperty(path, name, rev, value, originalValue, force);
+ }
+
++ public void upgrade(String path) {
++ throw new UnsupportedOperationException("upgrade");
++ }
++
++ public void blame(String path, Revision pegRevision, Revision revisionStart, Revision revisionEnd, boolean ignoreMimeType, boolean includeMergedRevisions, org.tigris.subversion.javahl.BlameCallback3 callback) throws ClientException {
++ throw new UnsupportedOperationException("blame");
++ }
++
++ public void copy(CopySource[] sources, String desPath, String message, boolean copyAsChild, boolean makeParents, boolean ignoreExternals, Map revpropTable) throws ClientException {
++ throw new UnsupportedOperationException("copy");
++ }
++
++ public void getMergeinfoLog(int kind, String pathOrUrl, Revision pegRevision, String mergeSourceUrl, Revision srcPegRevision, boolean discoverChangedPaths, int depth, String[] revProps, LogMessageCallback callbackY) throws ClientException {
++ throw new UnsupportedOperationException("getMergeinfoLog");
++ }
++
++ public void diff(String target1, Revision revision1, String target2, Revision revision2, String relativeToDir, String outFileName, int depth, String[] changelists, boolean ignoreAncestry, boolean noDiffDeleted, boolean force, boolean copiesAsAdds) throws ClientException {
++ throw new UnsupportedOperationException("diff");
++ }
++
++ public void diff(String target, Revision pegRevision, Revision startRevision, Revision endRevision, String relativeToDir, String outFileName, int depth, String[] changelists, boolean ignoreAncestry, boolean noDiffDeleted, boolean force, boolean copiesAsAdd) throws ClientException {
++ throw new UnsupportedOperationException("diff");
++ }
+ }
+--- svnkit-1.3.5+dfsg.orig/svnkit/src/org/tmatesoft/svn/core/javahl/SVNClientImpl.java
++++ svnkit-1.3.5+dfsg/svnkit/src/org/tmatesoft/svn/core/javahl/SVNClientImpl.java
+@@ -2235,4 +2235,28 @@ public class SVNClientImpl implements SV
+ // TODO use original value.
+ setRevProperty(path, name, rev, value, force);
+ }
++
++ public void upgrade(String path) {
++ throw new UnsupportedOperationException("upgrade");
++ }
++
++ public void blame(String path, Revision pegRevision, Revision revisionStart, Revision revisionEnd, boolean ignoreMimeType, boolean includeMergedRevisions, org.tigris.subversion.javahl.BlameCallback3 callback) throws ClientException {
++ throw new UnsupportedOperationException("blame");
++ }
++
++ public void copy(CopySource[] sources, String desPath, String message, boolean copyAsChild, boolean makeParents, boolean ignoreExternals, Map revpropTable) throws ClientException {
++ throw new UnsupportedOperationException("copy");
++ }
++
++ public void getMergeinfoLog(int kind, String pathOrUrl, Revision pegRevision, String mergeSourceUrl, Revision srcPegRevision, boolean discoverChangedPaths, int depth, String[] revProps, LogMessageCallback callbackY) throws ClientException {
++ throw new UnsupportedOperationException("getMergeinfoLog");
++ }
++
++ public void diff(String target1, Revision revision1, String target2, Revision revision2, String relativeToDir, String outFileName, int depth, String[] changelists, boolean ignoreAncestry, boolean noDiffDeleted, boolean force, boolean copiesAsAdds) throws ClientException {
++ throw new UnsupportedOperationException("diff");
++ }
++
++ public void diff(String target, Revision pegRevision, Revision startRevision, Revision endRevision, String relativeToDir, String outFileName, int depth, String[] changelists, boolean ignoreAncestry, boolean noDiffDeleted, boolean force, boolean copiesAsAdd) throws ClientException {
++ throw new UnsupportedOperationException("diff");
++ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 57a0d80..488562b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
01_build_with_debian_jars.diff
02_fix_scripts.diff
03_add_classpath_to_manifest.diff
+04_subversion_1.7.5.diff
--
SVNKIT: pure Java Subversion client/library
More information about the pkg-java-commits
mailing list