[eclipse-jgit] 01/01: Fix FTBFS with args4j 2.0.30

[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 f9d2141a766a9bd8930d6f87ba9faaeedc269aca
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Fri Sep 19 20:24:58 2014 +0200

    Fix FTBFS with args4j 2.0.30
---
 debian/changelog                                                    | 6 ++++++
 debian/control                                                      | 2 +-
 ...{ftbfs-args4j-2.0.25-fix.patch => ftbfs-args4j-2.0.30-fix.patch} | 6 +++---
 debian/patches/series                                               | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c0b7cc..9862e6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jgit (3.4.0-2) UNRELEASED; urgency=medium
+
+  * Fix FTBFS with args4j 2.0.30 (Closes: #761537).
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Fri, 19 Sep 2014 20:29:28 +0200
+
 jgit (3.4.0-1) unstable; urgency=medium
 
   * New Upstream release.
diff --git a/debian/control b/debian/control
index 53497f2..653c738 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9~),
                cdbs,
                javahelper,
                default-jdk,
-               libargs4j-java,
+               libargs4j-java (>= 2.0.30),
                libbuild-helper-maven-plugin-java,
                libcommons-compress-java,
                libequinox-osgi-java,
diff --git a/debian/patches/ftbfs-args4j-2.0.25-fix.patch b/debian/patches/ftbfs-args4j-2.0.30-fix.patch
similarity index 98%
rename from debian/patches/ftbfs-args4j-2.0.25-fix.patch
rename to debian/patches/ftbfs-args4j-2.0.30-fix.patch
index 9078c2b..08e4c0a 100644
--- a/debian/patches/ftbfs-args4j-2.0.25-fix.patch
+++ b/debian/patches/ftbfs-args4j-2.0.30-fix.patch
@@ -1,6 +1,6 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Tue, 3 Dec 2013 16:00:31 +0100
-Subject: ftbfs-args4j-2.0.25-fix
+Subject: ftbfs-args4j-2.0.30-fix
 
 Setting multiValued was removed from @Option in args4j 2.0.23
 as it had no effect.
@@ -188,7 +188,7 @@ index 4205140..72425f1 100644
  
  	@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..595e772 100644
+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() {
@@ -196,7 +196,7 @@ index 3f77aa6..595e772 100644
  
  		public MyOptionDef(OptionDef o) {
 -			super(o.usage(), o.metaVar(), o.required(), o.handler(), o
-+			super(o.usage(), o.metaVar(), o.required(), o.hidden(), o.handler(), o
++			super(o.usage(), o.metaVar(), o.required(), o.help(), o.hidden(), o.handler(), o
  					.isMultiValued());
  		}
  
diff --git a/debian/patches/series b/debian/patches/series
index 5beecbc..45169c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 debian-custom-build.patch
-ftbfs-args4j-2.0.25-fix.patch
+ftbfs-args4j-2.0.30-fix.patch
 unversioned-orbit-dependencies.patch
 fix-jgit-pgm-test-dependencies.patch

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