[adios] 46/207: Remove lustre support

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit b9010ab5dbaddc489ec66595ec96a1d94e5e8380
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jan 29 16:21:38 2013 +0000

    Remove lustre support
---
 debian/changelog |  9 +++++++++
 debian/control   |  5 ++---
 debian/rules     | 24 ++++++++++++------------
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cac806a..efef360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+adios (1.3-11) unstable; urgency=low
+
+  * Comment out lustre support (and remove dependency) as Wheezy will not
+    ship with lustre-dev. Closes: #699262.
+  * Standards-Version: 3.9.4. No changes required.
+  * Update debhelper dependency to 9 for multiarch.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 29 Jan 2013 16:18:53 +0000
+
 adios (1.3-10) unstable; urgency=low
 
   * Patch from Simon Ruderich for hardening flags. Closes: #663925, #663978. 
diff --git a/debian/control b/debian/control
index 89718d6..ef291f8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,8 @@ Source: adios
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), libnetcdf-dev, gfortran, libhdf5-mpi-dev | libhdf5-dev, libmxml-dev, python-all-dev, mpi-default-dev, 
- lustre-dev [i386 amd64 ia64 powerpc]
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9), libnetcdf-dev, gfortran, libhdf5-mpi-dev | libhdf5-dev, libmxml-dev, python-all-dev, mpi-default-dev 
+Standards-Version: 3.9.4
 Homepage: http://www.olcf.ornl.gov/center-projects/adios/
 
 Package: libadios-dev
diff --git a/debian/rules b/debian/rules
index 54981dc..03ec1c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,18 +13,18 @@ endif
 ARCH:=$(shell dpkg --print-architecture)
 WITH_LUSTRE := 
 
-ifeq ($(ARCH), i386) 
-  WITH_LUSTRE:= --with-lustre=/usr
-endif
-ifeq ($(ARCH), amd64)
-  WITH_LUSTRE:= --with-lustre=/usr
-endif
-ifeq ($(ARCH), powerpc) 
-  WITH_LUSTRE:= --with-lustre=/usr
-endif
-ifeq ($(ARCH), ia64) 
-  WITH_LUSTRE:= --with-lustre=/usr
-endif
+#ifeq ($(ARCH), i386) 
+#  WITH_LUSTRE:= --with-lustre=/usr
+#endif
+#ifeq ($(ARCH), amd64)
+#  WITH_LUSTRE:= --with-lustre=/usr
+#endif
+#ifeq ($(ARCH), powerpc) 
+#  WITH_LUSTRE:= --with-lustre=/usr
+#endif
+#ifeq ($(ARCH), ia64) 
+#  WITH_LUSTRE:= --with-lustre=/usr
+#endif
 
 BINDIR=debian/libadios-dev/usr/bin
 DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed

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