r7906 - in packages/trunk/freecol/debian: . wrapper

[Vincent Fourmond]

Author: fourmond
Date: 2008-08-09 20:42:54 +0000 (Sat, 09 Aug 2008)
New Revision: 7906

Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/control
   packages/trunk/freecol/debian/watch
   packages/trunk/freecol/debian/wrapper/freecol
Log:
[freecol] Should now be ready to move to main, great !

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2008-08-09 12:48:13 UTC (rev 7905)
+++ packages/trunk/freecol/debian/changelog	2008-08-09 20:42:54 UTC (rev 7906)
@@ -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
 

Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control	2008-08-09 12:48:13 UTC (rev 7905)
+++ packages/trunk/freecol/debian/control	2008-08-09 20:42:54 UTC (rev 7906)
@@ -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 @@
 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

Modified: packages/trunk/freecol/debian/watch
===================================================================
--- packages/trunk/freecol/debian/watch	2008-08-09 12:48:13 UTC (rev 7905)
+++ packages/trunk/freecol/debian/watch	2008-08-09 20:42:54 UTC (rev 7906)
@@ -5,4 +5,4 @@
 # 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 

Modified: packages/trunk/freecol/debian/wrapper/freecol
===================================================================
--- packages/trunk/freecol/debian/wrapper/freecol	2008-08-09 12:48:13 UTC (rev 7905)
+++ packages/trunk/freecol/debian/wrapper/freecol	2008-08-09 20:42:54 UTC (rev 7906)
@@ -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