[Monotone-debian] Bug#796734: monotone: diff for NMU version 1.1-4.1

[Christian Hofstaedtler]

Control: tags 796734 + patch
Control: tags 796734 + pending

Dear maintainer,

I've prepared an NMU for monotone (versioned as 1.1-4.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Best,
Christian


diff -Nru monotone-1.1/debian/changelog monotone-1.1/debian/changelog
--- monotone-1.1/debian/changelog       2014-06-25 08:56:16.000000000 +0000
+++ monotone-1.1/debian/changelog       2015-08-26 12:49:23.000000000 +0000
@@ -1,3 +1,10 @@
+monotone (1.1-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS due to missing #include <iostream>. Closes: #796734
+
+ -- Christian Hofstaedtler <address@hidden>  Wed, 26 Aug 2015 12:48:57 +0000
+
 monotone (1.1-4) unstable; urgency=medium
 
   * Allow compilation against lua version 5.2, if available.
diff -Nru monotone-1.1/debian/patches/50-missing-iostream.diff 
monotone-1.1/debian/patches/50-missing-iostream.diff
--- monotone-1.1/debian/patches/50-missing-iostream.diff        1970-01-01 
00:00:00.000000000 +0000
+++ monotone-1.1/debian/patches/50-missing-iostream.diff        2015-08-26 
11:29:01.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Fix FTBFS because of missing iostream include
+Author: Christian Hofstaedtler <address@hidden>
+Origin: Debian
+Bug-Debian: https://bugs.debian.org/796734
+Forwarded: no
+Last-Update: 2015-08-26
+
+--- monotone-1.1.orig/test/unit/tests/merge_3way.cc
++++ monotone-1.1/test/unit/tests/merge_3way.cc
+@@ -17,6 +17,8 @@
+ #include "../randomfile.hh"
+ #include "../../../src/simplestring_xform.hh"
+ 
++#include <iostream>
++
+ using std::cerr;
+ using std::cout;
+ using std::stringstream;
diff -Nru monotone-1.1/debian/patches/series monotone-1.1/debian/patches/series
--- monotone-1.1/debian/patches/series  2014-06-10 13:12:22.000000000 +0000
+++ monotone-1.1/debian/patches/series  2015-08-26 12:52:09.000000000 +0000
@@ -1,3 +1,4 @@
 00-copyright-clarification.diff
 11-no-gettext-on-lua.diff
+50-missing-iostream.diff
 90-stacktrace-on-crash.diff

-- 
 ,''`.  Christian Hofstaedtler <address@hidden>
: :' :  Debian Developer
`. `'   7D1A CFFA D9E0 806C 9C4C  D392 5C13 D6DB 9305 2E03
  `-

pgpII1qDPTmqs.pgp
Description: PGP signature