Author: fourmond
Date: 2007-10-26 19:30:47 +0000 (Fri, 26 Oct 2007)
New Revision: 4468
Modified:
packages/trunk/freecol/debian/changelog
packages/trunk/freecol/debian/control
packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch
packages/trunk/freecol/debian/rules
packages/trunk/freecol/debian/watch
Log:
[freecol] fixing recent RC-bugs + fixing manual
Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog 2007-10-26 16:23:46 UTC (rev
4467)
+++ packages/trunk/freecol/debian/changelog 2007-10-26 19:30:47 UTC (rev
4468)
@@ -1,12 +1,16 @@
-freecol (0.7.2-2) UNRELEASED; urgency=low
+freecol (0.7.2-2) unstable; urgency=high
- * NOT RELEASED YET
-
[ Barry deFreese ]
* Fix watch file
- -- Vincent Fourmond <[EMAIL PROTECTED]> Mon, 08 Oct 2007 17:29:26 +0200
+ [ Vincent Fourmond ]
+ * Apparently, I cannot build freecol for java5, as libraries
+ are missing. Switching to java6 (Closes: #448082, #448083)
+ * Urgency high to fix two RC bugs in testing
+ * Fixing table of contents and links in PDF manual
+ -- Vincent Fourmond <[EMAIL PROTECTED]> Fri, 26 Oct 2007 21:27:20 +0200
+
freecol (0.7.2-1) unstable; urgency=low
* Initial release (Closes: #444199)
Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control 2007-10-26 16:23:46 UTC (rev
4467)
+++ packages/trunk/freecol/debian/control 2007-10-26 19:30:47 UTC (rev
4468)
@@ -3,14 +3,16 @@
Priority: optional
Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Vincent Fourmond <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), dpatch, ant
+Build-Depends: debhelper (>= 5), dpatch,
+ ant, sun-java6-jdk
Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
- sun-java6-jdk | sun-java5-jdk, tex4ht, texlive-base-bin
+ tex4ht, texlive-base-bin, ant-optional
+Build-Conflicts: sun-java5-jdk, sun-java5-bin, sun-java5-jre
Standards-Version: 3.7.2
Package: freecol
Architecture: all
-Depends: sun-java6-jre | sun-java5-jre, libhiglayout-java,
+Depends: sun-java6-jre, libhiglayout-java,
libwoodstox-java
Description: an open version of Colonization
freecol is a game in the spirit of Civilization but taking place in a
Modified: packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch
===================================================================
--- packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch
2007-10-26 16:23:46 UTC (rev 4467)
+++ packages/trunk/freecol/debian/patches/20-freecol-executable.dpatch
2007-10-26 19:30:47 UTC (rev 4468)
@@ -5,21 +5,20 @@
## DP: No description.
@DPATCH@
-diff -urNad freecol-0.7.3~svn20071001~/src/freecol
freecol-0.7.3~svn20071001/src/freecol
---- freecol-0.7.3~svn20071001~/src/freecol 1970-01-01 01:00:00.000000000
+0100
-+++ freecol-0.7.3~svn20071001/src/freecol 2007-10-02 18:11:49.000000000
+0200
-@@ -0,0 +1,17 @@
+diff -urNad freecol-0.7.2~/src/freecol freecol-0.7.2/src/freecol
+--- freecol-0.7.2~/src/freecol 1970-01-01 01:00:00.000000000 +0100
++++ freecol-0.7.2/src/freecol 2007-10-26 20:48:10.000000000 +0200
+@@ -0,0 +1,16 @@
+#!/bin/sh
+
+# Script 'greatly inspired' from the one of jabref
+
-+# Unless there already is a JAVA_HOME, we detect the presence
-+# of either sun 5 or sun 6
++# Unless there already is a JAVA_HOME, we use java6
+
+if [ -z "$JAVA_HOME" ]
+then
-+t=/usr/lib/jvm/java-5-sun && test -d $t && JAVA_HOME=$t
-+t=/usr/lib/jvm/java-6-sun && test -d $t && JAVA_HOME=$t
++# t=/usr/lib/jvm/java-1.5.0-sun && test -d $t && JAVA_HOME=$t
++JAVA_HOME=/usr/lib/jvm/java-6-sun
+JAVA=${JAVA_HOME}/jre/bin/java
+fi
+
Modified: packages/trunk/freecol/debian/rules
===================================================================
--- packages/trunk/freecol/debian/rules 2007-10-26 16:23:46 UTC (rev 4467)
+++ packages/trunk/freecol/debian/rules 2007-10-26 19:30:47 UTC (rev 4468)
@@ -13,13 +13,15 @@
build-stamp: patch doc-saved
dh_testdir
- ant package
+ JAVA_HOME=/usr/lib/jvm/java-6-sun ant package
# Then according to current Java policy, we move the freecol.jar file
# to a versioned one.
[ -e freecol-$(SOURCE_VERSION).jar ] || mv freecol.jar
freecol-$(SOURCE_VERSION).jar
[ -e freecol.jar ] || ln -s freecol-$(SOURCE_VERSION).jar freecol.jar
# Then, we make the manual:
- ant manual
+ ant online-manual
+ rm -f doc/FreeCol.aux
+ ant print-manual
touch build-stamp
Modified: packages/trunk/freecol/debian/watch
===================================================================
--- packages/trunk/freecol/debian/watch 2007-10-26 16:23:46 UTC (rev 4467)
+++ packages/trunk/freecol/debian/watch 2007-10-26 19:30:47 UTC (rev 4468)
@@ -1,4 +1,7 @@
# Compulsory line, this is a version 3 file
version=3
+# Don't forget to look into debian/copyright first before packaging
+# a new upstream version !!! The watchfile works, but the downloaded
+# archive should not go to debian - you need to repackage it.
http://sf.net/freecol/freecol-(.*)-src\.tar\.gz
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
