Update changelogs and bump version numbers in prepration of releasing…

… [milestone:2.1]

This addresses #172.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/branches/2.1@6471 4a71c877-e1ca-e34f-864e-861f7616d084

ChangeLog

@@ -1,3 +1,7 @@
+2008-12-21: Version 2.1
+ * GUI:
+   * Fix: Bug that caused the number of assigned units to a structure to be displayed wrongly (ticket:90)
+
 2008-11-30: Version 2.1_rc2
  * General:
    * Change: Updated Italian (100%), Portugues (99.96%) and Russian (46%) translations

configure.ac

@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[2.1_rc2],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[2.1],[http://wz2100.net/],[warzone2100])
 AM_INIT_AUTOMAKE([1.10])
 
 AC_CONFIG_MACRO_DIR([m4])

lib/framework/config-macosx.h

@@ -264,13 +264,13 @@
 #define PACKAGE_NAME "Warzone 2100"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Warzone 2100 2.1 release candidate 2"
+#define PACKAGE_STRING "Warzone 2100 2.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "warzone2100"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.1 release candidate 2"
+#define PACKAGE_VERSION "2.1"
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 /* #undef PRI_MACROS_BROKEN */

pkg/dpkg/changelog

@@ -1,3 +1,11 @@
+warzone2100 (2.1.0-0) unstable; urgency=low
+
+  * GUI:
+    * Fix: Bug that caused the number of assigned units to a structure to be
+      displayed wrongly (ticket:90)
+
+ -- Giel van Schijndel <muggenhor@gna.org>  Sun, 21 Dec 2008 19:31:04 +0100
+
 warzone2100 (2.1.0~rc2-0) unstable; urgency=low
 
   * General:

win32/warzone2100.rc

@@ -4,8 +4,8 @@
 //
 
 1 VERSIONINFO
- FILEVERSION 2,0,997,0
- PRODUCTVERSION 2,0,997,0
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -22,12 +22,12 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "Warzone Resurrection Project"
 			VALUE "FileDescription", "Warzone 2100"
-			VALUE "FileVersion", "2.1 release candidate 2"
+			VALUE "FileVersion", "2.1"
 			VALUE "InternalName", "Warzone 2100"
 			VALUE "LegalCopyright", "Copyright � 2005-2008 Warzone Resurrection Project"
 			VALUE "OriginalFilename", "warzone2100.exe"
 			VALUE "ProductName", "Warzone 2100"
-			VALUE "ProductVersion", "2.1 release candidate 2"
+			VALUE "ProductVersion", "2.1"
 		END
 	END
 	BLOCK "VarFileInfo"