tags 628253 + pending thanks Dear maintainer,
I've prepared an NMU for libsfml (versioned as 1.6+dfsg1-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. Konstantinos
diff -u libsfml-1.6+dfsg1/debian/changelog libsfml-1.6+dfsg1/debian/changelog --- libsfml-1.6+dfsg1/debian/changelog +++ libsfml-1.6+dfsg1/debian/changelog @@ -1,3 +1,11 @@ +libsfml (1.6+dfsg1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Patch from Ubuntu by Matthias Klose fix FTBFS. Closes: #628253 + * Don't include system headers in the sf namespace. + + -- Konstantinos Margaritis <mar...@debian.org> Fri, 03 Feb 2012 15:31:30 +0200 + libsfml (1.6+dfsg1-2) unstable; urgency=low * Add patch by Evgeni to build against gcc-4.6 (Closes: #625031) diff -u libsfml-1.6+dfsg1/debian/patches/series libsfml-1.6+dfsg1/debian/patches/series --- libsfml-1.6+dfsg1/debian/patches/series +++ libsfml-1.6+dfsg1/debian/patches/series @@ -1,4 +1,4 @@ -debian/fix-includes.diff -p1 +debian/fix-includes.diff debian/gcc-4.6.diff -p1 debian/interlinking.diff -p1 debian/kfreebsd.diff -p1 diff -u libsfml-1.6+dfsg1/debian/patches/debian/fix-includes.diff libsfml-1.6+dfsg1/debian/patches/debian/fix-includes.diff --- libsfml-1.6+dfsg1/debian/patches/debian/fix-includes.diff +++ libsfml-1.6+dfsg1/debian/patches/debian/fix-includes.diff @@ -12,14 +12,12 @@ -diff --git a/include/SFML/System/ResourcePtr.inl b/include/SFML/System/ResourcePtr.inl -index dbfcd0d..7bda5f1 100755 ---- a/include/SFML/System/ResourcePtr.inl -+++ b/include/SFML/System/ResourcePtr.inl -@@ -22,6 +22,7 @@ - // +Index: libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp +=================================================================== +--- libsfml-1.6+dfsg1.orig/include/SFML/System/Resource.hpp 2011-09-21 15:03:16.449574957 +0000 ++++ libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp 2011-09-21 15:03:34.429601847 +0000 +@@ -29,6 +29,7 @@ + // Headers //////////////////////////////////////////////////////////// - + #include <set> +#include <cstddef> - //////////////////////////////////////////////////////////// - /// Default constructor --- -tg: (7690657..) debian/fix-includes (depends on: debian/scriptheader-in-example-makefiles) + + namespace sf diff -u libsfml-1.6+dfsg1/debian/patches/debian/gcc-4.6.diff libsfml-1.6+dfsg1/debian/patches/debian/gcc-4.6.diff --- libsfml-1.6+dfsg1/debian/patches/debian/gcc-4.6.diff +++ libsfml-1.6+dfsg1/debian/patches/debian/gcc-4.6.diff @@ -104,18 +104,6 @@ #include <SFML/System/Resource.hpp> #include <SFML/System/Unicode.hpp> #include <SFML/Graphics/Drawable.hpp> -diff --git a/include/SFML/System/ResourcePtr.inl b/include/SFML/System/ResourcePtr.inl -index dbfcd0d..7bda5f1 100755 ---- a/include/SFML/System/ResourcePtr.inl -+++ b/include/SFML/System/ResourcePtr.inl -@@ -22,6 +22,7 @@ - // - //////////////////////////////////////////////////////////// - -+#include <cstddef> - - //////////////////////////////////////////////////////////// - /// Default constructor diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp index 36c4c28..350c0cc 100755 --- a/src/SFML/Graphics/Font.cpp
