[freecol] 56/125: [freecol] drop woodstox

[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 a9650fe061340127a1da6925857123c91af559d4
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Mon Jan 30 23:42:22 2012 +0000

    [freecol] drop woodstox
---
 debian/changelog         | 12 ++++++++++++
 debian/control           |  2 +-
 debian/freecol.classpath |  2 +-
 debian/rules             |  2 +-
 debian/wrapper/freecol   |  2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a41e3a..74b572f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+freecol (0.10.0+dfsg-5) unstable; urgency=low
+ 
+  [ Giovanni Mascellani ]
+  * Remove the libwoodstox-java dependency, which isn't necessary. 
+  (closes: #650745)
+
+  [ Vincent Fourmond ]
+  * Fix classpath, which fixes problems with starting the game when newer
+    woodstox is installed (closes: #657866)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 29 Jan 2012 16:04:03 +0100
+
 freecol (0.10.0+dfsg-4) unstable; urgency=low
 
   * Handle the rename of ttf-liberation to fonts-liberation (and the
diff --git a/debian/control b/debian/control
index b7c5437..dc85c29 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5), ant, openjdk-6-jdk, cdbs
-Build-Depends-Indep: libwoodstox-java,
+Build-Depends-Indep:
  tex4ht, texlive-binaries | texlive-base-bin, ant-optional,
  texlive-latex-recommended, libcommons-cli-java, libmiglayout-java,
  libcortado-java, javahelper
diff --git a/debian/freecol.classpath b/debian/freecol.classpath
index 62bec31..a356045 100644
--- a/debian/freecol.classpath
+++ b/debian/freecol.classpath
@@ -1 +1 @@
-usr/share/java/freecol.jar miglayout.jar wstx-lgpl.jar cortado.jar commons-cli.jar
+usr/share/java/freecol.jar miglayout.jar cortado.jar commons-cli.jar
diff --git a/debian/rules b/debian/rules
index 45abaed..0a60ed1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ JAVA_HOME_DIRS       := /usr/lib/jvm/java-7-openjdk-$(arch) \
 	/usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := ant-launcher ant-nodeps \
-	miglayout wstx-lgpl commons-cli cortado
+	miglayout commons-cli cortado
 DEB_ANT_COMPILER     := modern
 DEB_ANT_BUILD_TARGET := package online-manual print-manual
 DEB_BUILDDIR         := .
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
index 8f3b469..a674fb3 100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@ -6,7 +6,7 @@
 # We need openjdk, icedtea  or Sun 6
 find_java_runtime openjdk java6
 
-find_jars miglayout wstx-lgpl freecol cortado commons-cli
+find_jars miglayout freecol cortado commons-cli
 
 # We test if LC_MESSAGES is different from LC_CTYPE, if that is the case,
 # we pass to freecol the --default-locale argument

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