[mbtserver] 02/02: deal with ftbfs

[Joost van Baal]

This is an automated email from the git hooks/post-receive script.

joostvb pushed a commit to branch master
in repository mbtserver.

commit d629c6abfa162f1afe5ae68e79eec99dcbb65de0
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date:   Sun Jul 5 11:27:33 2015 +0200

    deal with ftbfs
---
 debian/changelog | 15 +++------------
 debian/control   |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f880e4a..54e2280 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,22 +6,13 @@ mbtserver (0.9-1) experimental; urgency=low
     Debian's Alioth).  Thanks Jeremy T. Bouse.
   * debian/control: change libtimblserver3-dev into libtimblserver4-dev build
     depends.
-  * FIXME: FTBFS:
-    g++ -DHAVE_CONFIG_H -I. -I..  -I../include -D_FORTIFY_SOURCE=2  -g -O2
-     -fstack-protector-strong -Wformat -Werror=format-security -Wall
-     -I/usr/include/libxml2  -I/usr/include/libxml2  -I/usr/include/libxml2
-     -fopenmp  -c -o MbtServerBase.o MbtServerBase.cxx
-    MbtServerBase.cxx: In constructor
-     ‘MbtServer::MbtServerClass::MbtServerClass(Timbl::TimblOpts&)’:
+  * debian/control: more strict build dependency: now libmbt1-dev (>= 3.2.12).
+    Fixes FTBFS:
     MbtServerBase.cxx:161:6: error: ‘VersionName’ is not a member of ‘TimblServer’
     << TimblServer::VersionName() << endl;
       ^
-    MbtServerBase.cxx:161:6: note: suggested alternatives:
-     In file included from MbtServerBase.cxx:34:0:
-     /usr/include/timbl/TimblAPI.h:47:22: note:   ‘Timbl::VersionName’
-     inline std::string VersionName() { return Common::VersionName(); }
                       ^
-    We use libtimbl4-dev 6.4.5-1.  change to > 6.4.5 ?  there is timbl 6.4.6 now
+    FIXME We use libtimbl4-dev 6.4.5-1.  change to > 6.4.5 ?  there is timbl 6.4.6 now
 
  -- Joost van Baal-Ilić <joostvb at debian.org>  Wed, 10 Jun 2015 07:02:52 +0200
 
diff --git a/debian/control b/debian/control
index e658e5d..70c1158 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Joost van Baal-Ilić <joostvb at debian.org>, Ko van der Sloot <ko.vandersloot at uvt.nl>
-Build-Depends: cdbs, debhelper (>= 7), pkg-config, libtimbl4-dev, libtimblserver4-dev, libmbt1-dev, libticcutils2-dev (>= 0.3), libxml2-dev
+Build-Depends: cdbs, debhelper (>= 7), pkg-config, libtimbl4-dev, libtimblserver4-dev, libmbt1-dev (>= 3.2.12), libticcutils2-dev (>= 0.3), libxml2-dev
 Standards-Version: 3.9.4
 Homepage: http://ilk.uvt.nl/mbt/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/mbtserver.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mbtserver.git