[megaglest] 66/143: Merge megaglest NMUs

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository megaglest.

commit e248de8dab93891b7fc69ef953835b550dfb0843
Author: Paul Wise <pabs at debian.org>
Date:   Wed Oct 24 00:26:55 2012 +0000

    Merge megaglest NMUs
---
 debian/changelog            | 15 +++++++++++++++
 debian/copyright            |  4 ++--
 debian/patches/gcc4.7.patch | 31 +++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 4 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ad5724..d5110da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,21 @@ megaglest (3.6.0.3-2) UNRELEASED; urgency=low
 
  -- Eddy Petrișor <eddy.petrisor at gmail.com>  Thu, 04 Oct 2012 22:14:41 +0300
 
+megaglest (3.6.0.3-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/copyright:
+    - Adjust copyright information for UTF8-CPP library (Closes: #690371).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Sun, 21 Oct 2012 16:20:21 +0200
+
+megaglest (3.6.0.3-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/gcc4.7.patch: Fix FTBFS with g++ 4.7. (Closes: #672014).
+
+ -- Sebastian Ramacher <s.ramacher at gmx.at>  Mon, 14 May 2012 11:16:09 +0200
+
 megaglest (3.6.0.3-1) unstable; urgency=low
 
   [ Mark Vejvoda ]
diff --git a/debian/copyright b/debian/copyright
index 5a9f842..b7e960f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -109,8 +109,8 @@ License: BSD-2-clause
  * those of the authors and should not be interpreted as representing official
  * policies, either expressed or implied, of Nicolas P. Rougier.
 
-Files: source/shared_lib/include/util/utf8.h source/shared_lib/include/util/utf8/*
-Copyright: Copyright 2006 Nemanja Trifunovic
+Files: source/shared_lib/include/util/utf8/*
+Copyright: 2006 Nemanja Trifunovic
 License: BSL-1.0
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
new file mode 100644
index 0000000..23a9fca
--- /dev/null
+++ b/debian/patches/gcc4.7.patch
@@ -0,0 +1,31 @@
+Description: Fix build failures with g++ 4.7
+Author: Sebastian Ramacher <s.ramacher at gmx.at>
+Last-Update: 2012-05-13
+Bug-Debian: http://bugs.debian.org/672014
+--- a/source/shared_lib/sources/util/util.cpp
++++ b/source/shared_lib/sources/util/util.cpp
+@@ -33,6 +33,7 @@
+ #ifndef WIN32
+ #include <errno.h>
+ #endif
++#include <unistd.h>
+ 
+ #include "leak_dumper.h"
+ 
+--- a/source/shared_lib/include/graphics/math_util.h
++++ b/source/shared_lib/include/graphics/math_util.h
+@@ -184,10 +184,10 @@
+ 
+ 	Rect2<T> computeBoundingRect() const{
+ 		return Rect2i(
+-			min(p[0].x, p[1].x), 
+-			min(p[0].y, p[2].y), 
+-			max(p[2].x, p[3].x), 
+-			max(p[1].y, p[3].y));
++			std::min(p[0].x, p[1].x), 
++			std::min(p[0].y, p[2].y), 
++			std::max(p[2].x, p[3].x), 
++			std::max(p[1].y, p[3].y));
+ 	}
+ 
+ 	bool isInside(const Vec2<T> &pt) const{
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3e58d6e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gcc4.7.patch

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