[SCM] Packaging for the Nexuiz engine branch, master, updated. debian/2.5.2+dp-1-5-g273c741

[Simon McVittie]

The following commit has been merged in the master branch:
commit 273c7416fc7cdd30a8b7a22129a79fe6d52ece44
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Oct 6 09:37:03 2011 +0100

    Mention in the description/copyright file that this is "Classic Nexuiz"
    
    * Mention in the description/copyright file that this is "Classic Nexuiz"
    * Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 7c634de..d53be71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-nexuiz (2.5.2+dp-2) UNRELEASED; urgency=low
+nexuiz (2.5.2+dp-2) unstable; urgency=low
 
   * Switch nexuiz, nexuiz-server to arch:all
   * Enable pristine-tar in gbp.conf
+  * Mention in the description/copyright file that this is "Classic Nexuiz"
+  * Upload to unstable
 
- -- Simon McVittie <smcv at debian.org>  Mon, 18 Jul 2011 23:24:34 +0100
+ -- Simon McVittie <smcv at debian.org>  Thu, 06 Oct 2011 09:05:27 +0100
 
 nexuiz (2.5.2+dp-1) experimental; urgency=low
 
@@ -26,12 +28,6 @@ nexuiz (2.5.2+dp-1) experimental; urgency=low
 
  -- Simon McVittie <smcv at debian.org>  Fri, 15 Jul 2011 17:33:53 +0100
 
-nexuiz (2.5.2-6) UNRELEASED; urgency=low
-
-  * Enable pristine-tar in gbp.conf
-
- -- Simon McVittie <smcv at debian.org>  Sat, 23 Jul 2011 19:05:42 +0100
-
 nexuiz (2.5.2-5) unstable; urgency=low
 
   * Use debhelper 8 to build the source package
diff --git a/debian/control b/debian/control
index 195e856..3494588 100644
--- a/debian/control
+++ b/debian/control
@@ -21,18 +21,22 @@ Depends: ${misc:Depends},
          nexuiz-data (>= 2.5.2)
 Recommends: nexuiz-music (>= 2.5.2)
 Suggests: xqf
-Description: A fast-paced 3D first-person shooter
- Nexuiz is a fast-paced 3D deathmatch game with high-end and complex graphics 
- effects. It is intended to be played over the Internet or over a local network.
- Several different game types, such as classic deathmatch, team deathmatch and
- capture the flag are available.
- Though it also supports a single-player mode and playing against the computer.
+Description: Fast-paced 3D first-person shooter
+ Classic Nexuiz is a fast-paced 3D deathmatch game with high-end and complex
+ graphics effects. It is intended to be played over the Internet or over a
+ local network. Several different game types, such as classic deathmatch, team
+ deathmatch and capture the flag are available.
+ It also supports a single-player mode and playing against the computer.
  .
  The game brings deathmatch back to the basics, with perfect weapon  balancing 
  and fast paced action, keeping itself away from the current trend of realistic 
  shooters.
  .
  This package installs the client to play the game.
+ .
+ This game was originally released as "Nexuiz", but is now referred to as
+ "Classic Nexuiz" since the Nexuiz name was re-used for a non-free game
+ for consoles.
 
 Package: nexuiz-server
 Architecture: all
@@ -40,13 +44,17 @@ Depends: ${misc:Depends},
          ${shlibs:Depends},
          darkplaces-server,
          nexuiz-data (>= 2.5.2)
-Description: Standalone server for Nexuiz
- Nexuiz is a fast-paced 3D deathmatch game with high-end and complex graphics 
- effects. It is intended to be played over the Internet or over a local network.
- Though it also supports a single-player mode.
+Description: Standalone server for Classic Nexuiz
+ Classic Nexuiz is a fast-paced 3D deathmatch game with high-end and complex
+ graphics effects. It is intended to be played over the Internet or over a
+ local network, though it also supports a single-player mode.
  .
  The game brings deathmatch back to the basics, with perfect weapon  balancing 
  and fast paced action, keeping itself away from the current trend of realistic 
  shooters.
  .
  This package installs the standalone server.
+ .
+ This game was originally released as "Nexuiz", but is now referred to as
+ "Classic Nexuiz" since the Nexuiz name was re-used for a non-free game
+ for consoles.
diff --git a/debian/copyright b/debian/copyright
index 2be78ea..59259b8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
-Upstream-name: Nexuiz
+Upstream-name: Classic Nexuiz
 Source: svn://svn.icculus.org/twilight/trunk/darkplaces
 Comment:
   The only upstream file here is the icon, for which we use

-- 
Packaging for the Nexuiz engine