Author: fourmond
Date: 2007-10-08 14:38:22 +0000 (Mon, 08 Oct 2007)
New Revision: 4362
Added:
packages/trunk/freecol/debian/docs
Modified:
packages/trunk/freecol/debian/
packages/trunk/freecol/debian/README.Debian
packages/trunk/freecol/debian/changelog
packages/trunk/freecol/debian/control
packages/trunk/freecol/debian/copyright
packages/trunk/freecol/debian/menu
packages/trunk/freecol/debian/rules
Log:
[freecol] Cleared last copyright problems + now installing doc
Property changes on: packages/trunk/freecol/debian
___________________________________________________________________
Name: svn-bp:origUrl
+ http://pkg-games.alioth.debian.org/tarballs/freecol_0.7.2.orig.tar.gz
Modified: packages/trunk/freecol/debian/README.Debian
===================================================================
--- packages/trunk/freecol/debian/README.Debian 2007-10-08 14:11:23 UTC (rev 4361)
+++ packages/trunk/freecol/debian/README.Debian 2007-10-08 14:38:22 UTC (rev 4362)
@@ -4,8 +4,8 @@
This package has been repackaged from source, as upstream tarballs include
binary-only libraries. This will hopefully change in next releases.
-Additionally, the directory for saves has been renamed .freecol, as it
-doesn't clutter home directories this way and seems to be the current
-(unspoken, at least) policy for games.
+Additionally, the directory for saves has been moved to ~/.freecol, as
+it doesn't clutter home directories this way and seems to be the
+current (unspoken, at least) policy for games.
-- Vincent Fourmond <fourmond at debian.org> Mon, 01 Oct 2007 23:58:51 +0200
Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog 2007-10-08 14:11:23 UTC (rev 4361)
+++ packages/trunk/freecol/debian/changelog 2007-10-08 14:38:22 UTC (rev 4362)
@@ -1,7 +1,9 @@
freecol (0.7.2-1) UNRELEASED; urgency=low
* Initial release (Closes: #444199)
- * DO NOT UPLOAD THIS PACKAGE, there are still license issues.
+ * {10,15}-fix-jar*: switch to external libraries for binary only jars.
+ * 20-freecol-executable: the freecol executable.
+ * 25-change-save-dir: switch saves directory to ~/.freecol
+ * Menu entry
- -- Vincent Fourmond <fourmond at debian.org> Tue, 02 Oct 2007 20:08:07 +0200
-
+ -- Vincent Fourmond <fourmond at debian.org> Mon, 08 Oct 2007 15:56:18 +0200
Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control 2007-10-08 14:11:23 UTC (rev 4361)
+++ packages/trunk/freecol/debian/control 2007-10-08 14:38:22 UTC (rev 4362)
@@ -5,7 +5,7 @@
Uploaders: Vincent Fourmond <fourmond at debian.org>
Build-Depends: debhelper (>= 5), dpatch, ant
Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
- sun-java6-jdk | sun-java5-jdk
+ sun-java6-jdk | sun-java5-jdk, tex4ht, texlive-base-bin
Standards-Version: 3.7.2
Package: freecol
Modified: packages/trunk/freecol/debian/copyright
===================================================================
--- packages/trunk/freecol/debian/copyright 2007-10-08 14:11:23 UTC (rev 4361)
+++ packages/trunk/freecol/debian/copyright 2007-10-08 14:38:22 UTC (rev 4362)
@@ -2,8 +2,8 @@
Mon, 01 Oct 2007 23:58:51 +0200.
The original tarball was made downloading the freecol-0.7.2-src.tar.gz
-tarball on http://www.freecol.org/download.html, applying the
-freecol-dist-targz.diff and then using the ant target
+tarball on http://www.freecol.org/download.html, applying the patch
+debian/freecol-dist-targz.diff and then using the ant target
tarDistBundle. Hopefully, this will get included upstream so I won't
have to bother later on.
@@ -60,14 +60,12 @@
data/images/ui/exploration.png
data/images/ui/landing.png
-The following files are probably subject to the same conditions, but
-that is not yet clear:
+The following files were downloaded from Wikimedia and are in the public
+domain:
data/images/monarch/*
-
data/images/ui/bg_europe.jpg
data/images/ui/doi.png
-data/images/ui/map-americas.png
The Debian packaging is (C) 2007, Vincent Fourmond <fourmond at debian.org> and
Added: packages/trunk/freecol/debian/docs
===================================================================
--- packages/trunk/freecol/debian/docs (rev 0)
+++ packages/trunk/freecol/debian/docs 2007-10-08 14:38:22 UTC (rev 4362)
@@ -0,0 +1,3 @@
+doc/FreeCol.pdf
+doc/images
+doc/FreeCol.html
\ No newline at end of file
Modified: packages/trunk/freecol/debian/menu
===================================================================
--- packages/trunk/freecol/debian/menu 2007-10-08 14:11:23 UTC (rev 4361)
+++ packages/trunk/freecol/debian/menu 2007-10-08 14:38:22 UTC (rev 4362)
@@ -1,2 +1,2 @@
-?package(freecol):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
- title="freecol" command="/usr/bin/freecol"
+?package(freecol):needs="X11" section="Games/Strategy"\
+ title="FreeCol" command="/usr/games/freecol"
Modified: packages/trunk/freecol/debian/rules
===================================================================
--- packages/trunk/freecol/debian/rules 2007-10-08 14:11:23 UTC (rev 4361)
+++ packages/trunk/freecol/debian/rules 2007-10-08 14:38:22 UTC (rev 4362)
@@ -10,13 +10,17 @@
SOURCE_VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | egrep -o '[0-9][^-]+')
build: build-stamp
-build-stamp: patch
+build-stamp: patch doc-saved
dh_testdir
+
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
+
touch build-stamp
clean: clean-patched unpatch
@@ -25,8 +29,13 @@
dh_testroot
rm -f build-stamp freecol*.jar
ant clean
+# We now move the doc-saved/ directory back to doc/, if it exists.
+ -[ -d doc-saved ] && ( rm -Rf doc ; mv doc-saved doc )
dh_clean
+doc-saved:
+ [ -d doc-saved ] || cp -a doc doc-saved
+
# Build architecture-independent files here.
binary-indep: build
# We have nothing to do by default.
@@ -36,6 +45,7 @@
dh_installchangelogs
dh_installdocs
dh_installman
+ dh_installmenu
dh_link
dh_compress
dh_fixperms
@@ -46,7 +56,7 @@
dh_builddeb
# Build architecture-dependent files here.
-binary-arch: build
+binary-arch:
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install