[eclipse-jgit] 03/03: Refreshed d/patches/ftbfs-args4j-2.0.25-fix.patch

[Jakub Adam]

This is an automated email from the git hooks/post-receive script.

xhaakon-guest pushed a commit to branch master
in repository eclipse-jgit.

commit 946708d78841adca367691e0077c7960581e08f6
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Mon Dec 23 19:21:40 2013 +0100

    Refreshed d/patches/ftbfs-args4j-2.0.25-fix.patch
---
 debian/changelog                             |  1 +
 debian/patches/ftbfs-args4j-2.0.25-fix.patch | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c8067df..c0b132c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jgit (3.2.0-1) UNRELEASED; urgency=medium
 
   * New Upstream release.
+  * Refreshed d/patches/ftbfs-args4j-2.0.25-fix.patch.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 23 Dec 2013 19:18:17 +0100
 
diff --git a/debian/patches/ftbfs-args4j-2.0.25-fix.patch b/debian/patches/ftbfs-args4j-2.0.25-fix.patch
index 3916860..68e3954 100644
--- a/debian/patches/ftbfs-args4j-2.0.25-fix.patch
+++ b/debian/patches/ftbfs-args4j-2.0.25-fix.patch
@@ -91,10 +91,10 @@ index e444d21..5249552 100644
  
  	@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 4327403..ba0493a 100644
+index 847bf7f..3109544 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
-@@ -124,7 +124,7 @@ void enableBoundary(final boolean on) {
+@@ -126,7 +126,7 @@ void enableBoundary(final boolean on) {
  	@Argument(index = 0, metaVar = "metaVar_commitish")
  	private final List<RevCommit> commits = new ArrayList<RevCommit>();
  
@@ -117,12 +117,12 @@ index a33a2d4..bcff628 100644
  
  	// 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 0214ed0..8a22d0c 100644
+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
-@@ -71,7 +71,7 @@
- 
- 	protected final String statusFileListFormatUnmerged = CLIText.get().statusFileListFormatUnmerged;
+@@ -75,7 +75,7 @@
+ 	@Option(name = "--porcelain", usage = "usage_machineReadableOutput")
+ 	protected boolean porcelain;
  
 -	@Option(name = "--", metaVar = "metaVar_path", multiValued = true)
 +	@Option(name = "--", metaVar = "metaVar_path")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-jgit.git