[SCM] transportation simulator branch, master, updated. debian/102.2+svn2786-1-7-g346cb85

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 346cb85952b596a992a4c11a9804d9ba994e5d1d
Author: Ansgar Burchardt <ansgar at 43-1.org>
Date:   Sat Dec 19 21:05:41 2009 +0900

    do not use "Artistic" as short name for the license
    
    debian/copyright: Do not use "Artistic" as short name for the license.
    Also update to current revision of DEP-5.
    
    Closes: #524732
    Signed-off-by: Ansgar Burchardt <ansgar at 43-1.org>

diff --git a/debian/copyright b/debian/copyright
index eb094d8..2c56ed1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,14 @@
-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
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: Simutrans
+Maintainer: prissi
+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
-
-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
@@ -131,3 +116,15 @@ 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: other
+ The Debian packaging is released under the same terms as Simutrans itself.

-- 
transportation simulator