[xmoto] 01/05: Fix src/helpers/utf8.h to build with new g++.

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository xmoto.

commit 0cacd19118415a70fb5752cf041cf443a99b87ee
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon May 18 23:49:21 2015 +0200

    Fix src/helpers/utf8.h to build with new g++.
---
 debian/changelog          |  8 ++++++++
 debian/patches/series     |  1 +
 debian/patches/utf8.patch | 16 ++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e858aef..258bce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xmoto (0.5.11+dfsg-2) UNRELEASED; urgency=medium
+
+  * src/helpers/utf8.h uses the same guard macro as g++'s new
+    unicode/utf8.h; using a more specific guard allows the package to
+    build again.
+
+ -- Stephen Kitt <skitt at debian.org>  Mon, 18 May 2015 23:48:44 +0200
+
 xmoto (0.5.11+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index d34a48e..1a9307a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ manpage.patch
 spelling.patch
 gcc-4.7-fixes.patch
 sa_restorer-removal.patch
+utf8.patch
diff --git a/debian/patches/utf8.patch b/debian/patches/utf8.patch
new file mode 100644
index 0000000..e5d0dfb
--- /dev/null
+++ b/debian/patches/utf8.patch
@@ -0,0 +1,16 @@
+Description: Build with g++'s new utf8.h
+Author: Stephen Kitt <skitt at debian.org>
+
+--- a/src/helpers/utf8.h
++++ b/src/helpers/utf8.h
+@@ -18,8 +18,8 @@
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ =============================================================================*/
+ 
+-#ifndef __UTF8_H__
+-#define __UTF8_H__
++#ifndef __XMOTO_UTF8_H__
++#define __XMOTO_UTF8_H__
+ 
+ #include <vector>
+ #include <string>

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