[irrlicht] 01/02: Imported Upstream version 1.8.3+dfsg1

[Vincent Cheng]

This is an automated email from the git hooks/post-receive script.

vcheng pushed a commit to branch master
in repository irrlicht.

commit 3da4132c59c4f3930d214e2f9c4739d3af1be9fb
Author: Vincent Cheng <vcheng at debian.org>
Date:   Sun Sep 13 23:56:03 2015 -0700

    Imported Upstream version 1.8.3+dfsg1
---
 changes.txt                | 4 ++++
 include/IrrCompileConfig.h | 4 ++--
 include/irrunpack.h        | 2 +-
 readme.txt                 | 4 ++--
 source/Irrlicht/Makefile   | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/changes.txt b/changes.txt
index ad6f673..ff65796 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,4 +1,8 @@
 --------------------------
+Changes in 1.8.3 (13.9.2015)
+ - Fix the fix for compiling on GCC5 (thanks to est31 for report and patch)
+
+--------------------------
 Changes in 1.8.2 (30.8.2015)
 
  - Add VS2013 project files
diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h
index 5131417..0c9b51c 100644
--- a/include/IrrCompileConfig.h
+++ b/include/IrrCompileConfig.h
@@ -8,11 +8,11 @@
 //! Irrlicht SDK Version
 #define IRRLICHT_VERSION_MAJOR 1
 #define IRRLICHT_VERSION_MINOR 8
-#define IRRLICHT_VERSION_REVISION 2
+#define IRRLICHT_VERSION_REVISION 3
 // This flag will be defined only in SVN, the official release code will have
 // it undefined
 //#define IRRLICHT_VERSION_SVN -alpha
-#define IRRLICHT_SDK_VERSION "1.8.2"
+#define IRRLICHT_SDK_VERSION "1.8.3"
 
 #include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
 
diff --git a/include/irrunpack.h b/include/irrunpack.h
index b42398d..ba47827 100644
--- a/include/irrunpack.h
+++ b/include/irrunpack.h
@@ -11,7 +11,7 @@
 #elif defined (__DMC__)
 #	pragma pack( pop )
 #elif defined( __GNUC__ )
-#   if (__GNUC__ >= 4 ) && (__GNUC_MINOR__ >= 7)
+#   if (__GNUC__ > 4 ) || ((__GNUC__ == 4 ) && (__GNUC_MINOR__ >= 7))
 #	    pragma pack( pop, packing )
 #   endif
 #endif
diff --git a/readme.txt b/readme.txt
index 81bbc5d..f8ba8c2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
 ==========================================================================
-The Irrlicht Engine SDK version 1.8.2
+The Irrlicht Engine SDK version 1.8.3
 ==========================================================================
 
   Welcome the Irrlicht Engine SDK.
@@ -129,7 +129,7 @@ The Irrlicht Engine SDK version 1.8.2
   The Irrlicht Engine License
   ===========================
 
-  Copyright (C) 2002-2012 Nikolaus Gebhardt
+  Copyright (C) 2002-2015 Nikolaus Gebhardt
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
index 1f63c66..6f8aa45 100644
--- a/source/Irrlicht/Makefile
+++ b/source/Irrlicht/Makefile
@@ -1,7 +1,7 @@
 VERSION_MAJOR = 1
 VERSION_MINOR = 8
-VERSION_RELEASE = 2
-# Irrlicht Engine 1.8.2
+VERSION_RELEASE = 3
+# Irrlicht Engine 1.8.3
 # Makefile for Linux
 #
 # To use, just run:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/irrlicht.git