r5972 - in packages/trunk/freecol/debian: . patches wrapper

[Vincent Fourmond]

Author: fourmond
Date: 2008-02-29 22:17:59 +0000 (Fri, 29 Feb 2008)
New Revision: 5972

Added:
   packages/trunk/freecol/debian/NEWS
   packages/trunk/freecol/debian/patches/40-manpage.dpatch
Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/control
   packages/trunk/freecol/debian/patches/00list
   packages/trunk/freecol/debian/wrapper/freecol
Log:
[freecol] Ready for upload !

Added: packages/trunk/freecol/debian/NEWS
===================================================================
--- packages/trunk/freecol/debian/NEWS	                        (rev 0)
+++ packages/trunk/freecol/debian/NEWS	2008-02-29 22:17:59 UTC (rev 5972)
@@ -0,0 +1,8 @@
+freecol (0.7.3-1) unstable; urgency=low
+
+  Apparently, saves for earlier versions of freecol might not be valid 
+  with this version; please exercise caution, as this problem will 
+  probably never get fixed.
+  
+
+ -- Vincent Fourmond <fourmond at debian.org>  Fri, 29 Feb 2008 22:53:29 +0100

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2008-02-29 20:45:39 UTC (rev 5971)
+++ packages/trunk/freecol/debian/changelog	2008-02-29 22:17:59 UTC (rev 5972)
@@ -1,17 +1,18 @@
-freecol (0.7.3-1) UNRELEASED; urgency=low
+freecol (0.7.3-1) unstable; urgency=low
 
   [ Ansgar Burchardt ]
   * Remove deprecated Encoding key from .desktop file
 
   [ Vincent Fourmond ]
-  * NOT RELEASED YET
   * New upstream release (Closes: #465490)
     - dropped 30-language-option, included upstream
     - updated 10-fix-jar-path and 15-fix-jar-manifest
   * Now providing a debian/new-upstream to repackage upstream tarball
-  * PLEASE DO NOT UPLOAD !!!!!!!!!!!!!!!!!!!!
+  * Added a NEWS file
+  * Switched to java-wrappers for the wrapper script
+    - 40-manpage to point the user to java-wrappers(7)
 
- -- Vincent Fourmond <fourmond at debian.org>  Fri, 29 Feb 2008 21:44:16 +0100
+ -- Vincent Fourmond <fourmond at debian.org>  Fri, 29 Feb 2008 23:09:02 +0100
 
 freecol (0.7.2-5) unstable; urgency=low
 

Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control	2008-02-29 20:45:39 UTC (rev 5971)
+++ packages/trunk/freecol/debian/control	2008-02-29 22:17:59 UTC (rev 5972)
@@ -16,7 +16,7 @@
 Package: freecol
 Architecture: all
 Depends: icedtea-java7-jre | sun-java6-jre | j2re1.6 , libhiglayout-java, 
- libwoodstox-java, java-wrappers
+ 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

Modified: packages/trunk/freecol/debian/patches/00list
===================================================================
--- packages/trunk/freecol/debian/patches/00list	2008-02-29 20:45:39 UTC (rev 5971)
+++ packages/trunk/freecol/debian/patches/00list	2008-02-29 22:17:59 UTC (rev 5972)
@@ -2,4 +2,5 @@
 15-fix-jar-manifest
 # 20-freecol-executable
 25-change-save-dir
-# 30-language-option
\ No newline at end of file
+# 30-language-option
+40-manpage
\ No newline at end of file

Added: packages/trunk/freecol/debian/patches/40-manpage.dpatch
===================================================================
--- packages/trunk/freecol/debian/patches/40-manpage.dpatch	                        (rev 0)
+++ packages/trunk/freecol/debian/patches/40-manpage.dpatch	2008-02-29 22:17:59 UTC (rev 5972)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-manpage.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freecol-0.7.3~/packaging/debian/freecol.6 freecol-0.7.3/packaging/debian/freecol.6
+--- freecol-0.7.3~/packaging/debian/freecol.6	2008-02-29 20:50:14.000000000 +0100
++++ freecol-0.7.3/packaging/debian/freecol.6	2008-02-29 23:08:34.000000000 +0100
+@@ -59,8 +59,25 @@
+ Starts a stand-alone server on the specifed port.
+ .SH LICENSE
+ FreeCol is available under GPL license terms.
++
++.SH JAVA-WRAPPERS NOTE
++
++This program is a shell script wrapper based on
++.BR java-wrappers (7).
++You therefore benefit from several features; please see the 
++.BR java-wrappers (7)
++manual page.
++
++
+ .SH SEE ALSO
++
+ Homepage: http://freecol.sourceforge.net/
++
++.BR java-wrappers (7)
++
+ .SH AUTHOR
+-This manual page was written by Jean Lepropre <jean_lepropre at users.sourceforge.net>,
++This manual page was written by Jean Lepropre
++<jean_lepropre at users.sourceforge.net>, 
+ for the Debian project (but may be used by others).
++
++It was updated by Vincent Fourmond <fourmond at debian.org>


Property changes on: packages/trunk/freecol/debian/patches/40-manpage.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/trunk/freecol/debian/wrapper/freecol
===================================================================
--- packages/trunk/freecol/debian/wrapper/freecol	2008-02-29 20:45:39 UTC (rev 5971)
+++ packages/trunk/freecol/debian/wrapper/freecol	2008-02-29 22:17:59 UTC (rev 5972)
@@ -3,14 +3,16 @@
 # Including wrapper script:
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-find_java_runtime sun6
+# We need either icedtea or Sun 6, for now
+find_java_runtime icedtea sun6
 
+find_jars higlayout wstx-lgpl freecol
+
 # We test if LC_MESSAGES is different from LC_CTYPE, if that is the case,
 # we pass to freecol the --default-locale argument
 if [ "$LC_CTYPE" != "$LC_MESSAGES" -a "$LC_MESSAGES" ]; then
     lang_argument="--default-locale=$LC_MESSAGES"
 fi
 
-export JAVA=${JAVA:=java}
-exec $JAVA -Xmx128M -jar /usr/share/java/freecol.jar --freecol-data \
+run_java -Xmx128M net.sf.freecol.FreeCol --freecol-data \
     /usr/share/games/freecol $lang_argument "$@"