commit 939cbfeb115338cf7868e516019a4ae832b1ebde
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Thu Dec 29 17:54:42 2016 +0100
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Thu Dec 29 17:54:42 2016 +0100
Bump version number to 2.3.0, update NEWS.
---
NEWS.md | 5 ++++-
codeblocks/config.h | 6 +++---
codeblocks/game-res.rc | 10 +++++-----
codeblocks/setup-res.rc | 8 ++++----
configure.ac | 2 +-
msvc/config.h | 6 +++---
msvc/win32.rc | 8 ++++----
7 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/NEWS.md b/NEWS.md
index 1fa5a847..837a808d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-## HEAD
+## 2.3.0 (2016-12-29)
### General
* Bash completion scripts are included (thanks Fabian)
@@ -21,6 +21,9 @@
* Multiple capitalizations are now tried when searching for WAD files,
for convenience when running on case sensitive filesystems (thanks
Fabian).
+ * A new command line argument, `-strictdemos`, was added, to allow
+ more careful control over demo format extensions. Such extensions
+ are now forbidden in WAD files and warning messages are shown.
### Build systems
* There is better compatibility with BSD Make (thanks R.Rebello)
diff --git a/codeblocks/config.h b/codeblocks/config.h
index 26af9ddd..79f83c63 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.1"
+#define PACKAGE_STRING "Chocolate Doom 2.3.0"
/* 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.1"
+#define PACKAGE_VERSION "2.3.0"
/* 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.1"
+#define VERSION "2.3.0"
/* 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 7392f1e5..7e0ac022 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,1,0
-FILEVERSION 2,2,1,0
+PRODUCTVERSION 2,3,0,0
+FILEVERSION 2,3,0,0
FILETYPE 1
{
BLOCK "StringFileInfo"
{
BLOCK "040904E4"
{
- VALUE "FileVersion", "2.2.1"
- VALUE "FileDescription", "2.2.1"
+ VALUE "FileVersion", "2.3.0"
+ VALUE "FileDescription", "2.3.0"
VALUE "InternalName", "Chocolate Doom"
VALUE "CompanyName", "Chocolate Doom"
VALUE "LegalCopyright", "GNU General Public License"
VALUE "ProductName", "Chocolate Doom"
- VALUE "ProductVersion", "2.2.1"
+ VALUE "ProductVersion", "2.3.0"
}
}
BLOCK "VarFileInfo"
diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc
index 26d5cfa3..36e4eef8 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,1,0
-FILEVERSION 2,2,1,0
+PRODUCTVERSION 2,3,0,0
+FILEVERSION 2,3,0,0
FILETYPE 1
{
BLOCK "StringFileInfo"
{
BLOCK "040904E4"
{
- VALUE "FileVersion", "2.2.1"
+ VALUE "FileVersion", "2.3.0"
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.1"
+ VALUE "ProductVersion", "2.3.0"
}
}
BLOCK "VarFileInfo"
diff --git a/configure.ac b/configure.ac
index edf81bab..8bfe377d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Chocolate Doom, 2.2.1, chocolate-doom-dev-list@chocolate-doom.org,
+AC_INIT(Chocolate Doom, 2.3.0, chocolate-doom-dev-list@chocolate-doom.org,
chocolate-doom)
PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom}
diff --git a/msvc/config.h b/msvc/config.h
index e376ac10..f6ae5bc0 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.1"
+#define PACKAGE_STRING "Chocolate Doom 2.3.0"
/* 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.1"
+#define PACKAGE_VERSION "2.3.0"
/* Change this when you create your awesome forked version */
#define PROGRAM_PREFIX "chocolate-"
/* Version number of package */
-#define VERSION "2.2.1"
+#define VERSION "2.3.0"
/* 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 171ddab2..030d63ac 100644
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -25,8 +25,8 @@
#endif
1 VERSIONINFO
-PRODUCTVERSION 2,2,1,0
-FILEVERSION 2,2,1,0
+PRODUCTVERSION 2,3,0,0
+FILEVERSION 2,3,0,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.1"
+ VALUE "FileDescription", "Chocolate Doom 2.3.0"
VALUE "InternalName", "chocolate-doom"
VALUE "CompanyName", "fraggle@gmail.com"
VALUE "LegalCopyright", "GNU General Public License"
VALUE "ProductName", "Chocolate Doom"
- VALUE "ProductVersion", "2.2.1"
+ VALUE "ProductVersion", "2.3.0"
END
END
BLOCK "VarFileInfo"