This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository svnkit.
commit 47ef65b159c2d05576f66296b6cb44ac8d85d68b Author: Markus Koschany <[email protected]> Date: Sun Mar 16 12:18:34 2014 +0100 Drop fix-build-javac-1.6.0_24.patch. Java7 is the default now. --- debian/patches/fix-build-javac-1.6.0_24.patch | 260 -------------------------- debian/patches/series | 1 - 2 files changed, 261 deletions(-) diff --git a/debian/patches/fix-build-javac-1.6.0_24.patch b/debian/patches/fix-build-javac-1.6.0_24.patch deleted file mode 100644 index 80705d7..0000000 --- a/debian/patches/fix-build-javac-1.6.0_24.patch +++ /dev/null @@ -1,260 +0,0 @@ -From: Jakub Adam <[email protected]> -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<NodeOriginInfo> result = Structure.obtain(NodeOriginInfo.class, fields); -+ Structure<NodeOriginInfo> result = Structure.<Structure<NodeOriginInfo>,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<RepositoryInfo> fetchRepositoryInfo(SVNSqlJetDb sDb, long repos_id) throws SVNException { -- Structure<RepositoryInfo> info = Structure.obtain(RepositoryInfo.class); -+ Structure<RepositoryInfo> info = Structure.<Structure<RepositoryInfo>,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<PristineInfo> result = Structure.obtain(PristineInfo.class); -+ Structure<PristineInfo> result = Structure.<Structure<PristineInfo>,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<CopyInfo> getCopyInfo(SVNWCDbRoot wcRoot, File localRelPath) throws SVNException { -- Structure<CopyInfo> result = Structure.obtain(CopyInfo.class); -+ Structure<CopyInfo> result = Structure.<Structure<CopyInfo>,CopyInfo>obtain(CopyInfo.class); - result.set(CopyInfo.haveWork, false); - - Structure<NodeInfo> 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<ExternalNodeInfo> externalInfo = Structure.obtain(ExternalNodeInfo.class); -+ Structure<ExternalNodeInfo> externalInfo = Structure.<Structure<ExternalNodeInfo>,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<ExternalNodeInfo> info = Structure.obtain(ExternalNodeInfo.class, fields); -+ Structure<ExternalNodeInfo> info = Structure.<Structure<ExternalNodeInfo>,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<ExternalNodeInfo> externalInfo = Structure.obtain(ExternalNodeInfo.class); -+ Structure<ExternalNodeInfo> externalInfo = Structure.<Structure<ExternalNodeInfo>,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<ReplaceInfo> readNodeReplaceInfo(SVNWCDb db, File localAbspath, ReplaceInfo... fields) throws SVNException { - -- Structure<ReplaceInfo> result = Structure.obtain(ReplaceInfo.class, fields); -+ Structure<ReplaceInfo> result = Structure.<Structure<ReplaceInfo>,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<WalkerChildInfo> childInfo = children.get(childName); - if (childInfo == null) { -- childInfo = Structure.obtain(WalkerChildInfo.class); -+ childInfo = Structure.<Structure<WalkerChildInfo>,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<RevertInfo> result = Structure.obtain(RevertInfo.class); -+ Structure<RevertInfo> result = Structure.<Structure<RevertInfo>,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<AdditionInfo> scanAddition(SVNWCDbRoot root, File localRelpath, AdditionInfo... fields) throws SVNException { -- Structure<AdditionInfo> info = Structure.obtain(AdditionInfo.class, fields); -+ Structure<AdditionInfo> info = Structure.<Structure<AdditionInfo>, 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<DeletionInfo> scanDeletion(SVNWCDbRoot root, File localRelpath) throws SVNException { -- Structure<DeletionInfo> info = Structure.obtain(DeletionInfo.class); -+ Structure<DeletionInfo> info = Structure.<Structure<DeletionInfo>,DeletionInfo>obtain(DeletionInfo.class); - - SVNWCDbStatus childPresence = SVNWCDbStatus.BaseDeleted; - boolean childHasBase = false; -@@ -325,7 +325,7 @@ public class SvnWcDbShared { - } - - protected static Structure<NodeInfo> getDepthInfo(SVNWCDbRoot wcroot, File localRelPath, long opDepth, NodeInfo...fields) throws SVNException { -- Structure<NodeInfo> info = Structure.obtain(NodeInfo.class, fields); -+ Structure<NodeInfo> info = Structure.<Structure<NodeInfo>,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<NodeInfo> readInfo(SVNWCDbRoot wcRoot, File localRelPath, boolean isAdditionMode, NodeInfo... fields) throws SVNException { -- Structure<NodeInfo> info = Structure.obtain(NodeInfo.class, fields); -+ Structure<NodeInfo> info = Structure.<Structure<NodeInfo>,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<LocationsInfo> result = Structure.obtain(LocationsInfo.class); -+ Structure<LocationsInfo> result = Structure.<Structure<LocationsInfo>,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<NodeCommitStatus> getNodeCommitStatus(SVNWCContext context, File localAbsPath) throws SVNException { -- Structure<NodeCommitStatus> result = Structure.obtain(NodeCommitStatus.class); -+ Structure<NodeCommitStatus> result = Structure.<Structure<NodeCommitStatus>,NodeCommitStatus>obtain(NodeCommitStatus.class); - Structure<NodeInfo> 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<RepositoryInfo> result = Structure.obtain(RepositoryInfo.class); -+ Structure<RepositoryInfo> result = Structure.<Structure<RepositoryInfo>,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<UrlInfo> getURLFromPath(SvnTarget path, SVNRevision revision, SVNRepository repository) throws SVNException { -- Structure<UrlInfo> urlInfo = Structure.obtain(UrlInfo.class); -+ Structure<UrlInfo> urlInfo = Structure.<Structure<UrlInfo>,UrlInfo>obtain(UrlInfo.class); - SVNURL url = null; - if (revision == SVNRevision.WORKING) { - Structure<NodeOriginInfo> nodeOrigin = getWCContext().getNodeOrigin(path.getFile(), false); -@@ -93,7 +93,7 @@ public class SvnNgRepositoryAccess extends SvnRepositoryAccess { - - @Override - public Structure<RevisionsPair> getRevisionNumber(SVNRepository repository, SvnTarget path, SVNRevision revision, Structure<RevisionsPair> youngestRevision) throws SVNException { -- Structure<RevisionsPair> result = youngestRevision == null ? Structure.obtain(RevisionsPair.class) : youngestRevision; -+ Structure<RevisionsPair> result = youngestRevision == null ? Structure.<Structure<RevisionsPair>,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<RepositoryInfo> result = Structure.obtain(RepositoryInfo.class); -+ Structure<RepositoryInfo> result = Structure.<Structure<RepositoryInfo>,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<RevisionsPair> getRevisionNumber(SVNRepository repository, SvnTarget path, SVNRevision revision, Structure<RevisionsPair> youngestRevision) throws SVNException { -- Structure<RevisionsPair> result = youngestRevision == null ? Structure.obtain(RevisionsPair.class) : youngestRevision; -+ Structure<RevisionsPair> result = youngestRevision == null ? Structure.<Structure<RevisionsPair>,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<UrlInfo> getURLFromPath(SvnTarget path, SVNRevision revision, SVNRepository repository) throws SVNException { -- Structure<UrlInfo> urlInfo = Structure.obtain(UrlInfo.class); -+ Structure<UrlInfo> urlInfo = Structure.<Structure<UrlInfo>,UrlInfo>obtain(UrlInfo.class); - SVNURL url = null; - SVNWCAccess wcAccess = SVNWCAccess.newInstance(null); - try { diff --git a/debian/patches/series b/debian/patches/series index 69d0691..98e2ae8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -fix-build-javac-1.6.0_24.patch script-add-shebang.patch script-fix-classpath.patch fix-logging-path.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
