[Pkg-osm-commits] [SCM] monav branch, master, updated. debian/0.3-1-3-gd938162

[David Paleino]

The following commit has been merged in the master branch:
commit d9381622e3d91d39c0be9f07fa5f24b3b31e5f48
Author: David Paleino <dapal at debian.org>
Date:   Tue Apr 26 12:36:48 2011 +0200

    Dropped 01-fix_build_issues.patch: rather, fix the build system by passing correct parameters and fixing the build order.

diff --git a/debian/changelog b/debian/changelog
index c150f5c..66f78c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ monav (0.3-2) UNRELEASED; urgency=low
 
   * Fix 03-dont_embed_resources.patch: it was using an old slot
     name.
+  * Dropped 01-fix_build_issues.patch: rather, fix the build system
+    by passing correct parameters and fixing the build order.
 
- -- David Paleino <dapal at debian.org>  Tue, 26 Apr 2011 08:50:44 +0200
+ -- David Paleino <dapal at debian.org>  Tue, 26 Apr 2011 12:36:25 +0200
 
 monav (0.3-1) unstable; urgency=low
 
diff --git a/debian/patches/01-fix_build_issues.patch b/debian/patches/01-fix_build_issues.patch
deleted file mode 100644
index aec17ed..0000000
--- a/debian/patches/01-fix_build_issues.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix various FTBFS issues
-Origin: vendor
-Forwarded: no
-
----
- preprocessor/preprocessor.pro   |    1 -
- routingdaemon/routingdaemon.pro |    1 -
- 2 files changed, 2 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
- 
diff --git a/debian/patches/series b/debian/patches/series
index 46cdc3a..15cf0e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-fix_build_issues.patch
 02-toll-booth_routing.patch
 03-dont_embed_resources.patch
 04-fix_typos.patch
diff --git a/debian/rules b/debian/rules
index 685f949..4675073 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,15 +17,22 @@ endif
 
 configure:
 	qmake CONFIG+=debug monavclient.pro -o Makefile.client
-	qmake CONFIG+=debug monavpreprocessor.pro -o Makefile.preprocessor
+	qmake CONFIG+="debug nogui" monavpreprocessor.pro -o Makefile.preprocessor
 	qmake CONFIG+=debug monavpreprocessor-gui.pro -o Makefile.preprocessor-gui
-	qmake CONFIG+=debug monavroutingdaemon.pro -o Makefile.routingdaemon
-	qmake CONFIG+=debug tools/monav-packager/monav-packager.pro -o Makefile.monav-packager
+	qmake CONFIG+="debug nogui" monavroutingdaemon.pro -o Makefile.routingdaemon
+	qmake CONFIG+="debug nogui" tools/monav-packager/monav-packager.pro -o Makefile.monav-packager
 
 override_dh_auto_configure: configure
 
 override_dh_auto_build:
-	for i in client preprocessor preprocessor-gui routingdaemon monav-packager; do \
+	# make non-GUI things
+	for i in preprocessor routingdaemon monav-packager; do \
+	    $(MAKE) -f Makefile.$$i ; \
+	    $(MAKE) -f Makefile.$$i clean ; \
+	done
+
+	# make GUI things
+	for i in client preprocessor-gui; do \
 	    $(MAKE) -f Makefile.$$i ; \
 	done
 

-- 
fast navigation system featuring exact routing