Merge branch 'release/debian/3.1.1-1'debian/3.1.1-1

7 files changed, 29 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 49161ae..aac4cee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+ipmiutil (3.1.1-1) unstable; urgency=high
+
+  * New upstream release.
+  * Declare compliance with Debian Policy 4.1.5 (No changes needed).
+  * Move source.lintian-overrides to the preferred
+      debian/source/lintian-overrides.
+  * debian/copyright:
+    - Use secure copyright format URI.
+    - Change years for Andy Cress.
+  * debian/rules:
+    - Fix FTBFS with dh_installsystemd (Closes: #901731).
+  * debian/control:
+    - Switch Vcs-* to new location.
+  * Refresh debian/patches/0105-typo.patch.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Tue, 10 Jul 2018 18:21:47 +0200
+
 ipmiutil (3.0.8-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 742f5cd..fe6b53d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,10 @@ Build-Depends:
  libssl-dev,
  libtool-bin,
  openssl
-Standards-Version: 4.1.3
+Standards-Version: 4.1.5
 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
+Vcs-Git: git://jff.email/opt/git/ipmiutil.git
+Vcs-Browser: https://jff.email/cgit/ipmiutil.git
 
 Package: ipmiutil
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 881076d..51bac22 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ipmiutil
 Source: https://sourceforge.net/projects/ipmiutil/
 
@@ -7,7 +7,7 @@ Copyright: 2002-2004 Service Availability(TM) Forum
            1999-2006 Intel Corporation
            2003      Sun Microsystems, Inc
            2009-2011 Kontron America, Inc
-           2010-2016 Andy Cress <arcress@users.sourceforge.net>
+           2010-2017 Andy Cress <arcress@users.sourceforge.net>
 License: BSD-3-clause
 
 Files: debian/*
diff --git a/debian/files b/debian/files
index f83d373..30f349f 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-ipmiutil_3.0.8-1_source.buildinfo utils optional
+ipmiutil_3.1.1-1_source.buildinfo utils optional
diff --git a/debian/patches/0105-typo.patch b/debian/patches/0105-typo.patch
index 3d7f36c..aa7ca54 100644
--- a/debian/patches/0105-typo.patch
+++ b/debian/patches/0105-typo.patch
@@ -1,7 +1,7 @@
 Description: some source typos
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Forwarded: Not possible because not authorized
-Last-Update: 2016-02-18
+Last-Update: 2018-06-26
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/util/ihpm.c
@@ -86,7 +86,7 @@ Index: trunk/util/ievents.c
 ===================================================================
 --- trunk.orig/util/ievents.c
 +++ trunk/util/ievents.c
-@@ -269,12 +269,12 @@ static struct {
+@@ -275,12 +275,12 @@ static struct {
  #define NCRITS  10
  char * crit_int_str[NCRITS] = {  /* Critical Interrupt descriptions */
   /*00*/ "FP NMI  ",  /* Front Panel NMI */
diff --git a/debian/rules b/debian/rules
index 273f1a0..502eb97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ override_dh_installman:
 	dh_installman
 
 override_dh_installsystemd:
-	dh_installsystemd debian/ipmiutil.ipmiutil_wdt.service
-	dh_installsystemd --no-enable --no-start debian/ipmiutil.ipmi_port.service
-	dh_installsystemd --no-enable --no-start debian/ipmiutil.ipmiutil_asy.service
-	dh_installsystemd --no-enable --no-start debian/ipmiutil.ipmiutil_evt.service
+	dh_installsystemd --name ipmiutil_wdt
+	dh_installsystemd --name ipmi_port    --no-enable --no-start
+	dh_installsystemd --name ipmiutil_asy --no-enable --no-start
+	dh_installsystemd --name ipmiutil_evt --no-enable --no-start
diff --git a/debian/source.lintian-overrides b/debian/source/lintian-overrides
index 07a7e84..07a7e84 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source/lintian-overrides