[SCM] CLHEP: A Class Library for High Energy Physics branch, master, updated. upstream/2.1.2.3-14-geb51add

Lifeng Sun lifongsun at gmail.com
Tue Jul 10 11:24:35 UTC 2012


The following commit has been merged in the master branch:
commit eb51add946eb7c508584d8df3fe3e12628748c8e
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jul 10 16:49:22 2012 +0800

    debian/rules: change to tiny-style.

diff --git a/debian/changelog b/debian/changelog
index e6e836f..10e5ff2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clhep (2.1.2.4-1) unstable; urgency=low
+
+  * New upstream.
+  * debian/rules: change to tiny-style.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Tue, 10 Jul 2012 16:49:02 +0800
+
 clhep (2.1.2.3-1) unstable; urgency=low
 
   * New upstream.
diff --git a/debian/rules b/debian/rules
index 4453835..80e76d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,61 +10,21 @@ 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/^[^:]*://')
-
-../$(PKGNAME)_$(UPVER).orig.tar.gz:
-	dh_testdir
-	./debian/get-orig-source --upstream-version $(UPVER) $@
-
-get-orig-source: ../$(PKGNAME)_$(UPVER).orig.tar.gz
-
-clean:
-	dh_testdir
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -rf html
 	rm -f doxygen.warnings
-	dh_autoreconf_clean
-	dh_auto_clean
-	dh_clean
 
-configure-stamp:
-	dh_testdir
-	dh_autoreconf
+override_dh_auto_configure:
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-	touch $@
-
-build-arch: configure-stamp
-	dh_testdir
-	$(MAKE) -j$(NUMJOBS)
 
-build-indep: configure-stamp
-	dh_testdir
-	@echo 'Building documentation, this may take a while...'
+override_dh_auto_build-indep:
+	dh_auto_build
 	doxygen doxygen.conf
-	touch $@
-
-binary-arch: build-arch
-	dh $@
-
-binary-indep: build-indep
-	dh $@
-
-binary: binary-arch binary-indep
 
-.PHONY: binary binary-indep binary-arch build build-doc install clean
+%:
+	dh $@ --with autoreconf --parallel

-- 
CLHEP: A Class Library for High Energy Physics



More information about the debian-science-commits mailing list