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

[Sylvain Beucler]

The following commit has been merged in the master branch:
commit 92373df4b7a3558493d396822a50e6a3a38cca52
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun May 16 15:01:35 2010 +0200

    New 1.0.0 release

diff --git a/debian/changelog b/debian/changelog
index 657eadd..488b761 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+cytadela (1.0.0-1) unstable; urgency=low
+
+  * New Upstream Version
+  * 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)
diff --git a/debian/control b/debian/control
index 609c5da..9e4a1db 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Sylvain Beucler <beuc at beuc.net>
-Build-Depends: debhelper (>= 7.0.50), libsdl1.2-dev, libsdl-mixer1.2-dev, mesa-common-dev, libglu1-mesa-dev
+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/
 Vcs-Git: git://git.debian.org/git/pkg-games/cytadela.git
@@ -11,25 +11,22 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/cytadela.git
 
 Package: cytadela
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cytadela-data (= ${source:Version})
-Description: old-school first person shooter
- Cytadela is a conversion of an old Amiga first person shooter. The
- original was created in mid 1990's by Virtual Design, and released
- firstly in Poland and then in other countries.
+Depends: ${shlibs:Depends}, ${misc:Depends}, cytadela-data (= ${source:Version}), vlc-nox
+Description: old-school first person shooter game
+ Cytadela is a single player game in which the player fights against
+ computer-controlled (AI) enemies. The goal of the game is to find six
+ bomb parts with which the Citadel has to be blown up.
  .
- This is a single player game in which the player fights against AI
- enemies. The goal of the game is to find six bomb parts with which
- the Citadel has to be blown up. To achieve it, the player not only
- has to defend himsefl against the enemies, but (s)he also has to
- solve many riddles, such as switching apropriate buttons in order to
- open some door, move some walls, etc.
+ To achieve it, the player not only has to defend himself against the
+ enemies, but (s)he also has to solve many riddles, such as switching
+ apropriate buttons in order to open some door, move some walls, etc.
+ . 
+ It's a conversion of a first person shooter Amiga game originally
+ released in mid 1990's, first in Poland and then in other countries.
  .
- As a conversion, this project tries to be as similar to the original
- as possible and therefore there won't be any significant changes,
- only some gameplay improvements are possible.
- .
- This version is fully playable and beatable, but the introduction and
- ending sequences are not developed yet (they are planned for v1.0).
+ Cytadela requires a 3D graphics card.  It uses the OpenGL and GLU
+ libraries for 3D, and SDL and SDL_mixer for 2D, music, sounds and
+ controllers.
 
 Package: cytadela-dbg
 Section: debug
@@ -37,7 +34,6 @@ Priority: extra
 Architecture: any
 Depends: cytadela (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for cytadela
- .
  This package contains the debugging symbols for cytadela.
 
 Package: cytadela-data
@@ -45,5 +41,4 @@ Architecture: all
 Depends: ${misc:Depends}
 Suggests: fareditor
 Description: game data for cytadela
- .
  This package contains data files required by the game Cytadela.
diff --git a/debian/copyright b/debian/copyright
index d852e22..ada8ac5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,10 +24,11 @@ Upstream Author(s):
 
 Copyright:
 
-    Copyright (C) 2003-2009 Tomasz Kaźmierczak
+    Copyright (C) 2003-2010 Tomasz Kaźmierczak
     Copyright (C) 2006 Kamil Pawłowski
     Copyright (C) 2009 Marcin Sękalski
     Copyright (C) 2009 Tomasz Wiśniewski
+    Copyright (C) 2008 Sam Hocevar
 
 License:
 
diff --git a/debian/cytadela-data.docs b/debian/cytadela-data.docs
index 7cc00df..9a86a93 100644
--- a/debian/cytadela-data.docs
+++ b/debian/cytadela-data.docs
@@ -1 +1,4 @@
+NEWS
+README
+AUTHORS
 data/doc/*
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index eb9b151..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-NEWS
-README
-AUTHORS
diff --git a/debian/watch b/debian/watch
index d5df477..8a92f7f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://sf.net/cytadela/cytadela-(.*)\.tar\.gz
+http://sf.net/cytadela/cytadela-(.*)\.tar\.bz2

-- 
cytadela: old-school first person shooter