[SCM] transportation simulator branch, master, updated. debian/100.0+ds1-4-12-g47beeac

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 47beeac1c5de774b1946f4a0126a036de4b04c29
Author: Ansgar Burchardt <ansgar at 2008.43-1.org>
Date:   Sun Jan 18 18:54:13 2009 +0100

    debian/copyright: Add additional copyright holders, move license text to its own section.

diff --git a/debian/changelog b/debian/changelog
index 2ec09c6..ac73acb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ simutrans (101.0-1) UNRELEASED; urgency=low
   * debian/simutrans.desktop: Add Icon key (LP: #314093).
   * Add patch revert-svn-1937.diff to continue using ~/.simutrans for
     savegames.  Document this in README.Debian.
+  * debian/copyright: Add additional copyright holders, move license text to
+    its own section.
 
  -- Ansgar Burchardt <ansgar at 43-1.org>  Sun, 04 Jan 2009 20:51:07 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 3c948dd..eb094d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,29 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Original-Source: http://sourceforge.net/projects/simutrans
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=226
+Upstream-Name: Simutrans
+Upstream-Maintainer: prissi
+Upstream-Source: http://sourceforge.net/projects/simutrans
 
 Files: *
 Copyright: © 1997-2003, Hansjoerg Malthaner
            © 2004-2008, Simutrans Team <team64 at simutrans.com>
+           © 2008, Dwachs
+           © 2008, Markus Pristovsek
            © 2008, prissi
 License: Artistic
- Simutrans source code is provided by the current simutrans team
- (team64 at simutrans.com) as copyright holder under the artistic licence.
- .
- This includes the translations from:
- http://translator.simutrans.com/
- the midi files and the fonts with the execption of the m+10r.bdf, which
- is taken from the M+ font project:
- http://mplus-fonts.sourceforge.jp/
- .
- --------------------------------------------------------------------------
- .
+
+Files: simutrans/font/m+10r.bdf
+Copyright: © 2002-2006, M+ FONTS PROJECT
+License: other
+ These fonts are free softwares.
+ Unlimited permission is granted to use, copy, and distribute it, with or
+ without modification, either commercially and noncommercially.
+ THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
+
+Files: debian/*
+Copyright: © 2008, Ansgar Burchardt <ansgar at 43-1.org>
+License: Artistic
+
+License: Artistic
  The Artistic License
  .
  Preamble
@@ -124,16 +131,3 @@ License: Artistic
  .
  The End
 
-Files: simutrans/font/m+10r.bdf
-Copyright: © 2002-2006, M+ FONTS PROJECT
-License: other
- These fonts are free softwares.
- Unlimited permission is granted to use, copy, and distribute it, with or
- without modification, either commercially and noncommercially.
- THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
-
-Files: debian/*
-Copyright: © 2008, Ansgar Burchardt <ansgar at 43-1.org>
-License: Artistic
- This program is released under the terms of the Artistic License.
-

-- 
transportation simulator