This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository eclipse-jgit.
commit a17989ca85c9edefeb65d6d73f49d77840d6d6e8 Author: Emmanuel Bourg <[email protected]> Date: Tue Sep 22 14:17:03 2015 +0200 Refreshed the patches --- debian/changelog | 4 +++- debian/patches/debian-custom-build.patch | 12 ++++------ debian/patches/ftbfs-args4j-2.0.30-fix.patch | 36 ++++++---------------------- 3 files changed, 14 insertions(+), 38 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2f73c76..9acc6fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -jgit (3.7.0-2) UNRELEASED; urgency=medium +jgit (3.7.1-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Updated debian/watch -- Emmanuel Bourg <[email protected]> Tue, 22 Sep 2015 14:13:37 +0200 diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch index 182882f..9b1c966 100644 --- a/debian/patches/debian-custom-build.patch +++ b/debian/patches/debian-custom-build.patch @@ -13,11 +13,9 @@ Subject: debian-custom-build pom.xml | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) -diff --git a/org.eclipse.jgit.pgm/jgit.sh b/org.eclipse.jgit.pgm/jgit.sh -index 6b9ce40..3700d4f 100644 --- a/org.eclipse.jgit.pgm/jgit.sh +++ b/org.eclipse.jgit.pgm/jgit.sh -@@ -86,7 +86,7 @@ Darwin) +@@ -90,7 +90,7 @@ ;; esac @@ -26,11 +24,9 @@ index 6b9ce40..3700d4f 100644 export CLASSPATH java=java -diff --git a/pom.xml b/pom.xml -index edd2e6e..79fdb90 100644 --- a/pom.xml +++ b/pom.xml -@@ -410,6 +410,7 @@ +@@ -430,6 +430,7 @@ <links> <link>http://java.sun.com/j2se/1.5.0/docs/api</link> </links> @@ -38,7 +34,7 @@ index edd2e6e..79fdb90 100644 </configuration> <executions> <execution> -@@ -547,7 +548,7 @@ +@@ -602,7 +603,7 @@ </activation> <modules> <module>org.eclipse.jgit.java7</module> @@ -47,7 +43,7 @@ index edd2e6e..79fdb90 100644 </modules> </profile> <profile> -@@ -634,11 +635,11 @@ +@@ -712,11 +713,11 @@ <module>org.eclipse.jgit.http.server</module> <module>org.eclipse.jgit.pgm</module> <module>org.eclipse.jgit.junit</module> diff --git a/debian/patches/ftbfs-args4j-2.0.30-fix.patch b/debian/patches/ftbfs-args4j-2.0.30-fix.patch index 08e4c0a..97a84ea 100644 --- a/debian/patches/ftbfs-args4j-2.0.30-fix.patch +++ b/debian/patches/ftbfs-args4j-2.0.30-fix.patch @@ -20,11 +20,9 @@ Added 'hidden' argument to OptionDef constructor. .../src/org/eclipse/jgit/pgm/opt/CmdLineParser.java | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java -index 8f911fd..e424bf7 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java -@@ -75,7 +75,7 @@ +@@ -78,7 +78,7 @@ private String name; @Argument(index = 1) @@ -33,8 +31,6 @@ index 8f911fd..e424bf7 100644 private List<String> paths = new ArrayList<String>(); @Override -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java -index 04182d6..65a6c2b 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Daemon.java @@ -75,16 +75,16 @@ @@ -58,15 +54,13 @@ index 04182d6..65a6c2b 100644 final List<String> forbidOverride = new ArrayList<String>(); @Option(name = "--export-all", usage = "usage_exportWithoutGitDaemonExportOk") -@@ -159,4 +159,4 @@ private static DaemonService service( +@@ -159,4 +159,4 @@ throw die(MessageFormat.format(CLIText.get().serviceNotSupported, n)); return svc; } -} \ No newline at end of file +} -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java -index 8f05168..3db8ce2 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java @@ -89,7 +89,7 @@ @@ -78,11 +72,9 @@ index 8f05168..3db8ce2 100644 private TreeFilter pathFilter = TreeFilter.ALL; // BEGIN -- Options shared with Log -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java -index d89053c..90d7c06 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/DiffTree.java -@@ -69,7 +69,7 @@ void tree_0(final AbstractTreeIterator c) { +@@ -69,7 +69,7 @@ @Argument(index = 1, metaVar = "metaVar_treeish", required = true) private final List<AbstractTreeIterator> trees = new ArrayList<AbstractTreeIterator>(); @@ -91,8 +83,6 @@ index d89053c..90d7c06 100644 private TreeFilter pathFilter = TreeFilter.ALL; @Override -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java -index 4b16ed8..4da8e09 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/LsTree.java @@ -67,7 +67,7 @@ @@ -104,11 +94,9 @@ index 4b16ed8..4da8e09 100644 private List<String> paths = new ArrayList<String>(); @Override -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java -index d6063c3..a223587 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/RevWalkTextBuiltin.java -@@ -126,7 +126,7 @@ void enableBoundary(final boolean on) { +@@ -126,7 +126,7 @@ @Argument(index = 0, metaVar = "metaVar_commitish") private final List<RevCommit> commits = new ArrayList<RevCommit>(); @@ -117,8 +105,6 @@ index d6063c3..a223587 100644 protected TreeFilter pathFilter = TreeFilter.ALL; private final List<RevFilter> revLimiter = new ArrayList<RevFilter>(); -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java -index a33a2d4..bcff628 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java @@ -87,7 +87,7 @@ @@ -130,8 +116,6 @@ index a33a2d4..bcff628 100644 protected TreeFilter pathFilter = TreeFilter.ALL; // BEGIN -- Options shared with Diff -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java -index 2ae950b..0bab32e 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java @@ -75,7 +75,7 @@ @@ -143,11 +127,9 @@ index 2ae950b..0bab32e 100644 protected List<String> filterPaths; @Override -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java -index 91b5917..ed2818d 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java -@@ -111,13 +111,13 @@ DiffAlgorithm create() { +@@ -111,13 +111,13 @@ // // @@ -163,11 +145,9 @@ index 91b5917..ed2818d 100644 List<File> gitDirs = new ArrayList<File>(); @Option(name = "--count", metaVar = "LIMIT", usage = "Number of file revisions to be compared") -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java -index 4205140..72425f1 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java -@@ -250,16 +250,16 @@ public int fold(int hash, int bits) { +@@ -250,16 +250,16 @@ // // @@ -187,11 +167,9 @@ index 4205140..72425f1 100644 List<File> gitDirs = new ArrayList<File>(); @Override -diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java -index 3f77aa6..ee0f2b3 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/opt/CmdLineParser.java -@@ -184,7 +184,7 @@ public RevWalk getRevWalkGently() { +@@ -184,7 +184,7 @@ static class MyOptionDef extends OptionDef { public MyOptionDef(OptionDef o) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
