r13190 - in packages/trunk/freecol/debian: . wrapper

[Vincent Fourmond]

Author: fourmond
Date: 2012-01-30 23:42:22 +0000 (Mon, 30 Jan 2012)
New Revision: 13190

Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/control
   packages/trunk/freecol/debian/freecol.classpath
   packages/trunk/freecol/debian/rules
   packages/trunk/freecol/debian/wrapper/freecol
Log:
[freecol] drop woodstox

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2012-01-30 23:40:49 UTC (rev 13189)
+++ packages/trunk/freecol/debian/changelog	2012-01-30 23:42:22 UTC (rev 13190)
@@ -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

Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control	2012-01-30 23:40:49 UTC (rev 13189)
+++ packages/trunk/freecol/debian/control	2012-01-30 23:42:22 UTC (rev 13190)
@@ -4,7 +4,7 @@
 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

Modified: packages/trunk/freecol/debian/freecol.classpath
===================================================================
--- packages/trunk/freecol/debian/freecol.classpath	2012-01-30 23:40:49 UTC (rev 13189)
+++ packages/trunk/freecol/debian/freecol.classpath	2012-01-30 23:42:22 UTC (rev 13190)
@@ -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

Modified: packages/trunk/freecol/debian/rules
===================================================================
--- packages/trunk/freecol/debian/rules	2012-01-30 23:40:49 UTC (rev 13189)
+++ packages/trunk/freecol/debian/rules	2012-01-30 23:42:22 UTC (rev 13190)
@@ -21,7 +21,7 @@
 	/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         := .

Modified: packages/trunk/freecol/debian/wrapper/freecol
===================================================================
--- packages/trunk/freecol/debian/wrapper/freecol	2012-01-30 23:40:49 UTC (rev 13189)
+++ packages/trunk/freecol/debian/wrapper/freecol	2012-01-30 23:42:22 UTC (rev 13190)
@@ -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