[freecol] 05/125: [freecol] Moved saves to ~/.freecol + nearly last copyright/author hunt

[Markus Koschany]

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

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

commit 7b40b2dbd0c4636afe711ecdd8fe75a81ee189c9
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sun Oct 7 13:32:45 2007 +0000

    [freecol] Moved saves to ~/.freecol + nearly last copyright/author hunt
---
 debian/README.Debian                     |  4 ++++
 debian/copyright                         | 28 ++++++++++++++++++++++------
 debian/patches/00list                    |  3 ++-
 debian/patches/25-change-save-dir.dpatch | 27 +++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 71d3f4e..9d3f592 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,4 +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.
+
  -- Vincent Fourmond <fourmond at debian.org>  Mon, 01 Oct 2007 23:58:51 +0200
diff --git a/debian/copyright b/debian/copyright
index 4e7aea2..61ec3cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ Copyright:
     A number of images are fidel copies of objects in the public
     domain and are thus not copyrightable (see for instance 
     http://en.wikipedia.org/wiki/Bridgeman_Art_Library_v._Corel_Corp
-    for more information).
+    for more information). See the list below.
 
     The font data/fonts/ShadowedBlack.ttf is 
     Copyright Paul Lloyd <Paul.Lloyd at uwa.edu.au>
@@ -28,9 +28,8 @@ Copyright:
 
 License:
 
-    All files except those not copyrightable and
-    data/fonts/ShadowedBlack.ttf are provided under the following
-    conditions:
+    All files except those not copyrightable are provided under the
+    following conditions:
 
     This package is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -49,9 +48,26 @@ License:
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
 
-ATTENTION !!!
+Here is a list of files that are coming from David Rumsey's Map
+Collection, but are not copyrightable, being fidel copies of original
+artwork long gone into the public domain:
 
-The license for the data/fonts/ShadowedBlack.ttf is not clear yet.
+data/images/ui/bg_map1.jpg
+data/images/ui/military.png
+data/images/ui/political.png
+data/images/ui/religious.png
+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:
+
+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/patches/00list b/debian/patches/00list
index 64a31f4..40917fd 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,4 @@
 10-fix-jar-path
 15-fix-jar-manifest
-20-freecol-executable
\ No newline at end of file
+20-freecol-executable
+25-change-save-dir
\ No newline at end of file
diff --git a/debian/patches/25-change-save-dir.dpatch b/debian/patches/25-change-save-dir.dpatch
new file mode 100755
index 0000000..a807e00
--- /dev/null
+++ b/debian/patches/25-change-save-dir.dpatch
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25-change-save-dir.dpatch by  <fourmond at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change the directory for saved games
+
+ at DPATCH@
+diff -urNad freecol-0.7.2~/src/net/sf/freecol/FreeCol.java freecol-0.7.2/src/net/sf/freecol/FreeCol.java
+--- freecol-0.7.2~/src/net/sf/freecol/FreeCol.java	2007-10-02 19:40:37.000000000 +0200
++++ freecol-0.7.2/src/net/sf/freecol/FreeCol.java	2007-10-02 21:24:13.000000000 +0200
+@@ -374,14 +374,14 @@
+      * Creates a freecol dir for the current user.
+      * 
+      * The directory is created within the current user's
+-     * home directory. This directory will be called "freecol"
++     * home directory. This directory will be called ".freecol"
+      * and underneath that directory a "save" directory will
+      * be created.
+      */
+     private static void createAndSetDirectories() {
+         // TODO: The location of the save directory should be determined by the installer.;
+         
+-        File mainUserDirectory = new File(System.getProperty("user.home"), "freecol");
++        File mainUserDirectory = new File(System.getProperty("user.home"), ".freecol");
+         if (mainUserDirectory.exists() && mainUserDirectory.isFile()) {
+             logger.warning("Could not create .freecol under "
+                     + System.getProperty("user.home") + " because there "

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