Control: tags -1 + pending patch

attached is the fix, uploading to delayed.
diff -Nru gearmand-1.0.6/debian/changelog gearmand-1.0.6/debian/changelog
--- gearmand-1.0.6/debian/changelog     2015-01-06 09:47:49.000000000 +0100
+++ gearmand-1.0.6/debian/changelog     2015-07-09 12:55:55.000000000 +0200
@@ -1,3 +1,9 @@
+gearmand (1.0.6-5.1) unstable; urgency=medium
+
+  * Fix build with GCC 5, calling cpp with -P. Closes: #777869.
+
+ -- Matthias Klose <d...@debian.org>  Thu, 09 Jul 2015 12:44:56 +0200
+
 gearmand (1.0.6-5) unstable; urgency=medium
 
   * [db0b16d] Add patch to fix endless loop on bad http request.
diff -Nru gearmand-1.0.6/debian/patches/gcc5.diff 
gearmand-1.0.6/debian/patches/gcc5.diff
--- gearmand-1.0.6/debian/patches/gcc5.diff     1970-01-01 01:00:00.000000000 
+0100
+++ gearmand-1.0.6/debian/patches/gcc5.diff     2015-07-09 12:54:42.000000000 
+0200
@@ -0,0 +1,13 @@
+Index: b/m4/boost.m4
+===================================================================
+--- a/m4/boost.m4
++++ b/m4/boost.m4
+@@ -71,7 +71,7 @@ dnl strip `\n' with backquotes, not the
+ dnl boost_cv_lib_version='1_37\r' for instance, which breaks
+ dnl everything else.
+ dnl Cannot use 'dnl' after [$4] because a trailing dnl may break 
AC_CACHE_CHECK
+-(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
++(eval "$ac_cpp -P conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
+   tr -d '\r' |
+   $SED -n -e "$1" >conftest.i 2>&1],
+   [$3],
diff -Nru gearmand-1.0.6/debian/patches/series 
gearmand-1.0.6/debian/patches/series
--- gearmand-1.0.6/debian/patches/series        2015-01-06 09:51:47.000000000 
+0100
+++ gearmand-1.0.6/debian/patches/series        2015-07-09 12:53:58.000000000 
+0200
@@ -1,3 +1,4 @@
 # debian/source/git-patches exported from git by quilt-patches-deb-export-hook
 0001-Bug-715322-gearmand-FTBFS-on-hurd-i386.patch
 0002-bugfix-endless-loop-on-http-bad-request-or-bad-metho.patch
+gcc5.diff

Reply via email to