- (linux) version bump

- compile fixes

AI/VCAI/Fuzzy.cpp

@@ -1,35 +1,35 @@
 #include "StdInc.h"
 #include "Fuzzy.h"
 #include "../../lib/CObjectHandler.h"
-#include "..\FuzzyLite\AreaCentroidAlgorithm.cpp"
-#include "..\FuzzyLite\CompoundTerm.cpp"
-#include "..\FuzzyLite\DescriptiveAntecedent.cpp"
-#include "..\FuzzyLite\FuzzyEngine.cpp"
-#include "..\FuzzyLite\FuzzyAnd.cpp"
-#include "..\FuzzyLite\FuzzyOr.cpp"
-#include "..\FuzzyLite\InputLVar.cpp"
-#include "..\FuzzyLite\OutputLVar.cpp"
-#include "..\FuzzyLite\FuzzyAntecedent.cpp"
-#include "..\FuzzyLite\FuzzyConsequent.cpp"
-#include "..\FuzzyLite\FuzzyDefuzzifier.cpp"
-#include "..\FuzzyLite\FuzzyModulation.cpp"
-#include "..\FuzzyLite\FuzzyOperator.cpp"
-#include "..\FuzzyLite\FuzzyOperation.cpp"
-#include "..\FuzzyLite\FuzzyException.cpp"
-#include "..\FuzzyLite\FuzzyExceptions.cpp"
-#include "..\FuzzyLite\FuzzyRule.cpp"
-#include "..\FuzzyLite\HedgeSet.cpp"
-#include "..\FuzzyLite\Hedge.cpp"
-#include "..\FuzzyLite\SingletonTerm.cpp"
-#include "..\FuzzyLite\TrapezoidalTerm.cpp"
-#include "..\FuzzyLite\TriangularTerm.cpp"
-#include "..\FuzzyLite\LinguisticTerm.cpp"
-#include "..\FuzzyLite\LinguisticVariable.cpp"
-#include "..\FuzzyLite\RuleBlock.cpp"
-#include "..\FuzzyLite\ShoulderTerm.cpp"
-#include "..\FuzzyLite\StrOp.cpp"
-#include "..\FuzzyLite\MamdaniRule.cpp"
-#include "..\FuzzyLite\MamdaniConsequent.cpp"
+#include "../FuzzyLite/AreaCentroidAlgorithm.cpp"
+#include "../FuzzyLite/CompoundTerm.cpp"
+#include "../FuzzyLite/DescriptiveAntecedent.cpp"
+#include "../FuzzyLite/FuzzyEngine.cpp"
+#include "../FuzzyLite/FuzzyAnd.cpp"
+#include "../FuzzyLite/FuzzyOr.cpp"
+#include "../FuzzyLite/InputLVar.cpp"
+#include "../FuzzyLite/OutputLVar.cpp"
+#include "../FuzzyLite/FuzzyAntecedent.cpp"
+#include "../FuzzyLite/FuzzyConsequent.cpp"
+#include "../FuzzyLite/FuzzyDefuzzifier.cpp"
+#include "../FuzzyLite/FuzzyModulation.cpp"
+#include "../FuzzyLite/FuzzyOperator.cpp"
+#include "../FuzzyLite/FuzzyOperation.cpp"
+#include "../FuzzyLite/FuzzyException.cpp"
+#include "../FuzzyLite/FuzzyExceptions.cpp"
+#include "../FuzzyLite/FuzzyRule.cpp"
+#include "../FuzzyLite/HedgeSet.cpp"
+#include "../FuzzyLite/Hedge.cpp"
+#include "../FuzzyLite/SingletonTerm.cpp"
+#include "../FuzzyLite/TrapezoidalTerm.cpp"
+#include "../FuzzyLite/TriangularTerm.cpp"
+#include "../FuzzyLite/LinguisticTerm.cpp"
+#include "../FuzzyLite/LinguisticVariable.cpp"
+#include "../FuzzyLite/RuleBlock.cpp"
+#include "../FuzzyLite/ShoulderTerm.cpp"
+#include "../FuzzyLite/StrOp.cpp"
+#include "../FuzzyLite/MamdaniRule.cpp"
+#include "../FuzzyLite/MamdaniConsequent.cpp"
 
 /*
  * Fuzzy.cpp, part of VCMI engine
@@ -298,4 +298,4 @@ float FuzzyHelper::getTacticalAdvantage (const CArmedInstance *we, const CArmedI
 		tlog1 << "getTacticalAdvantage " << fe.name() << ": " << fe.message() << '\n';
 	}
 	return output;
-}
+}

AI/VCAI/Fuzzy.h

@@ -15,7 +15,7 @@
 	#endif
 #endif
 
-#include "..\FuzzyLite\FuzzyLite.h"
+#include "../FuzzyLite/FuzzyLite.h"
 
 /*
  * Fuzzy.h, part of VCMI engine
@@ -61,4 +61,4 @@ public:
 
 	ui64 estimateBankDanger (int ID);
 	float getTacticalAdvantage (const CArmedInstance *we, const CArmedInstance *enemy); //returns factor how many times enemy is stronger than us
-};
+};

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for vcmi 0.87b.
+# Generated by GNU Autoconf 2.68 for vcmi 0.88b.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='vcmi'
 PACKAGE_TARNAME='vcmi'
-PACKAGE_VERSION='0.87b'
-PACKAGE_STRING='vcmi 0.87b'
+PACKAGE_VERSION='0.88b'
+PACKAGE_STRING='vcmi 0.88b'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1322,7 +1322,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures vcmi 0.87b to adapt to many kinds of systems.
+\`configure' configures vcmi 0.88b to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1392,7 +1392,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of vcmi 0.87b:";;
+     short | recursive ) echo "Configuration of vcmi 0.88b:";;
    esac
   cat <<\_ACEOF
 
@@ -1533,7 +1533,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-vcmi configure 0.87b
+vcmi configure 0.88b
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2128,7 +2128,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by vcmi $as_me 0.87b, which was
+It was created by vcmi $as_me 0.88b, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2943,7 +2943,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='vcmi'
- VERSION='0.87b'
+ VERSION='0.88b'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18116,7 +18116,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by vcmi $as_me 0.87b, which was
+This file was extended by vcmi $as_me 0.88b, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18173,7 +18173,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-vcmi config.status 0.87b
+vcmi config.status 0.88b
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.60)
-AC_INIT(vcmi, 0.87b)				# Follow VCMI_VERSION in GameConstants.h
+AC_INIT(vcmi, 0.88b)				# Follow VCMI_VERSION in GameConstants.h
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([aclocal/m4])
 

debian/changelog

@@ -1,3 +1,9 @@
+vcmi (0.88) unstable; urgency=low
+
+  * New upstream release
+
+ -- Ivan Savenko <[email protected]>  Thu, 1 Mar 2012 17:50:09 +0200
+
 vcmi (0.87-1) unstable; urgency=low
 
   * New upstream release
@@ -5,7 +11,6 @@ vcmi (0.87-1) unstable; urgency=low
 
  -- Ivan Savenko <[email protected]>  Sun, 19 Feb 2012 16:20:50 +0200
 
-
 vcmi (0.80-1) unstable; urgency=low
 
   * New upstream release