[magics] 20/23: Qt4 stuff builds but not MagPlusQt lib (?)

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository magics.

commit d8e7d3c3e19978d6219ef0a926b2c0fd0a5e2174
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 19 12:57:12 2015 +0100

    Qt4 stuff builds but not MagPlusQt lib (?)
---
 debian/libmagplus3.install | 2 +-
 debian/rules               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/libmagplus3.install b/debian/libmagplus3.install
index b6d0928..7ffefa9 100644
--- a/debian/libmagplus3.install
+++ b/debian/libmagplus3.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/lib/*/libMagPlus.so.3.0.0
-# debian/tmp/usr/lib/*/libMagPlusQt.so.3.0.0 
+debian/tmp/usr/lib/*/libMagPlusQt.so.3.0.0 
diff --git a/debian/rules b/debian/rules
index 76c58f3..4cd7c18 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,12 +64,12 @@ export extra_flags += \
 	-DENABLE_NETCDF=ON \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DENABLE_BUFR=ON \
+	-DMAGICS_QT=1 \
 	-DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel $(QTINCS)' \
 	-DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd'
 
 # Disabled for the moment to debug
-#	-DMAGICS_QT=1 \
-	-DENABLE_STATIC_LIBRARY=ON \
+#	-DENABLE_STATIC_LIBRARY=ON \
 
 export LD_LIBRARY_PATH:=$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)
 

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