Package: freecol
Version: 0.7.3-2

icedtea-java7 has been removed from Ubuntu (the original motivation for
including it in the freecol and libwoodstox-java packages) and never
made it past NEW in Debian.

In Ubuntu, these packages have migrated to openjdk-6. I propose doing
the same in Debian. I have attached a patch for debian/control and
debian/rules.
diff -ur freecol-0.7.3~/debian/control freecol-0.7.3/debian/control
--- freecol-0.7.3~/debian/control	2008-05-08 11:28:49.000000000 +0700
+++ freecol-0.7.3/debian/control	2008-05-08 11:29:56.000000000 +0700
@@ -4,7 +4,7 @@
 Maintainer: Debian Games Team <[EMAIL PROTECTED]>
 Uploaders: Vincent Fourmond <[EMAIL PROTECTED]>
 Build-Depends: debhelper (>= 5), dpatch, 
- ant, icedtea-java7-jdk | sun-java6-jdk
+ ant, openjdk-6-jdk | sun-java6-jdk
 Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
   tex4ht, texlive-base-bin, ant-optional, texlive-latex-recommended
 Standards-Version: 3.7.3
@@ -15,7 +15,7 @@
 
 Package: freecol
 Architecture: all
-Depends: icedtea-java7-jre | sun-java6-jre | j2re1.6 , libhiglayout-java, 
+Depends: openjdk-6-jre | sun-java6-jre | j2re1.6 , libhiglayout-java, 
  libwoodstox-java, , java-wrappers (>= 0.1.4)
 Description: an open version of Colonization
  freecol is a game in the spirit of Civilization but taking place in a
diff -ur freecol-0.7.3~/debian/rules freecol-0.7.3/debian/rules
--- freecol-0.7.3~/debian/rules	2008-05-08 11:28:49.000000000 +0700
+++ freecol-0.7.3/debian/rules	2008-05-08 11:29:37.000000000 +0700
@@ -8,7 +8,7 @@
 include /usr/share/dpatch/dpatch.make
 
 SOURCE_VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | egrep -o '[0-9][^-]+' | head -n 1)
-JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-6-sun/lib ] && echo "/usr/lib/jvm/java-6-sun"), /usr/lib/jvm/java-7-icedtea)
+JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-6-sun/lib ] && echo "/usr/lib/jvm/java-6-sun"), /usr/lib/jvm/java-6-openjdk)
 ANT = JAVA_HOME=$(JAVA_HOME) TEX4HTENV=/etc/tex4ht/tex4ht.env ant
 
 build: build-stamp

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to