Attempt to sort out the version number mess in preparation for the v1.9.0

release.

diff --git a/configure.ac b/configure.ac
index eb4db088a4d4e684a379676c1fceda6526b375a7..f133325173ec3f7990b773deaf11e990cc63c96d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.52)
 dnl Initialize the automake stuff
 dnl set the $host variable based on local machine/os
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(FlightGear, 1.99.5-rc2)
+AM_INIT_AUTOMAKE(FlightGear, 1.9.0)
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
@@ -395,7 +395,7 @@ if test "x$ac_cv_header_simgear_version_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for SimGear 1.99.5 or newer])
+AC_MSG_CHECKING([for SimGear 1.9.0 or newer])
 AC_TRY_RUN([
 #include <stdio.h>
 
@@ -405,8 +405,8 @@ AC_TRY_RUN([
 #define XSTRINGIFY(X) #X
 
 #define MIN_MAJOR 1
-#define MIN_MINOR 99
-#define MIN_MICRO 5
+#define MIN_MINOR 9
+#define MIN_MICRO 0
 
 int main() {
     int major, minor, micro;

diff --git a/src/Include/config.h-msvc6 b/src/Include/config.h-msvc6
index 5366dfff187035e722ad53eb4e833f6910360c88..902e61bdfdc1f25736312bb3a3f186e9d4f21fdc 100644 (file)
--- a/src/Include/config.h-msvc6
+++ b/src/Include/config.h-msvc6
@@ -46,7 +46,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-#define FLIGHTGEAR_VERSION "MSVC6-WIN32-1.99.5"
+#define FLIGHTGEAR_VERSION "MSVC6-WIN32-1.9.0"
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -64,7 +64,7 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
-#define VERSION "1.99.5"
+#define VERSION "1.9.0"
 
 /* Define if compiling on a Winbloze (95, NT, etc.) platform */
 #define WIN32 1

diff --git a/src/Include/config.h-msvc71 b/src/Include/config.h-msvc71
index 563d55c0c9babae5c89b7492ffd1bef5e7f0710e..06ce7ec0f797df76a221c7e32691aa8a86d7cc12 100755 (executable)
--- a/src/Include/config.h-msvc71
+++ b/src/Include/config.h-msvc71
@@ -19,7 +19,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-1.99.5"
+#define FLIGHTGEAR_VERSION "MSVC7.1-WIN32-1.9.0"
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -37,7 +37,7 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
-#define VERSION "1.99.5"
+#define VERSION "1.9.0"
 #ifndef  FG_VERSION     /* allow override */
 #define  FG_VERSION     7
 #endif   /* FG_VERSION */

diff --git a/src/Include/config.h-msvc8 b/src/Include/config.h-msvc8
index 26078184c6ac2f4269709d488370c53b08876847..f6fac3a08e8101d81fc62f71dc2c656672f10e5b 100755 (executable)
--- a/src/Include/config.h-msvc8
+++ b/src/Include/config.h-msvc8
@@ -50,7 +50,7 @@
 #define PACKAGE "FlightGear"
 
 /* Define to package version - use in main.cxx */
-#define FLIGHTGEAR_VERSION "MSVC8-WIN32-1.99.5"
+#define FLIGHTGEAR_VERSION "MSVC8-WIN32-1.9.0"
 
 /* Define as the return type of signal handlers (int or void).  */
 #define RETSIGTYPE void
@@ -68,7 +68,7 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to version number */
-#define VERSION "1.99.5"
+#define VERSION "1.9.0"
 
 /* Define if compiling on a Winbloze (95, NT, etc.) platform */
 #define WIN32 1

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index fcd7ee316b3f1359a6051fa8fd98ba0fd0ca7ede..a6d28297c474489f8852c767ac4168412b1ee5d8 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -1016,7 +1016,7 @@ bool fgMainInit( int argc, char **argv ) {
     fgInitFGRoot(argc, argv);
 
     // Check for the correct base package version
-    static char required_version[] = "1.99.5";
+    static char required_version[] = "1.9.0";
     string base_version = fgBasePackageVersion();
     if ( !(base_version == required_version) ) {
         // tell the operator how to use this application