[magics] 19/23: WIP: First build, without Qt or static libs at the moment

[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 76f2b12b9b5734ff85ca06013c3601e087e546c0
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Jun 19 10:36:21 2015 +0100

    WIP: First build, without Qt or static libs at the moment
---
 debian/libmagics++-dev.install |  7 +++----
 debian/libmagplus3.install     |  4 ++--
 debian/magics++.install        |  2 +-
 debian/rules                   | 18 ++++++++++--------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/libmagics++-dev.install b/debian/libmagics++-dev.install
index b9b193c..b0b00e8 100644
--- a/debian/libmagics++-dev.install
+++ b/debian/libmagics++-dev.install
@@ -1,10 +1,9 @@
-debian/tmp/usr/lib/*/libMagPlusSingle.a 
-debian/tmp/usr/lib/*/libMagPlusDouble.a 
-debian/tmp/usr/lib/*/libMagPlus.a 
+#debian/tmp/usr/lib/*/libMagPlusSingle.a 
+#debian/tmp/usr/lib/*/libMagPlusDouble.a 
+#debian/tmp/usr/lib/*/libMagPlus.a 
 debian/tmp/usr/include/magics usr/include
 debian/tmp/usr/bin/magics-config usr/bin
 debian/tmp/usr/lib/*/pkgconfig/magics.pc 
-debian/tmp/usr/share/aclocal/magics.m4	usr/share/aclocal
 debian/tmp/usr/bin/magicsCompatibilityChecker usr/bin
 
 
diff --git a/debian/libmagplus3.install b/debian/libmagplus3.install
index 61ef498..b6d0928 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/*/libMagPlus.so.3.0.0
+# debian/tmp/usr/lib/*/libMagPlusQt.so.3.0.0 
diff --git a/debian/magics++.install b/debian/magics++.install
index 24ecec0..f1722eb 100644
--- a/debian/magics++.install
+++ b/debian/magics++.install
@@ -1,3 +1,3 @@
 usr/bin/magjson  
 usr/bin/magmlx  
-usr/bin/mapgen_clip
+# usr/bin/mapgen_clip
diff --git a/debian/rules b/debian/rules
index cba7e21..76c58f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,6 @@ export QT_SELECT=4
 	dh $@  --with python2 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
 
 export extra_flags += \
-	-DBUILD_SITE=debian \
 	-DHAVE_LIBGD=1 \
 	-DHAVE_BOOST=1 \
 	-DHAVE_DLFCN_H=1 \
@@ -41,34 +40,37 @@ export extra_flags += \
 	-DMAGICS_JSON=1 \
 	-DMAGICS_METVIEW=1 \
 	-DMAGICS_GIF=1 \
-	-DMAGICS_QT=1 \
 	-DMAGICS_GIF_ANIMATED=1 \
 	-DMAGICS_TIFF=1 \
 	-DMAGICS_TTF=1 \
 	-DMAGICS_TTF_PATH="share/magics/ttf/" \
-	-DMAGICS_SITE="debian" \
 	-DMAGICS_PYTHON=1 \
 	-DMAGICS_THREADS=1 \
 	-DDISABLE_OS_CHECK=ON \
-	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
 	-DBUILD_DOCUMENTATION=ON \
 	-DENABLE_FORTRAN=ON \
 	-DENABLE_LARGE_FILE_SUPPORT=ON \
 	-DENABLE_PYTHON=ON \
 	-DBUILD_EXAMPLES=ON \
-    -DBUILD_SHARED_LIBS=ON \
+	-DBUILD_SHARED_LIBS=ON \
 	-DENABLE_TESTS=OFF \
 	-DENABLE_RPATHS=OFF \
 	-DENABLE_CAIRO=ON \
-	-DENABLE_BUFR=ON \
+	-DMAGICS_SITE="debian" \
+	-DBUILD_SITE=debian \
 	-DENABLE_GRIB=ON \
 	-DENABLE_METVIEW=ON \
 	-DENABLE_NETCDF=ON \
-	-DENABLE_STATIC_LIBRARY=ON \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DENABLE_BUFR=ON \
 	-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 \
+
 export LD_LIBRARY_PATH:=$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)
 
 override_dh_auto_clean:
@@ -87,7 +89,7 @@ override_dh_auto_configure:
 	ln -sf /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf share/fonts/truetype/ttf-dejavu/
 	# Link terralib
 	[ -e src/terralib ] || ln -sf  /usr/include/terralib src/terralib
-	dh_auto_configure -- $(extra_flags)
+	dh_auto_configure --  $(extra_flags)
 	# Some files are not autogenerated properly, do it here:
 	./tools/xml2cc_new.pl ./src/params/GribDecoder.xml > ./src/decoders/GribDecoderAttributes.h
 	./tools/xml2cc_new.pl ./src/params/GribLoop.xml > ./src/decoders/GribLoopAttributes.h

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