[SCM] pythia8: PYTHIA event generator (C++) of high energy physics branch, master, updated. upstream/8.1.65-10-g793c0e6

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 99b82ec336a1bed876e84760fc9fbae33b20dbf9
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jul 19 08:29:24 2012 +0800

    tiny-style.

diff --git a/debian/rules b/debian/rules
index e5642cc..ca3034c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,69 +8,35 @@ CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 
-LDFLAGSSHARED := LDFLAGS
-
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
 USRCXXFLAGS      := $(CPPFLAGS) $(CXXFLAGS)
 USRLDFLAGSSHARED := $(LDFLAGS)
 
-# package name
-PKGNAME=$(strip $(shell head -n1 debian/changelog | cut -d' ' -f1))
-
-# current package version
 DEBVER=$(strip $(shell \
-		head -n 1 debian/changelog | cut -f 2 -d ' ' | tr -d '()'))
+	head -n 1 debian/changelog | cut -f 2 -d ' ' | tr -d '()'))
 
-# current upstream version (remove any epoch and Debian release number)
 UPVER=$(shell echo $(DEBVER) | \
-		 sed -e 's/-[^-]*$$//' -e 's/^[^:]*://')
+	sed -e 's/-[^-]*$$//' -e 's/^[^:]*://')
 
-export USRCXXFLAGS USRLDFLAGSSHARED MAKEFLAGS UPVER
+export USRCXXFLAGS USRLDFLAGSSHARED UPVER
 
-../$(PKGNAME)_$(UPVER).orig.tar.gz:
-	./debian/get-orig-source --upstream-version $(shell echo $(UPVER) |\
-	       sed -e 's/\.//g') $@
-
-get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
-
-configure-stamp:
+override_dh_auto_configure:
 	dh_auto_configure -- --enable-shared --with-hepmc=/usr \
 		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 	for f in debian/lib*.install.in; do \
 		sed -e 's, at DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH),' $$f \
 			> $${f%.in}; \
 	done
-	touch $@
 
 override_dh_install:
 	dh_install
 	-rm -f debian/libpythia8-dev/usr/include/pythia8/HepMCInterface.h
 
-build-arch: configure-stamp
-	dh_testdir
-	$(MAKE) $(MAKEFLAGS)
-
-build-indep: configure-stamp
-	dh_testdir
+override_dh_auto_build-indep:
+	dh_auto_build
 	cd xmldoc; xelatex worksheet; xelatex worksheet
 	#cd xmldoc; xelatex pythia8100; xelatex pythia8100
 
-build: build-arch
-
-binary-arch: build-arch
-	dh $@
-
-binary-indep: build-indep
-	dh $@
-
-binary: binary-arch binary-indep
-
 %:
-	dh $@ 
-
-.PHONY: build build-arch build-indep binary binary-arch binary-indep get-orig-source
+	dh $@ --parallel

-- 
pythia8: PYTHIA event generator (C++) of high energy physics