Bump version number to 2.2.1 and add NEWS about it

This is not the complete news for changes since 2.2, just what will be
included for the stable release.

7 files changed, 62 insertions, 20 deletions

diff --git a/NEWS b/NEWS
index 847829b7..4f8d6296 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,45 @@
+2.2.1 (2015-09-10):
+
+    Chocolate Doom has not seen a great deal of "stable" patch
+    releases in its history. While the development tree sees major new
+    features and changes, the purpose of this release, and hopefully
+    others to follow like it, is to repair some deficiencies that
+    existed in 2.2.0.
+
+    General:
+    * Preferences for the OS X launcher are now stored with a unique
+      name to not conflict with other applications. (thanks Xeriphas1994)
+    * Unix desktop entry files are now brought up to full desktop
+      entry specification compliance. (thanks chungy, Fabian)
+    * Unix AppData entries are now included, allowing software centers
+      to display detailed information about the engines. (thanks chungy)
+    * Partial XDG base directory specification compliance on Unix
+      systems now exist to search for IWAD paths.  One benefit is that
+      $HOME/.local/share/games/doom is now a valid location to store
+      and automatically find IWADs. (thanks chungy)
+
+    Build systems:
+    * The Microsoft Visual Studio build system was not fully
+      functional in 2.2.0 and has been fixed. (thanks Linguica)
+    * The autoconf build system checks for windres only for Windows
+      toolchains.  Some Linux distributions mistakingly include the
+      program in their native toolchains. (thanks Fabian)
+    * A compiler hint for packed structs has been added, which
+      otherwise broke the games when built under recent GCC releases
+      for Windows. (thanks Fabian)
+
+    Doom:
+    * The GOG.com releases of The Ultimate Doom, Doom II, and Final
+      Doom are now detected and supported on Windows. (thanks chungy)
+    * An integer overflow was used in spawn angle calculation,
+      undefined C behavior which broke with Clang optimization.
+      (thanks David Majnemer for insight)
+
+    Setup tool:
+    * The help URL for the level warp menu now points to the proper
+      wiki page, rather than the multiplayer page.
+    * The manifest has been updated for Windows 10 compatibility.
+      (thanks chungy)
 
 2.2.0 (2015-06-09):
 
diff --git a/codeblocks/config.h b/codeblocks/config.h
index d9c11423..26af9ddd 100644
--- a/codeblocks/config.h
+++ b/codeblocks/config.h
@@ -9,13 +9,13 @@
 #define PACKAGE_NAME "Chocolate Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 2.2.0"
+#define PACKAGE_STRING "Chocolate Doom 2.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 "2.2.0"
+#define PACKAGE_VERSION "2.2.1"
 
 /* Change this when you create your awesome forked version */
 #define PROGRAM_PREFIX "chocolate-"
@@ -24,7 +24,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.2.0"
+#define VERSION "2.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 16017f11..7392f1e5 100644
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,21 +1,21 @@
 1 ICON "../data/doom.ico"
 
 1 VERSIONINFO
-PRODUCTVERSION 2,2,0,0
-FILEVERSION 2,2,0,0
+PRODUCTVERSION 2,2,1,0
+FILEVERSION 2,2,1,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "2.2.0"
-   VALUE "FileDescription", "2.2.0"
+   VALUE "FileVersion", "2.2.1"
+   VALUE "FileDescription", "2.2.1"
    VALUE "InternalName", "Chocolate Doom"
    VALUE "CompanyName", "Chocolate Doom"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate Doom"
-   VALUE "ProductVersion", "2.2.0"
+   VALUE "ProductVersion", "2.2.1"
   }
  }
  BLOCK "VarFileInfo"
diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc
index c0a32ce6..26d5cfa3 100644
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -1,21 +1,21 @@
 1 ICON "../data/setup.ico"
 
 1 VERSIONINFO
-PRODUCTVERSION 2,2,0,0
-FILEVERSION 2,2,0,0
+PRODUCTVERSION 2,2,1,0
+FILEVERSION 2,2,1,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "2.2.0"
+   VALUE "FileVersion", "2.2.1"
    VALUE "FileDescription", "Chocolate Doom Setup"
    VALUE "InternalName", "chocolate-setup"
    VALUE "CompanyName", "Chocolate Doom"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate Doom Setup"
-   VALUE "ProductVersion", "2.2.0"
+   VALUE "ProductVersion", "2.2.1"
   }
  }
  BLOCK "VarFileInfo"
diff --git a/configure.ac b/configure.ac
index b2742d75..ee97fe22 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Chocolate Doom, 2.2.0, fraggle@gmail.com, chocolate-doom)
+AC_INIT(Chocolate Doom, 2.2.1, fraggle@gmail.com, chocolate-doom)
 
 PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom}
 PACKAGE_SHORTDESC="Conservative source port"
diff --git a/msvc/config.h b/msvc/config.h
index 8a4296b0..e376ac10 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -11,19 +11,19 @@
 #define PACKAGE_NAME "Chocolate Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 2.2.0"
+#define PACKAGE_STRING "Chocolate Doom 2.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 "2.2.0"
+#define PACKAGE_VERSION "2.2.1"
 
 /* Change this when you create your awesome forked version */
 #define PROGRAM_PREFIX "chocolate-"
 
 /* Version number of package */
-#define VERSION "2.2.0"
+#define VERSION "2.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 fe0f840f..171ddab2 100644
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -25,8 +25,8 @@
 #endif

 

 1 VERSIONINFO

-PRODUCTVERSION 2,2,0,0

-FILEVERSION 2,2,0,0

+PRODUCTVERSION 2,2,1,0

+FILEVERSION 2,2,1,0

 FILETYPE 1

 BEGIN

 	BLOCK "StringFileInfo"

@@ -34,12 +34,12 @@ BEGIN
 		BLOCK "040904E4"

 		BEGIN

 			VALUE "FileVersion", "1.0.0"

-			VALUE "FileDescription", "Chocolate Doom 2.2.0"

+			VALUE "FileDescription", "Chocolate Doom 2.2.1"

 			VALUE "InternalName", "chocolate-doom"

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

 			VALUE "LegalCopyright", "GNU General Public License"

 			VALUE "ProductName", "Chocolate Doom"

-			VALUE "ProductVersion", "2.2.0"

+			VALUE "ProductVersion", "2.2.1"

 		END

 	END

 	BLOCK "VarFileInfo"