[Pkg-ceph-commits] [ceph] 13/59: d/control, rules: Drop use of dh-autoreconf.

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu/artful
in repository ceph.

commit 9adb7d36287dacc37cfc8ce43e410c77afad5f80
Author: James Page <james.page at ubuntu.com>
Date:   Fri Jun 2 09:53:53 2017 +0000

    d/control,rules: Drop use of dh-autoreconf.
---
 debian/changelog | 1 +
 debian/control   | 1 -
 debian/rules     | 9 +--------
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e407dc..2c77fb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ ceph (12.0.3-0ubuntu1) UNRELEASED; urgency=medium
     - d/p/*: Drop existing patches, either upstream or obsolete due
       to switch to cmake build.
     - d/control: Use yasm on i386.
+    - d/control,rules: Drop use of dh-autoreconf.
   * Use distro provided boost libraries:
     - d/p/disable-boost_container-check.patch: Cherry pick fix from
       upstream VCS to check for Boost.Container headers only.
diff --git a/debian/control b/debian/control
index 662438c..dedad09 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: cmake,
                cython3,
                debhelper (>= 9~),
                default-jdk,
-               dh-autoreconf,
                dh-exec,
                dh-python,
                dh-systemd (>= 1.5),
diff --git a/debian/rules b/debian/rules
index c03bdcb..19b0255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 # -*- makefile -*-
 #export DH_VERBOSE=1
 
-# Limit parallel builds to 2 for now
-
 # minimise needless linking and link to libatomic
 # The last is needed because long long atomic operations are not directly
 # supported by all processor architectures
@@ -41,12 +39,7 @@ ifeq ($(DEB_HOST_ARCH), s390x)
 endif
 
 %:
-	dh $@ --buildsystem=cmake --with javahelper,python2,python3,autoreconf,systemd --parallel --max-parallel=4
-
-# use --as-needed only if supported by dh-autoreconf (to simplify backporting)
-DH_AS_NEEDED=$(shell dpkg --compare-versions $$(dpkg --status dh-autoreconf | grep Version | cut -d' ' -f2) ge 6 && echo --as-needed)
-override_dh_autoreconf:
-	dh_autoreconf $(DH_AS_NEEDED)
+	dh $@ --buildsystem=cmake --with javahelper,python2,python3,systemd --parallel --max-parallel=4
 
 override_dh_auto_configure:
 	dh_auto_configure --buildsystem=cmake -- $(extraopts)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git