[magics] 31/31: remove exception for mips

[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 1fcd16ac743dd23f6fa68229222f5d2562d7cad1
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri May 1 10:49:18 2015 +0100

    remove exception for mips
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3daa2b0..01aa1d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ magics++ (2.24.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Standards-Version: 3.9.6
+  * emoslib now builds on mips, so remove exception for its dependency
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 29 Apr 2015 08:09:32 +0100
 
diff --git a/debian/control b/debian/control
index 46ec90f..3d7a569 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: magics++
 Section: science
 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 [!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, libqt4-dev
+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, libqt4-dev
 Standards-Version: 3.9.6
 Homepage: https://software.ecmwf.int/wiki/display/MAGP/Magics
 X-Python-Version: >= 2.6
diff --git a/debian/rules b/debian/rules
index dcd86d2..8e781d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,9 @@ 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
+#ifeq ($(ARCH), mips)
+#  WITH_EMOSLIB:=
+#endif
 
 override_dh_auto_clean:
 	find . -type l -exec rm {} \;

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