Package: freecol
Version: 0.10.0+dfsg-4
Severity: normal
Tags: patch

Hi.

Apparently freecol doesn't really need the libwoodstox-java dependency:
that library is referenced nowhere in the code and I could successfully
compile it in a clean chroot without the libwoodstox-java dependency
after having applied the attached patch. Moreover, I installed the
generated package and could play with it for a few minutes without problems.

Please, consider applying it to your source, so I can update
libwoodstox-java without having to bother with freecol compatibility. If
you don't want to work on it anymore, I can also take over
libwoodstox-java maintainance.

Thanks, Giovanni.

--- System information. ---
Architecture: amd64
Kernel:       Linux 3.0.0-2-amd64

Debian Release: wheezy/sid
  500 unstable        www.toastfreeware.priv.at
  500 unstable        www.debian-multimedia.org
  500 unstable        poisson.phc.unipi.it
  500 unstable        ftp.it.debian.org
  500 stable          security.debian.org

--- Package information. ---
Depends                      (Version) | Installed
======================================-+-===============
openjdk-6-jre                          | 6b23~pre11-1
 OR java6-runtime                      |
java-wrappers              (>= 0.1.13) | 0.1.24
libcommons-cli-java                    | 1.2-3
libcortado-java                        | 0.6.0-1
libmiglayout-java                      | 3.7.4-2
fonts-liberation        (>= 1.07.0-2~) | 1.07.0-2


Package's Recommends field is empty.

Package's Suggests field is empty.




-- 
Giovanni Mascellani <[email protected]>
Pisa, Italy

Web: http://poisson.phc.unipi.it/~mascellani
Jabber: [email protected] / [email protected]
diff -Nru freecol-0.10.0+dfsg/debian/changelog freecol-0.10.0+dfsg/debian/changelog
--- freecol-0.10.0+dfsg/debian/changelog	2011-10-24 19:29:32.000000000 +0200
+++ freecol-0.10.0+dfsg/debian/changelog	2011-12-02 15:30:22.000000000 +0100
@@ -1,3 +1,10 @@
+freecol (0.10.0+dfsg-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove the libwoodstox-java dependency, which isn't necessary.
+
+ -- Giovanni Mascellani <[email protected]>  Fri, 02 Dec 2011 15:06:27 +0100
+
 freecol (0.10.0+dfsg-4) unstable; urgency=low
 
   * Handle the rename of ttf-liberation to fonts-liberation (and the
diff -Nru freecol-0.10.0+dfsg/debian/control freecol-0.10.0+dfsg/debian/control
--- freecol-0.10.0+dfsg/debian/control	2011-10-24 19:28:41.000000000 +0200
+++ freecol-0.10.0+dfsg/debian/control	2011-12-02 15:06:47.000000000 +0100
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <[email protected]>
 Uploaders: Vincent Fourmond <[email protected]>
 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 -Nru freecol-0.10.0+dfsg/debian/freecol.classpath freecol-0.10.0+dfsg/debian/freecol.classpath
--- freecol-0.10.0+dfsg/debian/freecol.classpath	2011-06-25 19:08:09.000000000 +0200
+++ freecol-0.10.0+dfsg/debian/freecol.classpath	2011-12-02 15:07:35.000000000 +0100
@@ -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 -Nru freecol-0.10.0+dfsg/debian/rules freecol-0.10.0+dfsg/debian/rules
--- freecol-0.10.0+dfsg/debian/rules	2011-10-24 19:27:39.000000000 +0200
+++ freecol-0.10.0+dfsg/debian/rules	2011-12-02 15:07:27.000000000 +0100
@@ -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         := .
diff -Nru freecol-0.10.0+dfsg/debian/wrapper/freecol freecol-0.10.0+dfsg/debian/wrapper/freecol
--- freecol-0.10.0+dfsg/debian/wrapper/freecol	2011-06-25 19:08:09.000000000 +0200
+++ freecol-0.10.0+dfsg/debian/wrapper/freecol	2011-12-02 15:07:19.000000000 +0100
@@ -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

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to