[magics] 11/31: Catchup with -2

[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 156973456085c125f4352e9a0b72c3501f6f799c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 8 07:05:17 2013 +0000

    Catchup with -2
---
 debian/changelog |  7 ++++---
 debian/control   |  4 ++--
 debian/rules     | 12 +++++++++---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a32e463..19d7c9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-magics++ (2.18.15-2) UNRELEASED; urgency=low
+magics++ (2.18.15-2) unstable; urgency=low
 
-  * Homepage moved. 
+  * Don't use emoslib on mips: emoslib needs grib-api, not available there.
+  * Now use --enable-opengl as we have real motif in Debian.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Sat, 15 Jun 2013 09:05:46 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 03 Sep 2013 18:34:14 +0100
 
 magics++ (2.18.15-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 80630b6..2d86a8d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,9 @@ Source: magics++
 Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper  (>= 9) , dh-buildinfo, libhdf5-serial-dev | libhdf5-dev, libnetcdf-dev, libgl1-mesa-dev, libgd2-dev, libemos-dev, libgrib-api-dev, libterralib-dev, libjasper-dev, libcairo2-dev, libpango1.0-dev, autoconf, automake, libtool, gfortran, ttf-dejavu-core, libxml-parser-perl, python-all-dev (>= 2.6.6-3) , swig, chrpath, python-numpy, libopenjpeg-dev, ghostscript, zlib1g-dev, dh-autoreconf (>= 4~), libboost-dev, python-instant, python3-all-dev, libproj-dev
+Build-Depends: debhelper  (>= 9) , dh-buildinfo, libhdf5-serial-dev | libhdf5-dev, libnetcdf-dev, libgl1-mesa-dev, libgd2-dev, libemos-dev [!mips], libgrib-api-dev, libterralib-dev, libjasper-dev, libcairo2-dev, libpango1.0-dev, autoconf, automake, libtool, gfortran, ttf-dejavu-core, libxml-parser-perl, python-all-dev (>= 2.6.6-3) , swig, chrpath, python-numpy, libopenjpeg-dev, ghostscript, zlib1g-dev, dh-autoreconf (>= 4~), libboost-dev, python-instant, python3-all-dev, libproj-dev, lib [...]
 Standards-Version: 3.9.4
-Homepage: https://software.ecmwf.int/wiki/display/MAGP/Magics
+Homepage: http://www.ecmwf.int/products/data/software/magics++.html
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
 
diff --git a/debian/rules b/debian/rules
index bfd822e..a9022e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,12 @@ CFLAGS += -fPIC
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+# Don't use emoslib on mips
+WITH_EMOSLIB:= --with-emos-libraries=/usr/lib --enable-bufr
+ifeq ($(ARCH), mips)
+  WITH_EMOSLIB:=
+endif
+
 # --enable-opengl can't be used as lesstif not supported - missing Motif functionality
 
 override_dh_auto_clean:
@@ -44,8 +50,8 @@ override_dh_auto_configure:
 	# to find libraries _it_ created. And it makes stuff in the install step. bah.
 	# autoreconf -if
 	dh_auto_configure -- \
-		--enable-bufr --enable-static --enable-cairo --with-emos-libraries=/usr/lib \
-		--enable-python \
+		--enable-static --enable-cairo $(WITH_EMOSLIB) \
+		--enable-python --enable-opengl \
 		LDFLAGS="$(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed"  LIBS=" -lX11 -lpng12 -lz" \
 		MAGPLUS_HOME=$(shell pwd)
 override_dh_auto_test check:
@@ -60,7 +66,7 @@ override_dh_auto_install:
 	for pyvers in $(shell pyversions -r) ; do \
                 ver=`echo $$pyvers | sed -e 's/python//g' ` ; \
 		dh_auto_configure -- \
-			--enable-bufr --enable-static --enable-cairo --with-emos-libraries=/usr/lib \
+			--enable-static --enable-cairo --enable-opengl $(WITH_EMOSLIB) \
 			--enable-python PYTHON=$$pyvers PYTHON_VERSION=$$ver \
 			LDFLAGS="$(LDFLAGS) -L$(shell pwd)/src/.libs -Wl,--as-needed" ; \
 		$(MAKE) -C python/Magics clean install PYTHON_INCLUDE_DIR=/usr/include/$$pyvers \

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