monotone

monotone Commit Details

Date:2015-09-01 21:52:46 (3 years 9 months ago)
Author:Markus Wanner
Branch:org.debian.monotone
Commit:1307cec9e1117a579d6ab9f16eb3db4f0f644cb9
Parents: 294735f6fb486226fe2be8d6d341af9c82b121d5
Message:Commit 1.1-4.1 as uploaded.

Changes:
Dpatches/12-fix-std-cerr.diff (full)
Apatches/50-missing-iostream.diff (full)
Mchangelog (1 diff)
Mpatches/series (1 diff)

File differences

changelog
1
1
22
3
4
3
4
55
6
6
77
88
99
monotone (1.1-5) UNRELEASED; urgency=medium
monotone (1.1-4.1) unstable; urgency=medium
* Add patch 12-fix-std-cerr.diff to make std::cerr known.
Closes: #796734.
* Non-maintainer upload.
* Fix FTBFS due to missing #include <iostream>. Closes: #796734
-- Markus Wanner <markus@bluegap.ch> Tue, 25 Aug 2015 21:12:31 +0200
-- Christian Hofstaedtler <zeha@debian.org> Wed, 26 Aug 2015 12:48:57 +0000
monotone (1.1-4) unstable; urgency=medium
patches/12-fix-std-cerr.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
Description: Add an include for std::cerr.
Author: Markus Wanner <markus@bluegap.ch>
Last-Update: 2015-08-25
--- a/test/unit/tests/merge_3way.cc
+++ b/test/unit/tests/merge_3way.cc
@@ -9,6 +9,9 @@
// PURPOSE.
#include "../../../src/base.hh"
+
+#include <iostream>
+
#include "../unit_tests.hh"
#include "../../../src/merge_content.hh"
patches/50-missing-iostream.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
Description: Fix FTBFS because of missing iostream include
Author: Christian Hofstaedtler <zeha@debian.org>
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;
patches/series
11
22
3
3
44
00-copyright-clarification.diff
11-no-gettext-on-lua.diff
12-fix-std-cerr.diff
50-missing-iostream.diff
90-stacktrace-on-crash.diff

Archive Download the corresponding diff file

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status