[magics] 02/05: * Rebuild against libterralib3 for terralib, g++5 transitions. * Undo the netcdf transition for 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 573443778d9d7bc0a3b2bd9dfeaffd05a0ebb0f6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Aug 7 06:30:28 2015 +0100

    * Rebuild against libterralib3 for terralib, g++5 transitions.
    * Undo the netcdf transition for the moment
---
 debian/changelog | 4 +++-
 debian/control   | 4 ++--
 debian/rules     | 5 +----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7dd016d..f3071d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-magics++ (2.24.7-4) UNRELEASED; urgency=medium
+magics++ (2.24.7-4) unstable; urgency=medium
 
+  * Rebuild against libterralib3 for terralib, g++5 transitions.
+  * Undo the netcdf transition for the moment
   * Move Qt4 -> Qt5 
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 29 Jul 2015 10:36:42 +0100
diff --git a/debian/control b/debian/control
index 8d085af..86407c6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper  (>= 9) , dh-buildinfo, gfortran, cmake, chrpath,
  dh-python,
- libhdf5-serial-dev | libhdf5-dev, libnetcdf-dev, libnetcdf-cxx-legacy-dev,
+ libhdf5-serial-dev | libhdf5-dev, libnetcdf-dev,
  libgl1-mesa-dev, libgd2-dev, 
  libemos-dev, 
  libgrib-api-dev, 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, python3-all-dev, 
+ 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 815630b..57ac40a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,6 @@ AUTOGENERATED:= libmagplus3.links libmagics++-dev.links libmagplus3.install
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-#QI=/usr/include/$(DEB_HOST_MULTIARCH)/qt5
-#QTINCS=-I$(QI) -I$(QI)/QtCore -I$(QI)/QtWidgets -I$(QI)/QtGui -I$(QI)/QtX11Extras -I$(QI)/QtXml -I$(QI)/QtXmlPatterns
-
 %:
 	dh $@  --with python2 --with-buildsystem=cmake --builddirectory=$(BUILDDIR)
 
@@ -92,7 +89,7 @@ override_dh_auto_configure:
 	(cd python/Magics && ln -s $(BUILDDIR)/python/Magics/Magics.i )
 
 override_dh_auto_test check:
-	echo "Tests disabled; see README-testfailures.txt for details"
+	# echo "Tests disabled; see README-testfailures.txt for details"
 	# (ulimit -s 8192; export PYTHONPATH=$(shell pwd)/swig ; export MAGPLUS_HOME=$(shell pwd) ; $(MAKE) check )
 
 override_dh_auto_install:

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