[SCM] herwig++: Multi-purpose event generator for high energy physics branch, master, updated. upstream/2.6.0-8-g9b15d43

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 9b15d43cde81924f7b0f970c2caea98fc1705d48
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Jun 22 20:54:02 2012 +0800

    debian/rules: change to tiny-style.

diff --git a/debian/rules b/debian/rules
index 581ae34..9497e5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,61 +7,24 @@
 export DH_OPTIONS
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBPATH := /usr/lib/$(DEB_HOST_MULTIARCH)
 
 CPPFLAGS :=$(shell dpkg-buildflags --get CPPFLAGS)
 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)))
-	MAKEFLAGS += -j$(NUMJOBS)
-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/^[^:]*://')
-
-LIBPATH := /usr/lib/$(DEB_HOST_MULTIARCH)
-
-../$(PKGNAME)_$(UPVER).orig.tar.gz:
-	./debian/get-orig-source --upstream-version $(UPVER) $@
+export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 
-get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
-
-configure-stamp:
-	dh_testdir
-	dh_autoreconf
+override_dh_auto_configure:
 	dh_auto_configure -- \
 		--with-thepeg=/usr \
 		--with-gsl=/usr \
 		--with-boost=/usr \
 		--with-fastjet=/usr \
 		--libdir=$(LIBPATH)
-	touch $@
-
-build-arch: configure-stamp
-	dh_testdir
-	$(MAKE) -j$(NUMJOBS)
 
-build-indep: build-arch
-	dh_testdir
-	# Doxygen never terminates even if we fix the doxygen configuration
-	# in ThePEG package.
-	# $(MAKE) html
-
-install: build-arch
-	dh_testdir
-	dh_prep
+override_dh_auto_install:
 	dh_auto_install
 	chrpath -d debian/tmp/$(LIBPATH)/Herwig++/HwMPI.so
 	rm -rf debian/tmp/usr/share/Herwig++/Doc
@@ -69,23 +32,8 @@ install: build-arch
 	    debian/tmp/usr/share/Herwig++/HerwigDefaults.rpo \
 	    debian/tmp/usr/share/Herwig++/defaults/PDF.in
 
-clean:
-	dh_testdir
-	dh_autoreconf_clean
-	dh_auto_clean
-	dh_clean
-
 override_dh_makeshlibs:
 	dh_makeshlibs -n
 
-build: install
-
-binary-indep: build-indep
-	dh $@
-
-binary-arch: build-arch
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep build build-arch build-indep clean install
+%:
+	dh $@ --with autoreconf --parallel

-- 
herwig++: Multi-purpose event generator for high energy physics