[SCM] Rivet: Robust Independent Validation of Experiment and Theory branch, master, updated. upstream/1.8.1-14-g2395198

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 2395198d759c455cd09b651c02c974bc5ac02f97
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jul 14 17:50:11 2012 +0000

    d/rules: change to tiny-style.

diff --git a/debian/changelog b/debian/changelog
index eba1778..aec1ed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rivet (1.8.1-1) unstable; urgency=low
 
   * New upstream release.
+  * debian/rules: change to tiny-style.
 
  -- Lifeng Sun <lifongsun at gmail.com>  Tue, 10 Jul 2012 19:40:19 +0800
 
diff --git a/debian/rules b/debian/rules
index 4aedfa3..4086626 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,30 +13,9 @@ 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
 
-# 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:
-	./debian/get-orig-source --upstream-version $(UPVER) $@
-
-get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
-
-configure-stamp:
-	dh_autoreconf
+override_dh_auto_configure:
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--with-hepmc-incpath=/usr/include \
@@ -46,35 +25,15 @@ configure-stamp:
 		--with-yaml_cpp-incpath=/usr/include \
 		--with-yaml_cpp-libpath=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
-	touch $@
 
-install: build-arch
-	dh_testdir
-	dh_auto_install
+override_dh_auto_install:
+	dh_auto_install --max-parallel=1
 	chrpath -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libRivet.so
 
-build-indep: configure-stamp
+override_dh_auto_build-indep:
+	dh_auto_build
 	$(MAKE) -C doc
 	$(MAKE) dox
 
-build-arch: configure-stamp
-	dh_testdir
-	$(MAKE) -j$(NUMJOBS)
-
-build: build-arch
-
-binary-indep: build-arch build-indep
-	dh $@
-
-binary-arch: install
-	dh $@
-
-binary: binary-arch binary-indep
-
-clean:
-	dh_testdir
-	dh_autoreconf_clean
-	dh_auto_clean
-	dh_clean
-
-.PHONY: binary binary-arch binary-indep build build-arch build-indep install clean
+%:
+	dh $@ --with autoreconf --parallel

-- 
Rivet: Robust Independent Validation of Experiment and Theory