[freecol] 32/125: [freecol] Should now be ready to move to main, great !

[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 673d23fbdea6c6ae6571cff3e828448fde7b7f30
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sat Aug 9 20:42:54 2008 +0000

    [freecol] Should now be ready to move to main, great !
---
 debian/changelog       | 7 ++++++-
 debian/control         | 4 ++--
 debian/watch           | 2 +-
 debian/wrapper/freecol | 4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4cff67..847a6d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 freecol (0.7.4.dfsg-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Fix watchfile to ignore the alpha releases (users and developers
+    seem to complain about their stability).
+  * Add openjdk in the wrapper script, and tighten up dependency on
+    java-wrappers accordingly.
+  * freecol can now move to main ! (closes: #491260)
 
- -- Vincent Fourmond <fourmond at debian.org>  Sun, 22 Jun 2008 09:44:50 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 09 Aug 2008 22:39:39 +0200
 
 freecol (0.7.4.dfsg-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index cd80104..01d9aa5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: freecol
-Section: contrib/games
+Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Vincent Fourmond <fourmond at debian.org>
@@ -16,7 +16,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/freecol
 Package: freecol
 Architecture: all
 Depends: openjdk-6-jre | icedtea-java7-jre | sun-java6-jre | j2re1.6 , 
- libhiglayout-java, libwoodstox-java, , java-wrappers (>= 0.1.4)
+ libhiglayout-java, libwoodstox-java, , java-wrappers (>= 0.1.6)
 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
diff --git a/debian/watch b/debian/watch
index 4d52b66..f65a3bf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -5,4 +5,4 @@ version=3
 # a new upstream version !!! The watchfile works, but the downloaded
 # archive should not go to debian - you need to repackage it.
 opts=dversionmangle=s/\.dfsg// \
-http://sf.net/freecol/freecol-(.*)-src\.tar\.gz debian debian/new-upstream 
+http://sf.net/freecol/freecol-(?!.*alpha)(.*)-src\.tar\.gz debian debian/new-upstream 
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
index 5645c80..bd85918 100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@ -3,8 +3,8 @@
 # Including wrapper script:
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-# We need either icedtea or Sun 6, for now
-find_java_runtime icedtea sun6
+# We need openjdk, icedtea or Sun 6
+find_java_runtime openjdk icedtea sun6
 
 find_jars higlayout wstx-lgpl freecol
 

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