tags 560495 + patch pending
thanks
Dear maintainer,
I've prepared an NMU for adept (versioned as 3.0~beta7.2+nmu1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
Mehdi Dogguy
diff -Nru adept-3.0~beta7.2/debian/changelog adept-3.0~beta7.2+nmu1/debian/changelog
--- adept-3.0~beta7.2/debian/changelog 2009-08-30 17:29:08.000000000 +0200
+++ adept-3.0~beta7.2+nmu1/debian/changelog 2010-02-05 23:23:42.000000000 +0100
@@ -1,3 +1,11 @@
+adept (3.0~beta7.2+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix FTBFS due invalid string constant to char* conversion and
+ missing includes (Closes: #560495)
+
+ -- Mehdi Dogguy <me...@debian.org> Fri, 05 Feb 2010 23:22:19 +0100
+
adept (3.0~beta7.2) unstable; urgency=low
* I *might* have been sleeping the last time, uploading with
@@ -396,4 +404,3 @@
* Alpha release.
-- Peter Rockai <m...@mornfall.net> Mon, 22 Aug 2005 12:36:56 +0200
-
diff -Nru adept-3.0~beta7.2/ept/core/desktopfile.h adept-3.0~beta7.2+nmu1/ept/core/desktopfile.h
--- adept-3.0~beta7.2/ept/core/desktopfile.h 2009-07-09 13:47:48.000000000 +0200
+++ adept-3.0~beta7.2+nmu1/ept/core/desktopfile.h 2010-02-05 23:20:38.000000000 +0100
@@ -1,5 +1,6 @@
/// -*- C++ -*- (c) 2006, 2007 Petr Rockai <m...@mornfall.net>
+#include <cstdio>
#include <iostream>
#include <string>
#include <map>
diff -Nru adept-3.0~beta7.2/ept/debtags/debtags.test.h adept-3.0~beta7.2+nmu1/ept/debtags/debtags.test.h
--- adept-3.0~beta7.2/ept/debtags/debtags.test.h 2009-07-09 13:47:48.000000000 +0200
+++ adept-3.0~beta7.2+nmu1/ept/debtags/debtags.test.h 2010-02-05 23:20:48.000000000 +0100
@@ -25,6 +25,8 @@
*/
+#include <cstdio>
+
#include <ept/debtags/debtags.h>
#include <ept/core/apt.h>
diff -Nru adept-3.0~beta7.2/ept/debtags/maint/vocabularyindexer.cc adept-3.0~beta7.2+nmu1/ept/debtags/maint/vocabularyindexer.cc
--- adept-3.0~beta7.2/ept/debtags/maint/vocabularyindexer.cc 2009-07-09 13:47:48.000000000 +0200
+++ adept-3.0~beta7.2+nmu1/ept/debtags/maint/vocabularyindexer.cc 2010-02-05 23:21:06.000000000 +0100
@@ -1,3 +1,4 @@
+#include <cstdio>
#include <ept/debtags/maint/vocabularyindexer.h>
#include <ept/debtags/vocabulary.h>
#include <ept/debtags/maint/vocabularymerger.h>
diff -Nru adept-3.0~beta7.2/ept/debtags/maint/vocabularymerger.cc adept-3.0~beta7.2+nmu1/ept/debtags/maint/vocabularymerger.cc
--- adept-3.0~beta7.2/ept/debtags/maint/vocabularymerger.cc 2009-07-09 13:47:48.000000000 +0200
+++ adept-3.0~beta7.2+nmu1/ept/debtags/maint/vocabularymerger.cc 2010-02-05 23:21:28.000000000 +0100
@@ -22,6 +22,7 @@
#include <ept/debtags/maint/vocabularymerger.h>
#include <ept/debtags/maint/debdbparser.h>
+#include <cstdio>
#include <cassert>
#include <cstring>
diff -Nru adept-3.0~beta7.2/ept/debtags/vocabulary.cc adept-3.0~beta7.2+nmu1/ept/debtags/vocabulary.cc
--- adept-3.0~beta7.2/ept/debtags/vocabulary.cc 2009-07-09 13:47:48.000000000 +0200
+++ adept-3.0~beta7.2+nmu1/ept/debtags/vocabulary.cc 2010-02-05 23:22:09.000000000 +0100
@@ -25,6 +25,7 @@
#include <tagcoll/input/memory.h>
+#include <cstdio>
#include <cstring>
#include <sstream>
@@ -189,7 +190,7 @@
std::string Vocabulary::tagShortName(int id) const
{
const char* fullname = tindex.name(id);
- char* sub = strstr(fullname, "::");
+ const char* sub = strstr(fullname, "::");
if (sub != NULL)
return sub + 2;
else
