Author: pabs Date: 2012-10-24 00:26:55 +0000 (Wed, 24 Oct 2012) New Revision: 13823
Added: packages/trunk/megaglest/debian/patches/ packages/trunk/megaglest/debian/patches/gcc4.7.patch packages/trunk/megaglest/debian/patches/series Modified: packages/trunk/megaglest/debian/changelog packages/trunk/megaglest/debian/copyright Log: Merge megaglest NMUs Modified: packages/trunk/megaglest/debian/changelog =================================================================== --- packages/trunk/megaglest/debian/changelog 2012-10-16 08:04:11 UTC (rev 13822) +++ packages/trunk/megaglest/debian/changelog 2012-10-24 00:26:55 UTC (rev 13823) @@ -4,6 +4,21 @@ -- Eddy Petrișor <[email protected]> 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 <[email protected]> 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 <[email protected]> Mon, 14 May 2012 11:16:09 +0200 + megaglest (3.6.0.3-1) unstable; urgency=low [ Mark Vejvoda ] Modified: packages/trunk/megaglest/debian/copyright =================================================================== --- packages/trunk/megaglest/debian/copyright 2012-10-16 08:04:11 UTC (rev 13822) +++ packages/trunk/megaglest/debian/copyright 2012-10-24 00:26:55 UTC (rev 13823) @@ -109,8 +109,8 @@ * 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 Added: packages/trunk/megaglest/debian/patches/gcc4.7.patch =================================================================== --- packages/trunk/megaglest/debian/patches/gcc4.7.patch (rev 0) +++ packages/trunk/megaglest/debian/patches/gcc4.7.patch 2012-10-24 00:26:55 UTC (rev 13823) @@ -0,0 +1,31 @@ +Description: Fix build failures with g++ 4.7 +Author: Sebastian Ramacher <[email protected]> +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{ Added: packages/trunk/megaglest/debian/patches/series =================================================================== --- packages/trunk/megaglest/debian/patches/series (rev 0) +++ packages/trunk/megaglest/debian/patches/series 2012-10-24 00:26:55 UTC (rev 13823) @@ -0,0 +1 @@ +gcc4.7.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
