[SCM] LHAPDF: Les Houches Accord PDF Interface branch, master, updated. upstream/5.8.7+repack-22-g1881c7b

[Lifeng Sun]

The following commit has been merged in the master branch:
commit c30fea927f1ea6e0568051dbf5e773f9ad3f7bfd
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Jul 13 22:10:44 2012 +0800

    debian/rules: change to tiny-style.

diff --git a/debian/changelog b/debian/changelog
index a739ac8..35dbdf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 lhapdf (5.8.8-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/rules: change to tiny-style.
 
  -- Lifeng Sun <lifongsun at gmail.com>  Fri, 13 Jul 2012 21:58:38 +0800
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 7e3e6fb..b4a2e48 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, gfortran, swig, python-dev, python-support, octave-pkg-dev, gnuplot
+Build-Depends: debhelper (>= 8), dh-autoreconf, gfortran, swig, python-dev, python-support, octave-pkg-dev, gnuplot
 Build-Depends-Indep: doxygen-latex, ghostscript
 Standards-Version: 3.9.3
 Homepage: http://projects.hepforge.org/lhapdf/
diff --git a/debian/rules b/debian/rules
index 2d51ab8..16b9da8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,57 +18,24 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH), hurd-i386 mips mipsel s390))
 DEB_BUILD_OPTIONS += nocheck
 endif
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else    
-CFLAGS += -O2
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-	NUMJOBS := 1
-endif
-
-export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS MAKEFLAGS
-
-# package name
-PKGNAME=$(strip $(shell head -n1 debian/changelog | cut -d' ' -f1))
-
-# current Debian package version
-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) $@
+export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 
-get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
-
-clean:
-	dh_testdir
-	dh_autoreconf_clean
+override_dh_auto_clean:
 	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
 
-configure-stamp:
-	dh_testdir
-	dh_autoreconf
+override_dh_auto_configure:
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-	touch $@
 
 # OCTDIR
 include /usr/share/octave/debian/defs.make
 
-install: build-arch
+override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/octave-lhapdf$(OCTDIR)
 	strip --remove-section=.comment debian/tmp/usr/share/lhapdf/lhapdf.oct
@@ -76,28 +43,9 @@ install: build-arch
 		debian/octave-lhapdf$(OCTDIR)
 	#octave-depends -poctave-lhapdf
 
-build: build-arch
-
-build-arch: configure-stamp
-	$(MAKE) -j$(NUMJOBS)
-
-build-indep: build-arch
-	dh_testdir
+override_dh_auto_build-indep:
+	dh_auto_build
 	$(MAKE) -C ccwrap dox
 
-binary-indep: install build-indep
-	dh $@
-
-check:
-	dh_testdir
-	$(MAKE) check
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-binary-arch: check install
-else
-binary-arch: install
-endif
-	dh $@
-
-binary: binary-arch binary-indep
-.PHONY: get-orig-source binary binary-indep binary-arch build build-arch build-indep install check
+%:
+	dh $@ --with autoreconf --parallel

-- 
LHAPDF: Les Houches Accord PDF Interface