--- opencity-0.0.6.4stable~/debian/changelog
+++ opencity-0.0.6.4stable/debian/changelog
@@ -1,3 +1,11 @@
+opencity (0.0.6.4stable-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * gcc-4.7-fixes: Fix build failure with GCC 4.7.  Closes: #667310.
+    - src/tinyxpath/node_set.cpp: Include "../main.h" for HAVE_STDINT_H.
+
+ -- Matej Vela <vela@debian.org>  Fri, 18 May 2012 15:19:25 +0100
+
 opencity (0.0.6.4stable-1) unstable; urgency=low
 
   * New upstream Version
--- opencity-0.0.6.4stable~/debian/patches/gcc-4.7-fixes.patch
+++ opencity-0.0.6.4stable/debian/patches/gcc-4.7-fixes.patch
@@ -0,0 +1,16 @@
+Description: Fix build failure with GCC 4.7
+ - src/tinyxpath/node_set.cpp: Include "../main.h" for HAVE_STDINT_H.
+Bug-Debian: http://bugs.debian.org/667310
+Author: Matej Vela <vela@debian.org>
+Last-Update: 2012-05-18
+
+--- opencity-0.0.6.4stable~/src/tinyxpath/node_set.cpp
++++ opencity-0.0.6.4stable/src/tinyxpath/node_set.cpp
+@@ -22,6 +22,7 @@
+ distribution.
+ */
+ 
++#include "../main.h"
+ #include "node_set.h"
+ #ifdef HAVE_STDINT_H
+ 	#include "stdint.h"			// for intptr_t (32/64 bits void* pointer compatibility)
--- opencity-0.0.6.4stable~/debian/patches/series
+++ opencity-0.0.6.4stable/debian/patches/series
@@ -2,0 +2,1 @@
+gcc-4.7-fixes.patch
