[SCM] FastJet: Fast C++ code for the kt and other jet algorithms branch, master, updated. upstream/3.0.2+dfsg-13-gc3fc93e

[Lifeng Sun]

The following commit has been merged in the master branch:
commit c3fc93e724d8c196bd200f7e550de9783985df24
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jul 3 08:03:54 2012 +0800

    debian/rules: change to tiny style.

diff --git a/debian/changelog b/debian/changelog
index 210eea6..1a97c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ fastjet (3.0.3+dfsg-1) unstable; urgency=low
   * libfastjetplugins: links against siscone libraries.
   * Update dependencies of binary packages.
   * debian/get-orig-source: support uscan --destdir option. (Closes: #676983)
+  * debian/rules: change to tiny-style.
 
  -- Lifeng Sun <lifongsun at gmail.com>  Tue, 03 Jul 2012 07:37:02 +0800
 
diff --git a/debian/rules b/debian/rules
index b8ebb47..56fe6a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,57 +14,24 @@ 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 += -j1              # parallel building fails
-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/\+.*$$//')
-
-SRCPKGVER=$(shell echo $(DEBVER) | sed -e 's/-.*$$//')
-
-../$(PKGNAME)_$(SRCPKGVER).orig.tar.gz:
-	./debian/get-orig-source --upstream-version $(UPVER) $@
-
-get-orig-source: ../$(PKGNAME)_$(SRCPKGVER).orig.tar.gz
-
-clean:
-	dh_autoreconf_clean
-	dh_auto_clean
-	dh_clean
-
-configure-stamp:
-	dh_testdir
-	dh_autoreconf
-	dh_auto_configure -- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--prefix=/usr \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--enable-allplugins
-	touch $@
 
-build-arch: configure-stamp
-	$(MAKE) $(MAKEFLAGS)
+override_dh_auto_install:
+	dh_auto_install --max-parallel=1
+
+override_dh_auto_test:
+	dh_auto_test --max-parallel=1
 
-build-indep: configure-stamp
-	dh_testdir
+override_dh_auto_build-indep:
+	dh_auto_build
 	doxygen
 	rm -f html/jquery.js
 
-build: build-arch
-
-binary-arch: build-arch
-	dh $@
-
-binary-indep: build-indep
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: get-orig-source build-indep build-arch build binary-indep binary-arch binary
+%:
+	dh $@ --with autoreconf --parallel

-- 
FastJet: Fast C++ code for the kt and other jet algorithms