r6906 - packages/trunk/freecol/debian

[Vincent Fourmond]

Author: fourmond
Date: 2008-05-08 06:33:54 +0000 (Thu, 08 May 2008)
New Revision: 6906

Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/control
Log:
[freecol] Adding openjdk-6 as an alternative dependency

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2008-05-08 03:43:54 UTC (rev 6905)
+++ packages/trunk/freecol/debian/changelog	2008-05-08 06:33:54 UTC (rev 6906)
@@ -1,8 +1,10 @@
 freecol (0.7.3-3) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Adding openjdk-6-* as alternative (Build-)?Deps, thanks to 
+    Matvey Kozhev <inetperson at gmail.com> for pointing out (closes: #480107)
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 03 May 2008 21:27:51 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 08 May 2008 08:32:20 +0200
 
 freecol (0.7.3-2) unstable; urgency=low
 

Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control	2008-05-08 03:43:54 UTC (rev 6905)
+++ packages/trunk/freecol/debian/control	2008-05-08 06:33:54 UTC (rev 6906)
@@ -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), dpatch, 
- ant, icedtea-java7-jdk | sun-java6-jdk
+ ant, openjdk-6-jdk | icedtea-java7-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,8 +15,8 @@
 
 Package: freecol
 Architecture: all
-Depends: icedtea-java7-jre | sun-java6-jre | j2re1.6 , libhiglayout-java, 
- libwoodstox-java, , java-wrappers (>= 0.1.4)
+Depends: openjdk-6-jre | icedtea-java7-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
  colonial background. Colonize a new world, build towns, trade or fight