[freecol] 71/125: Imported Debian patch 0.10.7+dfsg-4

[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 2a33d118ef0e4cb9de6dcd0f23aed3b265439ec3
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sat Sep 19 22:32:50 2015 +0200

    Imported Debian patch 0.10.7+dfsg-4
---
 debian/changelog                     | 14 ++++++++++++++
 debian/control                       |  2 +-
 debian/copyright                     |  3 ---
 debian/patches/commons-cli-1.3.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 5 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1080439..b16674e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+freecol (0.10.7+dfsg-4) unstable; urgency=medium
+
+  [ Markus Koschany ]
+  * Team upload.
+  * Add commons-cli-1.3.patch and fix java.lang.ClassCastException due to
+    deprecated and different methods in libcommons-cli-java version 1.3.1.
+    Thanks to Emmanuel Fleury for the report. (Closes: #798699)
+
+  [ Vincent Fourmond ]
+  * Conforms to recent standards  
+  * Cleanup a tidbit the debian/copyright file
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 19 Sep 2015 22:32:50 +0200
+
 freecol (0.10.7+dfsg-3) unstable; urgency=medium
 
   * Disable intro video to avoid hanging at startup (closes: #771700)
diff --git a/debian/control b/debian/control
index 5f9556c..ba1ce70 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends-Indep:
  texlive-binaries | texlive-base-bin,
  texlive-latex-recommended,
  texlive-fonts-recommended
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.freecol.org
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/freecol
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/freecol
diff --git a/debian/copyright b/debian/copyright
index 027b81b..690ac7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -38,17 +38,14 @@ License: GPL-2+
 Files: debian/*
 Copyright: Copyright (C) 2007-2009 Vincent Fourmond <fourmond at debian.org>
 License: GPL-2+
-  (see above)
 
 Files: data/fonts/ShadowedBlack.ttf is
 Copyright: Copyright Paul Lloyd <Paul.Lloyd at uwa.edu.au>
 License: GPL-2+
-  (see above)
 
 Files: packaging/gentoo/freecol-0.3.0.ebuild is
 Copyright: Copyright 1999-2004 Gentoo Foundation
 License: GPL-2+
-  (see above)
 
 Files: data/images/ui/bg_map1.jpg
        data/images/ui/military.png
diff --git a/debian/patches/commons-cli-1.3.patch b/debian/patches/commons-cli-1.3.patch
new file mode 100644
index 0000000..bae4e74
--- /dev/null
+++ b/debian/patches/commons-cli-1.3.patch
@@ -0,0 +1,29 @@
+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
index 14a85c2..8a4873f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10-fix-jar-path.diff
 40-manpage.diff
+commons-cli-1.3.patch

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