[SCM] ThePEG: Toolkit for High Energy Physics Event Generation branch, master, updated. upstream/1.8.0-13-g57843d9

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 3c201d2181c4f0a6e78a1112ff6e9e05ee149607
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jun 23 16:45:02 2012 +0800

    debian/rules: change to tiny-style.

diff --git a/debian/rules b/debian/rules
index 27b26b9..118252b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,33 +13,11 @@ CFLAGS   :=$(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS :=$(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS  :=$(shell dpkg-buildflags --get LDFLAGS)
 
-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/^[^:]*://')
+export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 
 LIBPATH := /usr/lib/$(DEB_HOST_MULTIARCH)
 
-../$(PKGNAME)_$(UPVER).orig.tar.gz:
-	./debian/get-orig-source --upstream-version $(UPVER) $@
-
-get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
-
-configure-stamp:
-	dh_testdir
-	dh_autoreconf
+override_dh_auto_configure:
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--enable-unitchecks \
@@ -48,19 +26,12 @@ configure-stamp:
 		--with-hepmc=/usr \
 		--with-LHAPDF=$(LIBPATH) \
 		--libdir=$(LIBPATH)
-	touch $@
-
-build-arch: configure-stamp
-	dh_testdir
-	$(MAKE) -j$(NUMJOBS)
 
-build-indep: build-arch
-	dh_testdir
+override_dh_auto_build-indep:
+	dh_auto_build
 	$(MAKE) html
 
-install-arch: build-arch
-	dh_testdir
-	dh_prep
+override_dh_auto_install:
 	dh_auto_install
 	mv debian/tmp/$(LIBPATH)/ThePEG/lib* debian/tmp/$(LIBPATH)
 	sed -i -e 's,/.*debian/tmp,,' \
@@ -70,28 +41,5 @@ install-arch: build-arch
 	chrpath -d debian/tmp/$(LIBPATH)/ThePEG/HepMCAnalysis.so
 	chrpath -d debian/tmp/$(LIBPATH)/ThePEG/RivetAnalysis.so
 
-clean:
-	dh_testdir
-	dh_autoreconf_clean
-	dh_auto_clean
-	dh_clean
-
-build: build-arch
-
-binary-indep: install-arch build-indep
-	dh $@
-
-check:
-	dh_testdir
-	$(MAKE) check
-
-ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-binary-arch: check install-arch
-else
-binary-arch: install-arch
-endif
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep build build-arch build-indep clean install-arch check
+%:
+	dh $@ --with autoreconf --parallel

-- 
ThePEG: Toolkit for High Energy Physics Event Generation