[freecol] 25/125: [freecol] Adding openjdk-6 as an alternative dependency

[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 6a3c70832d62fa4524f2743e043bbe0a0d2182ce
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Thu May 8 06:33:54 2008 +0000

    [freecol] Adding openjdk-6 as an alternative dependency
---
 debian/changelog | 4 +++-
 debian/control   | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ba1ef7..1136add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
 
diff --git a/debian/control b/debian/control
index 355b7b3..cd80104 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), 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 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/freecol
 
 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

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