Merge branch 'feature/upstream' into develop

3 files changed, 5 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 6d4ff90..5f19116 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ipmiutil (3.0.5-1) UNRELEASED; urgency=medium
+ipmiutil (3.0.6-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Refresh patches:
@@ -8,6 +8,9 @@ ipmiutil (3.0.5-1) UNRELEASED; urgency=medium
     - With compat level 10 autoreconf called every time.
   * Add new section at README.source to explain the branching model used.
   * Declare compliance with Debian Policy 4.0.0. (No changes needed).
+  * Drop autotools-dev from Build-Depends and drop "--with autotools-dev"
+    from dh because this is already default when using dh compatibility
+    level 10.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 24 Feb 2017 21:19:36 +0100
 
diff --git a/debian/control b/debian/control
index 8733180..ec7eeec 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: utils
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Build-Depends:
- autotools-dev,
  debhelper (>= 10),
  libfreeipmi-dev (>= 1.1.5) | libopenipmi-dev (>=2.0.18),
  libssl-dev,
diff --git a/debian/rules b/debian/rules
index 3b00002..5b4d955 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ CFLAGS += -fPIC
 CONFPARA = --enable-gpl --enable-useflags --enable-libsensors
 
 %:
-	dh $@  --with autotools-dev
+	dh $@
 
 override_dh_auto_configure:
 	$(CURDIR)/beforeconf.sh