[SCM] chocolate-doom: Doom engine closely-compatible with vanilla doom branch, master, updated. upstream/1.2.1-4-g6731b3b

[Jon Dowland]

The following commit has been merged in the master branch:
commit c109bccd766a7076aeb7ea4be6553577d4d97dae
Author: Jon Dowland <jon at ra.ncl.ac.uk>
Date:   Wed Sep 9 16:36:38 2009 +0100

    adjust changelog. first uploaded rejected.

diff --git a/debian/changelog b/debian/changelog
index d9d7559..b3c06e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,4 @@
-chocolate-doom (1.2.1-2) UNRELEASED; urgency=low
-
-  * install alternatives for doom(6).
-
- -- Jon Dowland <jmtd at debian.org>  Sat, 18 Jul 2009 12:48:12 +0100
-
-chocolate-doom (1.2.1-1) unstable; urgency=low
+chocolate-doom (1.2.1-1) UNRELEASED; urgency=low
 
   * Initial Release. Closes: #351594.
     * This package has been in preparation since August 2007.
@@ -14,5 +8,6 @@ chocolate-doom (1.2.1-1) unstable; urgency=low
   * Conflict with freedoom and freedm prior to 0.6.4-4, which
     installed an alternative for doom2.wad. chocolate-doom
     cannot be used in conjunction with freedoom.
+  * install alternatives for doom(6).
 
- -- Jon Dowland <jmtd at debian.org>  Sat, 11 Jul 2009 12:43:59 +0100
+ -- Jon Dowland <jmtd at debian.org>  Wed, 09 Sep 2009 16:35:53 +0100

-- 
chocolate-doom: Doom engine closely-compatible with vanilla doom