[magics] 05/10: * Enable GEOTIFF support * Enable tests

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository magics.

commit acaa6fb6d15460e83d12161bf4b3b701561869a4
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jan 9 15:12:57 2016 +0000

    * Enable GEOTIFF support
    * Enable tests
---
 debian/changelog |  2 ++
 debian/control   |  5 ++---
 debian/rules     | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c132683..ff20b10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ magics++ (2.26.2-1) UNRELEASED; urgency=medium
     grib-cmake.patch
   * reproducibility: set LC_ALL=C.UTF-8 when sorting in build
   * B-D on libgrib-api-dev >= 1.14.4-2 for cmake config files.
+  * Enable GEOTIFF support
+  * Enable tests
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 04 Jan 2016 05:35:27 +0000
 
diff --git a/debian/control b/debian/control
index 990a694..e1c9f8d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,14 @@ Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper  (>= 9) , dh-buildinfo, gfortran, cmake, chrpath,
- dh-python,
+ dh-python, python-all-dev, swig, python-numpy, python-instant,
  libhdf5-serial-dev | libhdf5-dev, libnetcdf-dev, libnetcdf-cxx-legacy-dev,
  libgl1-mesa-dev, libgd-dev, 
- libemos-dev, 
+ libemos-dev, libgeotiff-dev,
  libgrib-api-dev (>= 1.14.4-2), libgrib-api-tools,
  libterralib-dev, 
  libjasper-dev, libcairo2-dev, libpango1.0-dev,
  ttf-dejavu-core, libxml-parser-perl, 
- python-all-dev, swig, python-numpy, python-instant,
  libopenjpeg-dev, ghostscript, zlib1g-dev, libboost-dev, libproj-dev, 
  qt5-default, qtbase5-dev
 Standards-Version: 3.9.6
diff --git a/debian/rules b/debian/rules
index 9d68c15..4ae1320 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,14 +12,15 @@ export QT_SELECT=5
 LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 AUTOGENERATED:= libmagplus3v5.links libmagics++-dev.links libmagplus3v5.install
 # Uncomment this to turn on verbose mode.
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 %:
 	dh $@  --with python2 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
 
-export extra_flags += \
+export extra_flags +=  \
+	-DCMAKE_PREFIX_PATH=${LIBDIR}/cmake/grib_api \
 	-DBUILD_SITE=debian \
-	-DHAVE_LIBGD=1 \
+	-DENABLE_LIBGD=1 \
 	-DHAVE_BOOST=1 \
 	-DHAVE_DLFCN_H=1 \
 	-DHAVE_INTTYPES_H=1 \
@@ -41,7 +42,6 @@ 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 \
@@ -58,15 +58,17 @@ export extra_flags += \
 	-DENABLE_PYTHON=ON \
 	-DBUILD_EXAMPLES=ON \
 	-DBUILD_SHARED_LIBS=ON \
-	-DENABLE_TESTS=OFF \
+	-DENABLE_TESTS=ON \
+	-DENABLE_GEOTIFF=ON \
 	-DENABLE_RPATHS=OFF \
 	-DENABLE_CAIRO=ON \
 	-DENABLE_BUFR=ON \
 	-DENABLE_GRIB=ON \
 	-DENABLE_METVIEW=ON \
+	-DENABLE_QT5=ON \
 	-DENABLE_NETCDF=ON \
-	-DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel' \
-	-DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd'
+	-DCMAKE_CXX_FLAGS='$(CXXFLAGS) -I/usr/include/terralib -I/usr/include/terralib/kernel -I/usr/include/geotiff' \
+	-DMAGICS_EXTRA_LIBRARIES='-lterralib -lgd' 
 
 export LD_LIBRARY_PATH:=$(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH)
 
@@ -86,6 +88,7 @@ override_dh_auto_configure:
                 sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
                 done
 	dh_auto_configure -- $(extra_flags)
+	exit 1
 	(cd python/Magics && ln -s $(BUILDDIR)/python/Magics/Magics.i )
 
 override_dh_auto_test check:

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