[thepeg] 05/17: Bump debheleper compat level to 10

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository thepeg.

commit d889db431424bef33ed7bf6ed52e134dc0a311d9
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Mar 8 23:25:24 2017 +0100

    Bump debheleper compat level to 10
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/compat  |  2 +-
 debian/control |  4 +---
 debian/rules   | 30 ++++++------------------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10
diff --git a/debian/control b/debian/control
index 9fc089b..bd3a0a0 100644
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,9 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders:
  Lifeng Sun <lifongsun at gmail.com>,
 Build-Depends:
- autotools-dev,
  chrpath,
- debhelper (>= 8.0.0),
+ debhelper (>= 10),
  default-jdk,
- dh-autoreconf,
  libgsl-dev,
  libhepmc-dev,
  liblhapdf-dev,
diff --git a/debian/rules b/debian/rules
index a271eac..9c6fa59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,12 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-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)
-
-export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
-
-CFG := --prefix=/usr \
+CFG := \
        --enable-unitchecks \
        --with-javagui \
-       --with-rivet=/usr \
-       --with-hepmc=/usr \
-       --libdir=$(LIBPATH)
 
 DEB_BUILD_ARCH     ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBPATH := /usr/lib/$(DEB_HOST_MULTIARCH)
 
 ifeq (,$(findstring $(DEB_BUILD_ARCH), hurd-i386 mips mipsel))
 CFG += --with-LHAPDF=$(LIBPATH)
@@ -32,6 +14,9 @@ else
 CFG += --with-LHAPDF=no
 endif
 
+%:
+	dh $@
+
 override_dh_auto_configure:
 	dh_auto_configure -- $(CFG)
 
@@ -48,6 +33,3 @@ override_dh_auto_install:
 	chrpath -d debian/tmp/usr/bin/setupThePEG
 	chrpath -d debian/tmp/$(LIBPATH)/ThePEG/HepMCAnalysis.so
 	chrpath -d debian/tmp/$(LIBPATH)/ThePEG/RivetAnalysis.so
-
-%:
-	dh $@ --with autoreconf --parallel

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/thepeg.git