Bump version to 1.2.1, update NEWS and ChangeLog.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1421

9 files changed, 52 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 925231a6..a370d4bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2008-12-10 20:20:10 fraggle
+	
+	Fix crash when playing Doom 1 levels.
+
+2008-12-10 01:06:08 fraggle
+	
+	Bump version to 1.2.0, update NEWS and ChangeLog.
+
+2008-12-10 01:01:19 fraggle
+	
+	Undo previous change.
+
+2008-12-10 00:42:49 fraggle
+	
+	Set icon before calling TXT_Init, for setup and ENDOOM screens.
+
+2008-12-10 00:00:55 fraggle
+	
+	Fix window icon/title under Windows XP Luna theme.
+
+2008-12-09 23:32:19 fraggle
+	
+	Make intermission screen work on MAP33, to be consistent with Vanilla
+	Doom.  Also, make levels after MAP33 trigger a V_DrawPatch error.
+
 2008-12-09 20:35:17 fraggle
 	
 	Add check for sched_setaffinity to configure and only use it if it is
diff --git a/NEWS b/NEWS
index 8088fe2c..abb31290 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+1.2.1 (2008-12-10):
+
+    This version just fixes a crash at the intermission screen when
+    playing Doom 1 levels.
+
 1.2.0 (2008-12-10):
 
     Happy 15th Birthday, Doom!
diff --git a/codeblocks/config.h b/codeblocks/config.h
index a0560009..fe1bde8f 100644
--- a/codeblocks/config.h
+++ b/codeblocks/config.h
@@ -9,19 +9,19 @@
 #define PACKAGE_NAME "Chocolate Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 1.2.0"
+#define PACKAGE_STRING "Chocolate Doom 1.2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "chocolate-doom"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.0"
+#define PACKAGE_VERSION "1.2.1"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.2.0"
+#define VERSION "1.2.1"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/codeblocks/game-res.rc b/codeblocks/game-res.rc
index de0afd76..4a9e289b 100644
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,21 +1,21 @@
 1 ICON "../data/doom.ico"
 
 1 VERSIONINFO
-PRODUCTVERSION 1,2,0,0
-FILEVERSION 1,2,0,0
+PRODUCTVERSION 1,2,1,0
+FILEVERSION 1,2,1,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "1.2.0"
-   VALUE "FileDescription", "1.2.0"
+   VALUE "FileVersion", "1.2.1"
+   VALUE "FileDescription", "1.2.1"
    VALUE "InternalName", "Chocolate-Doom"
    VALUE "CompanyName", "Chocolate-Doom"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate-Doom"
-   VALUE "ProductVersion", "1.2.0"
+   VALUE "ProductVersion", "1.2.1"
   }
  }
 }
diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc
index 50758e10..fe791088 100644
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -3,21 +3,21 @@
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml"
 
 1 VERSIONINFO
-PRODUCTVERSION 1,2,0,0
-FILEVERSION 1,2,0,0
+PRODUCTVERSION 1,2,1,0
+FILEVERSION 1,2,1,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "1.2.0"
+   VALUE "FileVersion", "1.2.1"
    VALUE "FileDescription", "Chocolate-Doom Setup"
    VALUE "InternalName", "chocolate-setup"
    VALUE "CompanyName", "fraggle@gmail.com"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate-Doom Setup"
-   VALUE "ProductVersion", "1.2.0"
+   VALUE "ProductVersion", "1.2.1"
   }
  }
 }
diff --git a/configure.in b/configure.in
index 525a164c..15ef200a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(Chocolate Doom, 1.2.0, fraggle@gmail.com, chocolate-doom)
+AC_INIT(Chocolate Doom, 1.2.1, fraggle@gmail.com, chocolate-doom)
 
 AC_CONFIG_AUX_DIR(autotools)
 
diff --git a/msvc/config.h b/msvc/config.h
index c370479d..7880c3c1 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -11,16 +11,16 @@
 #define PACKAGE_NAME "Chocolate Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 1.2.0"
+#define PACKAGE_STRING "Chocolate Doom 1.2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "chocolate-doom"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.2.0"
+#define PACKAGE_VERSION "1.2.1"
 
 /* Version number of package */
-#define VERSION "1.2.0"
+#define VERSION "1.2.1"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/msvc/win32.rc b/msvc/win32.rc
index 5e2d27a9..b9bc06a2 100644
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -32,21 +32,21 @@
 #endif

 

 1 VERSIONINFO

-PRODUCTVERSION 1,2,0,0

-FILEVERSION 1,2,0,0

+PRODUCTVERSION 1,2,1,0

+FILEVERSION 1,2,1,0

 FILETYPE 1

 BEGIN

 	BLOCK "StringFileInfo"

 	BEGIN

 		BLOCK "040904E4"

 		BEGIN

-			VALUE "FileVersion", "1.2.0"

-			VALUE "FileDescription", "Chocolate Doom 1.2.0"

+			VALUE "FileVersion", "1.2.1"

+			VALUE "FileDescription", "Chocolate Doom 1.2.1"

 			VALUE "InternalName", "chocolate-doom"

 			VALUE "CompanyName", "fraggle@gmail.com"

 			VALUE "LegalCopyright", "GNU General Public License"

 			VALUE "ProductName", "Chocolate Doom"

-			VALUE "ProductVersion", "1.2.0"

+			VALUE "ProductVersion", "1.2.1"

 		END

 	END

 END

diff --git a/setup/setup-manifest.xml b/setup/setup-manifest.xml
index 56ac9557..409a142b 100644
--- a/setup/setup-manifest.xml
+++ b/setup/setup-manifest.xml
@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <!-- The "name" field in this tag should be the same as the executable's
        name -->
-  <assemblyIdentity version="1.2.0.0" processorArchitecture="*"
+  <assemblyIdentity version="1.2.1.0" processorArchitecture="*"
                     name="chocolate-setup" type="win32"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>