debian/0000755000000000000000000000000012163306254007170 5ustar debian/README.Debian0000644000000000000000000000074711553511407011241 0ustar ------------------------- libsvnkit-java for Debian ------------------------- *** Removal of functionalities *** SVNKIT Debian package doesn't contains some of the functionalities of upstream binary releases. Here is a list of excluded files regarding original content of SVNKIT. * sqljet [not-in-debian] SQLJet Pure Java SQLite org/tmatesoft/svn/core/internal/io/fs/repcache/** Please see #563123. -- Miguel Landaeta Tue, 09 Mar 2010 22:44:23 -0430 debian/compat0000644000000000000000000000000211553511407010366 0ustar 7 debian/jsvn.pod0000644000000000000000000000147411553511407010662 0ustar =head1 NAME jsvn - Subversion command line client tool =head1 SYNOPSIS jsvn command [options] [args] =head1 OVERVIEW SVNKit is a pure Java(TM) version of Subversion. Subversion is a version control system, which allows you to keep old versions of files and directories (usually source code), keep a log of who, when, and why changes occurred, etc., like CVS, RCS or SCCS. Subversion keeps a single copy of the master sources. This copy is called the source ``repository''; it contains all the information to permit extracting previous versions of those files at any time. For additional information, see http://svnkit.com/. For information about Subversion in a broad sense, can be found at http://svnbook.red-bean.com/ and http://subversion.tigris.org. Run `jsvn help' to access the built-in tool documentation. debian/jsvnadmin.pod0000644000000000000000000000154011553511407011665 0ustar =head1 NAME jsvnadmin - Subversion repository administration tool =head1 SYNOPSIS jsvnadmin command /path/to/repos [options] [args] =head1 OVERVIEW SVNKit is a pure Java(TM) version of Subversion. Subversion is a version control system, which allows you to keep old versions of files and directories (usually source code), keep a log of who, when, and why changes occurred, etc., like CVS, RCS or SCCS. Subversion keeps a single copy of the master sources. This copy is called the source ``repository''; it contains all the information to permit extracting previous versions of those files at any time. For additional information, see http://svnkit.com/. For information about Subversion in a broad sense, can be found at http://svnbook.red-bean.com/ and http://subversion.tigris.org. Run `jsvnadmin help' to access the built-in tool documentation. debian/jsvndumpfilter.pod0000644000000000000000000000154111553511407012751 0ustar =head1 NAME jsvndumpfilter - Filter a subversion repository 'dumpfile'. =head1 SYNOPSIS jsvndumpfilter command [options & args] =head1 OVERVIEW SVNKit is a pure Java(TM) version of Subversion. Subversion is a version control system, which allows you to keep old versions of files and directories (usually source code), keep a log of who, when, and why changes occurred, etc., like CVS, RCS or SCCS. Subversion keeps a single copy of the master sources. This copy is called the source ``repository''; it contains all the information to permit extracting previous versions of those files at any time. For additional information, see http://svnkit.com/. For information about Subversion in a broad sense, can be found at http://svnbook.red-bean.com/ and http://subversion.tigris.org. Run `jsvndumpfilter help' to access the built-in tool documentation. debian/jsvnlook.pod0000644000000000000000000000153211553511407011542 0ustar =head1 NAME jsvnlook - Subversion repository examination tool =head1 SYNOPSIS jsvnlook command /path/to/repos [options] [args] =head1 OVERVIEW SVNKit is a pure Java(TM) version of Subversion. Subversion is a version control system, which allows you to keep old versions of files and directories (usually source code), keep a log of who, when, and why changes occurred, etc., like CVS, RCS or SCCS. Subversion keeps a single copy of the master sources. This copy is called the source ``repository''; it contains all the information to permit extracting previous versions of those files at any time. For additional information, see http://svnkit.com/. For information about Subversion in a broad sense, can be found at http://svnbook.red-bean.com/ and http://subversion.tigris.org. Run `jsvnlook help' to access the built-in tool documentation. debian/jsvnsync.pod0000644000000000000000000000153011553511407011550 0ustar =head1 NAME jsvnsync - Subversion repository synchronization tool =head1 SYNOPSIS jsvnsync command dest-url [options] [args] =head1 OVERVIEW SVNKit is a pure Java(TM) version of Subversion. Subversion is a version control system, which allows you to keep old versions of files and directories (usually source code), keep a log of who, when, and why changes occurred, etc., like CVS, RCS or SCCS. Subversion keeps a single copy of the master sources. This copy is called the source ``repository''; it contains all the information to permit extracting previous versions of those files at any time. For additional information, see http://svnkit.com/. For information about Subversion in a broad sense, can be found at http://svnbook.red-bean.com/ and http://subversion.tigris.org. Run `jsvnsync help' to access the built-in tool documentation. debian/jsvnversion.pod0000644000000000000000000000155311553511407012266 0ustar =head1 NAME jsvnversion - Produce a compact version number for a working copy. =head1 SYNOPSIS jsvnversion [options] [wc_path [trail_url]] =head1 OVERVIEW SVNKit is a pure Java(TM) version of Subversion. Subversion is a version control system, which allows you to keep old versions of files and directories (usually source code), keep a log of who, when, and why changes occurred, etc., like CVS, RCS or SCCS. Subversion keeps a single copy of the master sources. This copy is called the source ``repository''; it contains all the information to permit extracting previous versions of those files at any time. For additional information, see http://svnkit.com/. For information about Subversion in a broad sense, can be found at http://svnbook.red-bean.com/ and http://subversion.tigris.org. Run `jsvnversion --help' to access the built-in tool documentation. debian/libsvnkit-java-doc.doc-base0000644000000000000000000000035011553511407014254 0ustar Document: libsvnkit-java-doc Title: API for SVNKIT Abstract: pure Java Subversion client library Section: Programming Format: HTML Index: /usr/share/doc/libsvnkit-java/api/index.html Files: /usr/share/doc/libsvnkit-java/api/*.html debian/orig-tar.sh0000755000000000000000000000135511553511407011257 0ustar #!/bin/sh set -e # called by uscan with '--upstream-version' echo "version $2" package=`dpkg-parsechangelog | sed -n 's/^Source: //p'` debian_version=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*+dfsg\)-.*/\1/p'` TAR=${package}_${debian_version}.orig.tar.gz DIR=${package}-${debian_version}.orig # clean up the upstream tarball unzip -d orig $3 mv "$(find orig -maxdepth 1 -type d ! -name orig)" orig/$DIR GZIP=--best tar -C orig -c -z -f $TAR --exclude doc/javadoc \ --exclude '*.class' --exclude contrib/javahl --exclude contrib/jna \ --exclude contrib/junit --exclude contrib/maven --exclude contrib/sqljet \ --exclude contrib/trilead --numeric-owner --group 0 --owner 0 $DIR rm -rf $3 orig debian/patches/0000755000000000000000000000000012162775344010630 5ustar debian/patches/fix-build-javac-1.6.0_24.patch0000644000000000000000000004405412162775344015572 0ustar From: Jakub Adam Date: Sun, 1 Jul 2012 20:18:25 +0200 Subject: fix-build-javac-1.6.0_24 --- .../org/tmatesoft/svn/core/internal/wc17/SVNWCContext.java | 2 +- .../java/org/tmatesoft/svn/core/internal/wc17/db/SVNWCDb.java | 4 ++-- .../org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbCopy.java | 2 +- .../tmatesoft/svn/core/internal/wc17/db/SvnWcDbExternals.java | 6 +++--- .../org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbReader.java | 4 ++-- .../org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbRevert.java | 2 +- .../org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbShared.java | 8 ++++---- .../tmatesoft/svn/core/internal/wc2/SvnRepositoryAccess.java | 2 +- .../tmatesoft/svn/core/internal/wc2/ng/SvnNgCommitUtil.java | 2 +- .../svn/core/internal/wc2/ng/SvnNgRepositoryAccess.java | 6 +++--- .../svn/core/internal/wc2/old/SvnOldRepositoryAccess.java | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/SVNWCContext.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/SVNWCContext.java index 138a5c6..51d52bd 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/SVNWCContext.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/SVNWCContext.java @@ -1258,7 +1258,7 @@ public class SVNWCContext { NodeInfo.originalRevision, NodeInfo.originalReposRelpath, NodeInfo.originalRootUrl, NodeInfo.originalUuid, NodeInfo.originalUuid, NodeInfo.haveWork); - Structure result = Structure.obtain(NodeOriginInfo.class, fields); + Structure result = Structure.,NodeOriginInfo>obtain(NodeOriginInfo.class, fields); readInfo. from(NodeInfo.revision, NodeInfo.reposRelPath, NodeInfo.reposRootUrl, NodeInfo.reposUuid, NodeInfo.haveWork). into(result, NodeOriginInfo.revision, NodeOriginInfo.reposRelpath, NodeOriginInfo.reposRootUrl, NodeOriginInfo.reposUuid, diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SVNWCDb.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SVNWCDb.java index 59506f0..d4210e5 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SVNWCDb.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SVNWCDb.java @@ -3446,7 +3446,7 @@ public class SVNWCDb implements ISVNWCDb { } public Structure fetchRepositoryInfo(SVNSqlJetDb sDb, long repos_id) throws SVNException { - Structure info = Structure.obtain(RepositoryInfo.class); + Structure info = Structure.,RepositoryInfo>obtain(RepositoryInfo.class); if (repos_id == INVALID_REPOS_ID) { return info; } @@ -4502,7 +4502,7 @@ public class SVNWCDb implements ISVNWCDb { SVNWCDbDir dir = wcInfo.wcDbDir; SVNSqlJetStatement stmt = dir.getWCRoot().getSDb().getStatement(SVNWCDbStatements.SELECT_NODE_INFO); File relativePath = wcInfo.localRelPath; - Structure result = Structure.obtain(PristineInfo.class); + Structure result = Structure.,PristineInfo>obtain(PristineInfo.class); try { stmt.bindf("is", dir.getWCRoot().getWcId(), relativePath); if (!stmt.next()) { diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbCopy.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbCopy.java index ebd4560..4f983f0 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbCopy.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbCopy.java @@ -494,7 +494,7 @@ public class SvnWcDbCopy extends SvnWcDbShared { } private static Structure getCopyInfo(SVNWCDbRoot wcRoot, File localRelPath) throws SVNException { - Structure result = Structure.obtain(CopyInfo.class); + Structure result = Structure.,CopyInfo>obtain(CopyInfo.class); result.set(CopyInfo.haveWork, false); Structure nodeInfo = SvnWcDbReader.readInfo(wcRoot, localRelPath, NodeInfo.status, NodeInfo.kind, NodeInfo.revision, NodeInfo.reposRelPath, diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbExternals.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbExternals.java index 1017944..6034154 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbExternals.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbExternals.java @@ -53,7 +53,7 @@ public class SvnWcDbExternals extends SvnWcDbShared { SVNWCDbRoot root = dirInfo.wcDbDir.getWCRoot(); File localRelpath = SVNFileUtil.createFilePath(SVNPathUtil.getRelativePath(root.getAbsPath().getAbsolutePath(), localAbspath.getAbsolutePath())); - Structure externalInfo = Structure.obtain(ExternalNodeInfo.class); + Structure externalInfo = Structure.,ExternalNodeInfo>obtain(ExternalNodeInfo.class); externalInfo.set(ExternalNodeInfo.revision, SVNWCContext.INVALID_REVNUM); externalInfo.set(ExternalNodeInfo.changedRevision, SVNWCContext.INVALID_REVNUM); @@ -225,7 +225,7 @@ public class SvnWcDbExternals extends SvnWcDbShared { try { selectExternalInfo.bindf("is", root.getWcId(), localRelpath); if (selectExternalInfo.next()) { - Structure info = Structure.obtain(ExternalNodeInfo.class, fields); + Structure info = Structure.,ExternalNodeInfo>obtain(ExternalNodeInfo.class, fields); if (info.hasField(ExternalNodeInfo.presence)) { info.set(ExternalNodeInfo.presence, getColumnPresence(selectExternalInfo, EXTERNALS__Fields.presence)); } @@ -297,7 +297,7 @@ public class SvnWcDbExternals extends SvnWcDbShared { SVNWCDbRoot root = dirInfo.wcDbDir.getWCRoot(); File localRelpath = SVNFileUtil.createFilePath(SVNPathUtil.getRelativePath(root.getAbsPath().getAbsolutePath(), localAbsPath.getAbsolutePath())); - Structure externalInfo = Structure.obtain(ExternalNodeInfo.class); + Structure externalInfo = Structure.,ExternalNodeInfo>obtain(ExternalNodeInfo.class); externalInfo.set(ExternalNodeInfo.kind, SVNWCDbKind.File); externalInfo.set(ExternalNodeInfo.presence, SVNWCDbStatus.Normal); diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbReader.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbReader.java index 7009c01..2ff6499 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbReader.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbReader.java @@ -91,7 +91,7 @@ public class SvnWcDbReader extends SvnWcDbShared { public static Structure readNodeReplaceInfo(SVNWCDb db, File localAbspath, ReplaceInfo... fields) throws SVNException { - Structure result = Structure.obtain(ReplaceInfo.class, fields); + Structure result = Structure.,ReplaceInfo>obtain(ReplaceInfo.class, fields); result.set(ReplaceInfo.replaced, false); if (result.hasField(ReplaceInfo.baseReplace)) { result.set(ReplaceInfo.baseReplace, false); @@ -251,7 +251,7 @@ public class SvnWcDbReader extends SvnWcDbShared { Structure childInfo = children.get(childName); if (childInfo == null) { - childInfo = Structure.obtain(WalkerChildInfo.class); + childInfo = Structure.,WalkerChildInfo>obtain(WalkerChildInfo.class); children.put(childName, childInfo); } long opDepth = getColumnInt64(stmt, NODES__Fields.op_depth); diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbRevert.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbRevert.java index 65d6a9b..b667a34 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbRevert.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbRevert.java @@ -225,7 +225,7 @@ public class SvnWcDbRevert extends SvnWcDbShared { SVNWCDbRoot root = dirInfo.wcDbDir.getWCRoot(); root.getSDb().getTemporaryDb().beginTransaction(SqlJetTransactionMode.WRITE); - Structure result = Structure.obtain(RevertInfo.class); + Structure result = Structure.,RevertInfo>obtain(RevertInfo.class); result.set(RevertInfo.kind, SVNWCDbKind.Unknown); result.set(RevertInfo.reverted, false); result.set(RevertInfo.copiedHere, false); diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbShared.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbShared.java index 1cbc187..c7fe28b 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbShared.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc17/db/SvnWcDbShared.java @@ -119,7 +119,7 @@ public class SvnWcDbShared { } protected static Structure scanAddition(SVNWCDbRoot root, File localRelpath, AdditionInfo... fields) throws SVNException { - Structure info = Structure.obtain(AdditionInfo.class, fields); + Structure info = Structure., AdditionInfo>obtain(AdditionInfo.class, fields); info.set(AdditionInfo.originalRevision, SVNWCDb.INVALID_REVNUM); info.set(AdditionInfo.originalReposId, SVNWCDb.INVALID_REPOS_ID); @@ -229,7 +229,7 @@ public class SvnWcDbShared { } protected static Structure scanDeletion(SVNWCDbRoot root, File localRelpath) throws SVNException { - Structure info = Structure.obtain(DeletionInfo.class); + Structure info = Structure.,DeletionInfo>obtain(DeletionInfo.class); SVNWCDbStatus childPresence = SVNWCDbStatus.BaseDeleted; boolean childHasBase = false; @@ -325,7 +325,7 @@ public class SvnWcDbShared { } protected static Structure getDepthInfo(SVNWCDbRoot wcroot, File localRelPath, long opDepth, NodeInfo...fields) throws SVNException { - Structure info = Structure.obtain(NodeInfo.class, fields); + Structure info = Structure.,NodeInfo>obtain(NodeInfo.class, fields); SVNSqlJetStatement stmt = wcroot.getSDb().getStatement(info.hasField(NodeInfo.lock) ? SVNWCDbStatements.SELECT_BASE_NODE_WITH_LOCK : SVNWCDbStatements.SELECT_BASE_NODE); try { stmt.bindf("isi", wcroot.getWcId(), SVNFileUtil.getFilePath(localRelPath), opDepth); @@ -434,7 +434,7 @@ public class SvnWcDbShared { } protected static Structure readInfo(SVNWCDbRoot wcRoot, File localRelPath, boolean isAdditionMode, NodeInfo... fields) throws SVNException { - Structure info = Structure.obtain(NodeInfo.class, fields); + Structure info = Structure.,NodeInfo>obtain(NodeInfo.class, fields); SVNSqlJetStatement stmtInfo = null; SVNSqlJetStatement stmtActual = null; diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/SvnRepositoryAccess.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/SvnRepositoryAccess.java index e24affe..b663ac1 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/SvnRepositoryAccess.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/SvnRepositoryAccess.java @@ -158,7 +158,7 @@ public abstract class SvnRepositoryAccess { } pair.release(); - Structure result = Structure.obtain(LocationsInfo.class); + Structure result = Structure.,LocationsInfo>obtain(LocationsInfo.class); result.set(LocationsInfo.startRevision, startRevisionNumber); if (end != SVNRevision.UNDEFINED) { result.set(LocationsInfo.startRevision, endRevisionNumber); diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgCommitUtil.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgCommitUtil.java index 8b7be2f..7f11526 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgCommitUtil.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgCommitUtil.java @@ -426,7 +426,7 @@ public class SvnNgCommitUtil { } private static Structure getNodeCommitStatus(SVNWCContext context, File localAbsPath) throws SVNException { - Structure result = Structure.obtain(NodeCommitStatus.class); + Structure result = Structure.,NodeCommitStatus>obtain(NodeCommitStatus.class); Structure nodeInfo = context.getDb().readInfo(localAbsPath, NodeInfo.status, NodeInfo.kind, NodeInfo.revision, NodeInfo.reposRelPath, NodeInfo.originalRevision, NodeInfo.originalReposRelpath, NodeInfo.lock, NodeInfo.changelist, NodeInfo.conflicted, NodeInfo.opRoot, NodeInfo.hadProps, diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgRepositoryAccess.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgRepositoryAccess.java index 16fdd4f..48890ca 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgRepositoryAccess.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/ng/SvnNgRepositoryAccess.java @@ -54,7 +54,7 @@ public class SvnNgRepositoryAccess extends SvnRepositoryAccess { revs.release(); } - Structure result = Structure.obtain(RepositoryInfo.class); + Structure result = Structure.,RepositoryInfo>obtain(RepositoryInfo.class); result.set(RepositoryInfo.revision, rev); result.set(RepositoryInfo.repository, repository); @@ -64,7 +64,7 @@ public class SvnNgRepositoryAccess extends SvnRepositoryAccess { } public Structure getURLFromPath(SvnTarget path, SVNRevision revision, SVNRepository repository) throws SVNException { - Structure urlInfo = Structure.obtain(UrlInfo.class); + Structure urlInfo = Structure.,UrlInfo>obtain(UrlInfo.class); SVNURL url = null; if (revision == SVNRevision.WORKING) { Structure nodeOrigin = getWCContext().getNodeOrigin(path.getFile(), false); @@ -93,7 +93,7 @@ public class SvnNgRepositoryAccess extends SvnRepositoryAccess { @Override public Structure getRevisionNumber(SVNRepository repository, SvnTarget path, SVNRevision revision, Structure youngestRevision) throws SVNException { - Structure result = youngestRevision == null ? Structure.obtain(RevisionsPair.class) : youngestRevision; + Structure result = youngestRevision == null ? Structure.,RevisionsPair>obtain(RevisionsPair.class) : youngestRevision; if (youngestRevision == null) { // initial value for the latest rev num result.set(RevisionsPair.youngestRevision, -1); diff --git a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/old/SvnOldRepositoryAccess.java b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/old/SvnOldRepositoryAccess.java index a8b9690..9fed0e7 100644 --- a/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/old/SvnOldRepositoryAccess.java +++ b/svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc2/old/SvnOldRepositoryAccess.java @@ -77,7 +77,7 @@ public class SvnOldRepositoryAccess extends SvnRepositoryAccess { revs.release(); } - Structure result = Structure.obtain(RepositoryInfo.class); + Structure result = Structure.,RepositoryInfo>obtain(RepositoryInfo.class); result.set(RepositoryInfo.revision, rev); result.set(RepositoryInfo.repository, repository); @@ -88,7 +88,7 @@ public class SvnOldRepositoryAccess extends SvnRepositoryAccess { @Override public Structure getRevisionNumber(SVNRepository repository, SvnTarget path, SVNRevision revision, Structure youngestRevision) throws SVNException { - Structure result = youngestRevision == null ? Structure.obtain(RevisionsPair.class) : youngestRevision; + Structure result = youngestRevision == null ? Structure.,RevisionsPair>obtain(RevisionsPair.class) : youngestRevision; if (repository == null && (revision == SVNRevision.HEAD || revision.getDate() != null)) { SVNErrorMessage err = SVNErrorMessage.create(SVNErrorCode.CLIENT_RA_ACCESS_REQUIRED); SVNErrorManager.error(err, SVNLogType.WC); @@ -141,7 +141,7 @@ public class SvnOldRepositoryAccess extends SvnRepositoryAccess { @Override public Structure getURLFromPath(SvnTarget path, SVNRevision revision, SVNRepository repository) throws SVNException { - Structure urlInfo = Structure.obtain(UrlInfo.class); + Structure urlInfo = Structure.,UrlInfo>obtain(UrlInfo.class); SVNURL url = null; SVNWCAccess wcAccess = SVNWCAccess.newInstance(null); try { debian/patches/fix-logging-path.patch0000644000000000000000000000173212162775344015020 0ustar From: Jakub Adam Date: Wed, 4 Jul 2012 23:26:15 +0200 Subject: fix-logging-path --- svnkit-cli/src/main/conf/logging.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svnkit-cli/src/main/conf/logging.properties b/svnkit-cli/src/main/conf/logging.properties index afb2206..ad5ead0 100644 --- a/svnkit-cli/src/main/conf/logging.properties +++ b/svnkit-cli/src/main/conf/logging.properties @@ -4,8 +4,8 @@ svnkit-wc.level=FINEST svnkit-cli.level=FINEST handlers = java.util.logging.FileHandler -java.util.logging.FileHandler.pattern = ../logs/svnkit.%u.log +java.util.logging.FileHandler.pattern = %h/svnkit.%u.log java.util.logging.FileHandler.limit = 0 java.util.logging.FileHandler.count = 1 java.util.logging.FileHandler.append = true -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter \ No newline at end of file +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter debian/patches/script-add-shebang.patch0000644000000000000000000000072112162775344015310 0ustar From: Jakub Adam Date: Wed, 4 Jul 2012 20:53:41 +0200 Subject: script-add-shebang --- svnkit-cli/src/main/scripts/jsvn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/svnkit-cli/src/main/scripts/jsvn b/svnkit-cli/src/main/scripts/jsvn index e4359ae..a149620 100644 --- a/svnkit-cli/src/main/scripts/jsvn +++ b/svnkit-cli/src/main/scripts/jsvn @@ -1,3 +1,5 @@ +#!/bin/sh + BASEDIR=`dirname $0`/.. BASEDIR=`(cd "$BASEDIR"; pwd)` debian/patches/script-fix-classpath.patch0000644000000000000000000000154112162775344015722 0ustar From: Jakub Adam Date: Wed, 4 Jul 2012 22:33:40 +0200 Subject: script-fix-classpath --- svnkit-cli/src/main/scripts/jsvn | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/svnkit-cli/src/main/scripts/jsvn b/svnkit-cli/src/main/scripts/jsvn index a149620..30a8c48 100644 --- a/svnkit-cli/src/main/scripts/jsvn +++ b/svnkit-cli/src/main/scripts/jsvn @@ -51,14 +51,8 @@ if [ ! -x "$JAVACMD" ] ; then exit 1 fi -if [ -z "$SVNKIT_LIB" ] -then - SVNKIT_LIB="$BASEDIR"/lib -fi - -CLASSPATH="$BASEDIR/conf" -CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/${classpathEntry}" -LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties" +CLASSPATH="/usr/share/svnkit/svnkit-cli.jar" +LOGGING_PROPERTIES_PATH="/etc/svnkit/logging.properties" # For Cygwin, switch paths to Windows format before running java if $cygwin; then debian/patches/series0000644000000000000000000000015212162775344012043 0ustar fix-build-javac-1.6.0_24.patch script-add-shebang.patch script-fix-classpath.patch fix-logging-path.patch debian/source/0000755000000000000000000000000011553511407010470 5ustar debian/source/format0000644000000000000000000000001411553511407011676 0ustar 3.0 (quilt) debian/svnkit.links0000644000000000000000000000056711553511407011560 0ustar etc/svnkit/logging.properties usr/share/svnkit/logging.properties usr/share/svnkit/jsvnsync usr/bin/jsvnsync usr/share/svnkit/jsvndumpfilter usr/bin/jsvndumpfilter usr/share/svnkit/jsvnversion usr/bin/jsvnversion usr/share/svnkit/jsvnlook usr/bin/jsvnlook usr/share/svnkit/jsvnadmin usr/bin/jsvnadmin usr/share/svnkit/jsvn usr/bin/jsvn debian/svnkit.manpages0000644000000000000000000000020411553511407012217 0ustar build/doc/jsvn.1 build/doc/jsvnadmin.1 build/doc/jsvndumpfilter.1 build/doc/jsvnlook.1 build/doc/jsvnsync.1 build/doc/jsvnversion.1 debian/watch0000644000000000000000000000023411553511407010220 0ustar version=3 opts=dversionmangle=s/\+dfsg// \ http://svnkit.com/download.php \ http://www.svnkit.com/org.tmatesoft.svn_(.+).src.zip debian debian/orig-tar.sh debian/00TODO0000644000000000000000000000012112036537700010013 0ustar * Maven support. libtrilead-ssh2-java also needs Maven support to enable this. debian/svnkit.lintian-overrides0000644000000000000000000000012512036537700014065 0ustar # /usr/share/svnkit/svnkit-cli.jar is a private jar svnkit binary: missing-classpath debian/changelog0000644000000000000000000000515412163305637011053 0ustar svnkit (1.7.5+dfsg-2) unstable; urgency=low * Removed obsolete DM-Upload-Allowed field from d/control. * Uploading this version into sid fixes FTBFS (Closes: #713784). -- Jakub Adam Fri, 28 Jun 2013 15:11:50 +0200 svnkit (1.7.5+dfsg-1) experimental; urgency=low * New upstream release. * Update format of d/copyright. * Bump Standards-Version to 3.9.4. * Use ant with our custom build.xml as a buildsystem, upstream now uses gradle. * Remove contrib/sequence/* from d/copyright. These sources are now provided in a different package. * Add Jakub Adam to Uploaders. * Add #! sequence at the beginning of executable scripts. * Fix classpath in executable scripts. -- Jakub Adam Fri, 21 Sep 2012 18:33:05 +0200 svnkit (1.3.5+dfsg-4) unstable; urgency=low * Drop the patch that fixes an FTBFS with subversion 1.7.5 because it didn't migrate to wheezy and now is causing an FTBFS with 1.6.x. (Closes: #684853). -- Miguel Landaeta Tue, 14 Aug 2012 19:22:32 -0430 svnkit (1.3.5+dfsg-3) unstable; urgency=low * Team upload. * Actually add the DMUA flag to d/control. -- Niels Thykier Thu, 21 Jun 2012 21:45:29 +0200 svnkit (1.3.5+dfsg-2) unstable; urgency=low [ Miguel Landaeta ] * 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. [ Niels Thykier ] * Ensure backward compatible byte code. * Set DMUA flag. -- Miguel Landaeta Thu, 21 Jun 2012 21:21:51 +0200 svnkit (1.3.5+dfsg-1) unstable; urgency=low [Miguel Landaeta] * New upstream release. * Bump Standards-Version to 3.9.2. No changes were required. * Correctly order the arguments in dh7 invocation. * Update dates in copyright file and make it DEP-5 compliant. * Wrap properly Build-Depends list. * Fix/override several lintian warnings about missing classpath declarations and empty directories. [tony mancill] * Tweak package descriptions in debian/control. -- Miguel Landaeta Wed, 20 Jul 2011 21:35:25 -0430 svnkit (1.3.3+dfsg-1) unstable; urgency=low * New upstream release. * svnkit now just depends on default-jre-headless. * Drop JRE dependences for libsvnkit-java as Java libraries are no longer required to depend on a JVM. -- Miguel Landaeta Tue, 04 May 2010 23:49:44 -0430 svnkit (1.3.2+dfsg-1) unstable; urgency=low * Initial release (closes: #570867). -- Miguel Landaeta Wed, 10 Mar 2010 20:08:02 -0430 debian/copyright0000644000000000000000000000774112162775344011145 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: SVNKit Upstream-Contact: TMate Software Ltd. Source: http://svnkit.com/download.php Files: * Copyright: 2004-2011, TMate Software Ltd. License: The TMate Open Source License Files: debian/* Copyright: 2010-2011, Miguel Landaeta 2012, Debian Java Maintainers License: Apache-2.0 Files: debian/build.xml Copyright: 2004-2011, TMate Software Ltd. 2012, Debian Java Maintainers License: The TMate Open Source License License: The TMate Open Source License The TMate Open Source License. . This license applies to all portions of TMate SVNKit library, which are not externally-maintained libraries (e.g. Ganymed SSH library). . All the source code and compiled classes in package org.tigris.subversion.javahl except SvnClient class are covered by the license in JAVAHL-LICENSE file . Copyright (c) 2004-2011 TMate Software. All rights reserved. . Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: . * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. . * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . * Redistributions in any form must be accompanied by information on how to obtain complete source code for the software that uses SVNKit and any accompanying software that uses the software that uses SVNKit. The source code must either be included in the distribution or be available for no more than the cost of distribution plus a nominal fee, and must be freely redistributable under reasonable conditions. For an executable file, complete source code means the source code for all modules it contains. It does not include source code for modules or files that typically accompany the major components of the operating system on which the executable file runs. . * Redistribution in any form without redistributing source code for software that uses SVNKit is possible only when such redistribution is explicitly permitted by TMate Software. Please, contact TMate Software at support@svnkit.com to get such permission. . THIS SOFTWARE IS PROVIDED BY TMATE SOFTWARE ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE DISCLAIMED. . IN NO EVENT SHALL TMATE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at . http://www.apache.org/licenses/LICENSE-2.0 /usr/share/common-licenses/Apache-2.0 (on Debian systems) . Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. debian/libsvnkit-java.jlibs0000644000000000000000000000006312162775344013151 0ustar build/lib/svnkit.jar build/lib/svnkit-javahl16.jar debian/svnkit.install0000644000000000000000000000060012162775344012103 0ustar build/lib/jsvnsync usr/share/svnkit build/lib/jsvndumpfilter usr/share/svnkit build/lib/jsvnversion usr/share/svnkit build/lib/jsvnlook usr/share/svnkit build/lib/jsvnadmin usr/share/svnkit build/lib/jsvn usr/share/svnkit build/lib/svnkit-cli.jar usr/share/svnkit svnkit-cli/src/main/conf/logging.properties etc/svnkit debian/ant.properties0000644000000000000000000000017712036537700012076 0ustar # 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 debian/README.Debian-source0000644000000000000000000000053212162775344012540 0ustar The upstream tarball has been modified as follows, to comply with DFSG: * Directory gradle was removed, since it contained binary .jar file and we don't use gradle build system anyway. * Directory svnkit-tests/nailgun was removed, because it contained an embedded copy of nailgun package's source code and precompiled binaries. debian/build.xml0000644000000000000000000001375612162775344011036 0ustar debian/control0000644000000000000000000000411412162775344010604 0ustar Source: svnkit Maintainer: Debian Java Maintainers Uploaders: Miguel Landaeta , Jakub Adam Section: java Priority: optional Build-Depends: debhelper (>> 7.0.50), ant, default-jdk, javahelper, libtrilead-ssh2-java (>= 6401), libjna-java, libsvn-java (>= 1.6.4dfsg), perl, libsqljet-java, libsequence-library-java, eclipse-rcp Standards-Version: 3.9.4 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 Package: svnkit Architecture: all Depends: default-jre-headless | java5-runtime-headless, libsvnkit-java (= ${binary:Version}), libtrilead-ssh2-java (>= 6401), libjna-java, libsequence-library-java, ${misc:Depends} Description: pure Java Subversion client SVNKit allows one to work with Subversion repositories and working copies. The SVNKit client features direct repository access as well as support for all high level Subversion operations available via the command-line Subversion client. Package: libsvnkit-java Architecture: all Depends: libtrilead-ssh2-java (>= 6401), libjna-java, libsqljet-java, libsequence-library-java, antlr3, ${misc:Depends} Recommends: libsvn-java (>= 1.7) Suggests: junit Description: pure Java Subversion client library SVNKit provides APIs to work with Subversion repositories and working copies. The SVNKit library features direct repository access as well as support for all high level Subversion operations available via the command-line Subversion client. Package: libsvnkit-java-doc Architecture: all Section: doc Depends: ${misc:Depends} Suggests: libsvnkit-java (= ${binary:Version}), default-jdk-doc Description: documentation for libsvnkit-java Documentation for SVNKit, which is a Java library that provides APIs to work with Subversion repositories and working copies. SVNKit features direct repository access as well as support for all high level Subversion operations that are available via the command-line Subversion client. debian/libsvnkit-java-doc.install0000644000000000000000000000015612162775344014262 0ustar build/doc/javadoc/* usr/share/doc/libsvnkit-java/api README.txt usr/share/doc/libsvnkit-java debian/rules0000755000000000000000000000171312162775344010263 0ustar #!/usr/bin/make -f export CLASSPATH=/usr/share/java/sqljet.jar:/usr/share/java/jna.jar:/usr/share/java/sequence-library.jar:/usr/share/java/trilead-ssh2.jar:/usr/share/java/svn-javahl.jar:/usr/share/java/svnkit.jar %: dh $@ --with javahelper override_dh_auto_build: VERSION=$$(dpkg-parsechangelog | grep Version: | cut -d' ' -f 2); \ echo $$VERSION | { \ IFS='.-+' read MAJOR MINOR MICRO DFSG DEBIAN; \ export MAJOR MINOR MICRO DEBIAN; \ ant -f debian/build.xml -propertyfile debian/ant.properties; \ }; for script in jsvn jsvnadmin jsvndumpfilter jsvnlook jsvnsync jsvnversion; do \ pod2man -c '' -r '' debian/$${script}.pod > build/doc/$${script}.1 ; \ done ; override_dh_auto_clean: ant -f debian/build.xml clean override_dh_compress: dh_compress -X.java get-orig-source: cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \ uscan \ --verbose \ --no-symlink \ --destdir $(CURDIR) \ --watchfile debian/watch \ --force-download