[freecol] 91/125: Drop commons-cli-1.3.patch

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freecol.

commit ecfb10c4c5f4e02500898f442054a48466b2881e
Author: Markus Koschany <apo at debian.org>
Date:   Sat Dec 19 23:17:49 2015 +0100

    Drop commons-cli-1.3.patch
---
 debian/patches/commons-cli-1.3.patch | 29 -----------------------------
 debian/patches/series                |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/commons-cli-1.3.patch b/debian/patches/commons-cli-1.3.patch
deleted file mode 100644
index bae4e74..0000000
--- a/debian/patches/commons-cli-1.3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Sat, 12 Sep 2015 00:53:37 +0200
-Subject: commons cli 1.3
-
----
- src/net/sf/freecol/FreeCol.java | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
-index 3cdf52e..a973298 100644
---- a/src/net/sf/freecol/FreeCol.java
-+++ b/src/net/sf/freecol/FreeCol.java
-@@ -299,6 +299,7 @@ public final class FreeCol {
-     private static void handleArgs(String[] args) {
-         // create the command line parser
-         CommandLineParser parser = new PosixParser();
-+        final Class dummy = null;
- 
-         /**
-          * Ugly hack: try to determine language first, so that usage,
-@@ -338,7 +339,7 @@ public final class FreeCol {
-         options.addOption(OptionBuilder.withLongOpt("home-directory")
-                           .withDescription(Messages.message("cli.home-directory"))
-                           .withArgName(Messages.message("cli.arg.directory"))
--                          .withType(new File("dummy"))
-+                          .withType(dummy)
-                           .hasArg()
-                           .create());
-         options.addOption(OptionBuilder.withLongOpt("log-console")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 56fb36b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-commons-cli-1.3.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git