[Pkg-osm-commits] [SCM] monav branch, master, updated. upstream/0.2+svn405-36-g350b43d

[David Paleino]

The following commit has been merged in the master branch:
commit b2f3c13d3ef84cd8be10da248ceae235936ebf32
Author: David Paleino <dapal at debian.org>
Date:   Fri Mar 11 16:59:43 2011 +0100

    Fix various FTBFS issues (01-fix_build_issues.patch)

diff --git a/debian/changelog b/debian/changelog
index 9e5a853..9211bc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ monav (0.2+svn450-1) UNRELEASED; urgency=low
   * Refresh information in debian/copyright
   * Patches refreshed, 03-fix_source_typos.patch removed (merged
     upstream)
+  * Fix various FTBFS issues (01-fix_build_issues.patch)
 
- -- David Paleino <dapal at debian.org>  Fri, 11 Mar 2011 16:37:37 +0100
+ -- David Paleino <dapal at debian.org>  Fri, 11 Mar 2011 17:09:42 +0100
 
 monav (0.2+svn405-1) experimental; urgency=low
 
diff --git a/debian/patches/01-fix_build_issues.patch b/debian/patches/01-fix_build_issues.patch
new file mode 100644
index 0000000..f46ab24
--- /dev/null
+++ b/debian/patches/01-fix_build_issues.patch
@@ -0,0 +1,42 @@
+From: David Paleino <dapal at debian.org>
+Subject: fix various FTBFS issues
+Origin: vendor
+Forwarded: no
+
+---
+ preprocessor/preprocessor.pro   |    1 -
+ routingdaemon/routingdaemon.pro |    1 -
+ utils/log.cpp                   |    2 +-
+ 3 files changed, 1 insertion(+), 3 deletions(-)
+
+--- monav.orig/routingdaemon/routingdaemon.pro
++++ monav/routingdaemon/routingdaemon.pro
+@@ -6,7 +6,6 @@ INCLUDEPATH += ..
+ DEFINES+=_7ZIP_ST
+ 
+ TARGET = monav-daemon
+-QT -= gui
+ QT +=network
+ 
+ unix {
+--- monav.orig/preprocessor/preprocessor.pro
++++ monav/preprocessor/preprocessor.pro
+@@ -4,7 +4,6 @@
+ TEMPLATE = app
+ CONFIG += link_pkgconfig
+ CONFIG += console
+-QT -= gui
+ 
+ DEFINES+=_7ZIP_ST
+ 
+--- monav.orig/utils/log.cpp
++++ monav/utils/log.cpp
+@@ -67,7 +67,7 @@ Log::~Log()
+ }
+ 
+ // returns the only instance of the log
+-Log::Log* Log::instance()
++Log* Log::instance()
+ {
+ 	static Log log;
+ 	return &log;
diff --git a/debian/patches/01-fix_daemon_compilation.patch b/debian/patches/01-fix_daemon_compilation.patch
deleted file mode 100644
index 89949ab..0000000
--- a/debian/patches/01-fix_daemon_compilation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: re-add gui module, to fix FTBFS
-Forwarded: no
-
----
- routingdaemon/routingdaemon.pro |    1 -
- 1 file changed, 1 deletion(-)
-
---- monav.orig/routingdaemon/routingdaemon.pro
-+++ monav/routingdaemon/routingdaemon.pro
-@@ -6,7 +6,6 @@ INCLUDEPATH += ..
- DEFINES+=_7ZIP_ST
- 
- TARGET = monav-daemon
--QT -= gui
- QT +=network
- 
- unix {
diff --git a/debian/patches/series b/debian/patches/series
index 3ab3080..30b8769 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01-fix_daemon_compilation.patch
+01-fix_build_issues.patch
 02-toll-booth_routing.patch

-- 
fast navigation system featuring exact routing