[freecol] 06/125: [freecol] Cleared last copyright problems + now installing doc

Sun Dec 20 19:39:02 UTC 2015

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit b1cce30b6131ae721a02b0bf4c6ddf3ab5410c2a
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Mon Oct 8 14:38:22 2007 +0000

    [freecol] Cleared last copyright problems + now installing doc
---
 debian/README.Debian |  6 +++---
 debian/changelog     |  8 +++++---
 debian/control       |  2 +-
 debian/copyright     | 10 ++++------
 debian/docs          |  3 +++
 debian/menu          |  4 ++--
 debian/rules         | 14 ++++++++++++--
 7 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 9d3f592..246d871 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,8 +4,8 @@ freecol for Debian
 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
diff --git a/debian/changelog b/debian/changelog
index 1c58fca..af15c67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
-
- -- Vincent Fourmond <fourmond at debian.org>  Tue, 02 Oct 2007 20:08:07 +0200
+  * {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>  Mon, 08 Oct 2007 15:56:18 +0200
diff --git a/debian/control b/debian/control
index 79bed94..0019f0e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 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
diff --git a/debian/copyright b/debian/copyright
index 61ec3cb..b3445d5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,8 +2,8 @@ This package was debianized by Vincent Fourmond <fourmond at debian.org> on
 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/trade.png
 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
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..a2e72b6
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,3 @@
+doc/FreeCol.pdf
+doc/images
+doc/FreeCol.html
\ No newline at end of file
diff --git a/debian/menu b/debian/menu
index fb738be..ccc1d7d 100644
--- a/debian/menu
+++ b/debian/menu
@@ -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"
diff --git a/debian/rules b/debian/rules
index 9992d06..6bb86a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,17 @@ include /usr/share/dpatch/dpatch.make
 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 @@ clean-patched:
 	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 @@ binary-indep: build
 	dh_installchangelogs
 	dh_installdocs
 	dh_installman
+	dh_installmenu
 	dh_link
 	dh_compress
 	dh_fixperms
@@ -46,7 +56,7 @@ binary-indep: build
 	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

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

