Merge branch 'feature/upstream' into develop

5 files changed, 21 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index c02b2cd..9310caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+ipmiutil (3.0.8-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    - Refresh debian/patch/0700-init.patch.
+  * Change to my new mail address:
+    - debian/control,
+    - debian/copyright
+  * Declare compliance with Debian Policy 4.1.3 (No changes needed).
+  * Migrate to debhelper 11:
+    - Change debian/compat to 11.
+    - Bump minimum debhelper version in debian/control to >= 11.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 14 Jan 2018 19:53:04 +0100
+
 ipmiutil (3.0.7-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 0322be5..742f5cd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: ipmiutil
 Section: utils
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  libfreeipmi-dev (>= 1.1.5) | libopenipmi-dev (>=2.0.18),
  libssl-dev,
  libtool-bin,
  openssl
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Homepage: https://sourceforge.net/projects/ipmiutil/
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/ipmiutil.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ipmiutil.git
diff --git a/debian/copyright b/debian/copyright
index b31776d..881076d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Copyright: 2002-2004 Service Availability(TM) Forum
 License: BSD-3-clause
 
 Files: debian/*
-Copyright: 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+Copyright: 2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: BSD-3-clause
 
 Files: kern/bmcpanic-2.4.*
diff --git a/debian/patches/0700-init.patch b/debian/patches/0700-init.patch
index be24a2a..64993d8 100644
--- a/debian/patches/0700-init.patch
+++ b/debian/patches/0700-init.patch
@@ -210,7 +210,7 @@ Index: trunk/configure.ac
 ===================================================================
 --- trunk.orig/configure.ac
 +++ trunk/configure.ac
-@@ -399,11 +399,11 @@ else
+@@ -410,11 +410,11 @@ else
  		MD2_CFLAGS="-DSKIP_MD2"
  		init0=/etc/rc.d/init.d
          fi
@@ -224,5 +224,5 @@ Index: trunk/configure.ac
 +#	   sed -i 's/# Default-Stop:/# Default-Stop:  0 1 2 6/' $init_scripts
 +#	fi
      # The openssl rpm might not be installed
+ 	sslver=""
      which rpm >/dev/null 2>&1
- 	if test $? -eq 0 ; then