[cmor] 190/190: Removing ppc64el workaround; apparently problem fixed. Closes: #768136.

[Alastair McKinstry]

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

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

commit 80c210fae147b9100021c7061d38960e06f3f119
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 15 09:09:34 2015 +0100

    Removing ppc64el workaround; apparently problem fixed. Closes: #768136.
---
 debian/changelog      |  1 +
 debian/control        |  7 +------
 debian/patches/series |  1 -
 debian/rules          | 10 ----------
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0ab351..b7d3c72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ cmor (2.9.1-6) experimental; urgency=medium
   * Standards-Version: 3.9.6.
   * Update home page
   * Add Vcs-Git pointing to debian-science URL
+  * Removing ppc64el workaround; apparently problem fixed. Closes: #768136.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 15 Jul 2015 09:01:48 +0100
 
diff --git a/debian/control b/debian/control
index 6139763..20ce19f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,7 @@ Build-Depends: debhelper (>= 9), dh-buildinfo, libossp-uuid-dev,
  libudunits2-dev, libnetcdf-dev, uuid-dev,
  python-all-dev (>= 2.6.6-3~), python-setuptools (>= 0.6b3), python-numpy,
  libgfortran3, automake, gfortran, pkg-config,
- libcurl4-gnutls-dev [ppc64el], libldap2-dev [ppc64el],
- heimdal-multidev [ppc64el], libsqlite3-dev [ppc64el],
- libsasl2-dev [ppc64el], libkeyutils-dev [ppc64el], libffi-dev [ppc64el],
- libhdf5-mpi-dev | libhdf5-dev [ppc64el],
- librtmp-dev [ppc64el],
- libidn11-dev [ppc64el], libkrb5-dev [ppc64el]
+ libhdf5-serial-dev | libhdf5-dev,
 Build-Conflicts: libcmor2, python-cmor, python3-cmor
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.6
diff --git a/debian/patches/series b/debian/patches/series
index d8c80cd..2ce8c48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,3 @@ cmor_ver.patch
 # python3.patch
 silence-warning.patch
 fix-makefile.patch
-ncldflags.patch
diff --git a/debian/rules b/debian/rules
index ea121cd..c247cf5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,15 +30,6 @@ ifeq ($(BUILD_ARCH_CPU),s390x)
    DO_TEST:=false
 endif
 
-# As of July 2014, ppc64el appears to be a bit broken, as netcdf-dev
-# is not pulling in the libraries it needs. So we hard-code them here
-# and reinvestigate later.
-ifeq ($(BUILD_ARCH_CPU), ppc64el)
-	EXTRA_NCLDFLAGS:="-lhdf5 -lm -lcurl $(NETCDF_LIBS) -lz -lidn -lrtmp -lgcrypt \
-		 -lgnutls -lgssapi_krb5 -llber -lldap_r -lgpg-error -ltasn1 -lp11-kit \
-		 -lk5crypto -lkrb5support -lsasl2 -lkeyutils -lsqlite3"
-endif
-
 %:
 	dh $@ --with python2
 
@@ -47,7 +38,6 @@ override_dh_auto_configure:
 	ln -sf  /usr/share/misc/config.sub 
 	dh_auto_configure -- --disable-color --enable-verbose-test  --with-uuid --without-python \
 		UUIDLDFLAGS="-lossp-uuid" UUIDFLAGS="-I/usr/include/ossp" SZLIBFLAGS=nosz \
-		EXTRA_NCLDFLAGS="$(EXTRA_NCLDFLAGS)" \
 		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_clean:

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