[SCM] cytadela: old-school first person shooter branch, master, updated. upstream/0.9-10-g15689be

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 15689be45a9ebe18ddc2716d9e34111759fe8f76
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Mon Jun 7 15:10:47 2010 +0200

    Move to 'contrib' because there's no tools to modify the game levels

diff --git a/debian/changelog b/debian/changelog
index 488b761..4d4eca9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,10 @@
 cytadela (1.0.0-1) unstable; urgency=low
 
-  * New Upstream Version
+  * Initial release (Closes: #578703)
   * Improve description
   * Fix watch file (tar.gz -> tar.bz2)
   * Update copyright information
   * Update dependencies (to play intro&ending videos)
   * Move AUTHORS, README and NEWS from 'cytadela' to 'cytadela-data'
 
- -- Sylvain Beucler <beuc at beuc.net>  Sun, 16 May 2010 13:14:53 +0200
-
-cytadela (0.9-1) unstable; urgency=low
-
-  * Initial release (Closes: #578703)
-
- -- Sylvain Beucler <beuc at beuc.net>  Thu, 22 Apr 2010 00:31:56 +0200
+ -- Sylvain Beucler <beuc at debian.org>  Mon, 07 Jun 2010 14:35:50 +0200
diff --git a/debian/control b/debian/control
index 9e4a1db..d550146 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: cytadela
-Section: games
+Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Sylvain Beucler <beuc at beuc.net>
+Uploaders: Sylvain Beucler <beuc at debian.org>
 Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev, libvlc-dev
 Standards-Version: 3.8.4
 Homepage: http://cytadela.sf.net/
@@ -29,7 +29,7 @@ Description: old-school first person shooter game
  controllers.
 
 Package: cytadela-dbg
-Section: debug
+Section: contrib/debug
 Priority: extra
 Architecture: any
 Depends: cytadela (= ${binary:Version}), ${misc:Depends}
diff --git a/debian/copyright b/debian/copyright
index ada8ac5..eedc9fc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,34 @@ It was downloaded from:
 
     <http://cytadela.sf.net/>
 
+
+This package in in the 'contrib' archive area and is not part of the
+Debian GNU/Linux distribution.
+
+The reason is that while the game data is free, there is no published
+software to modify the game levels:
+
+- .cmf and .3dg are generated from the original game's map files,
+  using the 'mapconv' converter:
+  http://sourceforge.net/projects/cytadela/files/mapconv/
+
+  That's the files we have no way to modify, neither in the original
+  or the converted form.  If somebody writes an editor (which should
+  not be particularly difficult) the package can go in the 'main' area
+  of the Debian archive.
+
+- For reference: .far files are archives (similar to .zip files), they
+  can be created and extracted using the free 'fareditor' application:
+  http://cytadela.sourceforge.net/download.php
+  http://sourceforge.net/projects/cytadela/files/fareditor/
+
+  The .far archives contains textures and game fonts.
+
+Since the game engine is made specially for these 'contrib' data, it
+basically depends on them, so it goes to 'contrib' as well.  It can go
+in 'main' as soon as the original data goes in 'main'.
+
+
 Upstream Author(s):
 
     Tomasz Kaźmierczak

-- 
cytadela: old-school first person shooter