[SCM] LHAPDF: Les Houches Accord PDF Interface branch, master, updated. upstream/5.8.7-4-g0edeb05

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 0edeb0567107c2dd6238a295580460da608fcbe6
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jun 9 20:01:29 2012 +0800

    Don't run test-suite on hurd-i386, mips, mipsel and s390.
    
    The test-suite requires memory > 2GB, it seems that buildds of above
    architectures have no enough memory.

diff --git a/debian/changelog b/debian/changelog
index ec6674d..6a2aff3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lhapdf (5.8.7-3) UNRELEASED; urgency=low
+
+  * Disable test-suite on hurd-i386, mips, mipsel and s390.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Sat, 09 Jun 2012 20:54:18 +0800
+
 lhapdf (5.8.7-2) unstable; urgency=low
 
   * Define PATH_MAX to fix FTBFS on hurd-i386.
diff --git a/debian/rules b/debian/rules
index fe955df..eb5294c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -17,19 +7,15 @@
 export DH_OPTIONS
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS   :=$(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS :=$(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS  :=$(shell dpkg-buildflags --get LDFLAGS)
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-cfg= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-cfg=
+ifneq (,$(findstring $(DEB_BUILD_ARCH), hurd-i386 mips mipsel s390))
+DEB_BUILD_OPTIONS += nocheck
 endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -39,8 +25,9 @@ CFLAGS += -O2
 endif
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
+	NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+	NUMJOBS := 1
 endif
 
 export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS
@@ -54,54 +41,62 @@ DEBVER=$(strip $(shell head -n1 debian/changelog | cut -d' ' -f2 | tr -d '()'))
 # current upstream version (remove any epoch and Debian release number)
 UPVER=$(shell echo $(DEBVER) | sed -e 's/-[^-]*$$//' -e 's/^[^:]*://')
 
-               
 ../$(PKGNAME)_$(UPVER).orig.tar.gz:
 	dh_testdir
 	./debian/get-orig-source --upstream-version $(UPVER) $@
 
 get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
 
-override_dh_auto_clean:
+clean:
 	dh_testdir
 	dh_auto_clean
+	dh_clean
 	rm -rf ccwrap/doxy
 	rm -f octave/lhapdf.oct octave/wrapoctave.o
 	rm -f pyext/lhapdf.py pyext/lhapdf_wrap.cc
 	rm -f src/parmsetup.inc
 
-override_dh_auto_configure:
+configure-stamp:
 	dh_testdir
 	autoreconf -iv
-	dh_auto_configure -- $(cfg) \
+	dh_auto_configure -- \
+		--prefix=/usr \
 		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+	touch $@
 
 # OCTDIR
 include /usr/share/octave/debian/defs.make
 
-override_dh_auto_install:
+install: build-arch
 	dh_auto_install
 	mkdir -p debian/octave-lhapdf$(OCTDIR)
 	strip --remove-section=.comment debian/tmp/usr/share/lhapdf/lhapdf.oct
 	install debian/tmp/usr/share/lhapdf/lhapdf.oct \
 		debian/octave-lhapdf$(OCTDIR)
 	#octave-depends -poctave-lhapdf
-	
-build:
-	dh $@
 
-build-doc-stamp: build
+build: build-arch
+
+build-arch: configure-stamp
+	$(MAKE) -j$(NUMJOBS)
+
+build-indep: build-arch
 	dh_testdir
 	$(MAKE) -C ccwrap dox
-	touch $@
 
-binary-indep: build-doc-stamp
+binary-indep: install build-indep
 	dh $@
 
-binary-arch:
-	dh $@
+check:
+	dh_testdir
+	$(MAKE) check
 
-%:
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+binary-arch: install check
+else
+binary-arch: install
+endif
 	dh $@
 
 binary: binary-arch binary-indep
-.PHONY: get-orig-source binary binary-indep binary-arch build
+.PHONY: get-orig-source binary binary-indep binary-arch build build-arch build-indep install

-- 
LHAPDF: Les Houches Accord PDF Interface