Merge branch 'release/debian/3.1.2-13'debian/3.1.2-13

9 files changed, 70 insertions, 12 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..66d89d0
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,33 @@
+ipmiutil for Debian
+-------------------
+
+Hello,
+
+now I use the branching model from Vincent Driessen[1].
+
+I use the gitflow-avh[2]. with the Documentation[3].
+The Debian package can be found here[4].
+
+Please upload unattended uploads use a branch feature/<your title>.
+
+
+Many thanks.
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+[2] https://github.com/petervanderdoes/gitflow-avh
+[3] https://github.com/petervanderdoes/gitflow-avh/wiki
+[4] https://tracker.debian.org/pkg/git-flow
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Fri, 02 Jun 2017 19:00:40 +0200
+
+
+- configure
+    parameter enable-landesk=yes does not work:
+      ipmiapi not found
+
+- copyright
+    Files: hpiutil/SaHpi.*
+      On the site http://www.saforum.org/Page/16627~375335 the file are
+      published under the Artistic License 2.0.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 29 Oct 2014 16:12:18 +0100
diff --git a/debian/changelog b/debian/changelog
index 2b57caa..303eebc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+xbase64 (3.1.2-13) unstable; urgency=medium
+
+  * Change to my new mail address:
+    - debian/control,
+    - debian/copyright
+  * Migrate to debhelper 11:
+    - Change debian/compat to 11.
+    - Bump minimum debhelper version in debian/control to >= 11.
+    - Remove obsolate dh_autoreconf.
+  * Declare compliance with Debian Policy 4.2.1 (No changes needed).
+  * Add new README.source to explain the branching model used.
+  * New debian/source/lintian-overrides.
+  * debian/patches/0120-fix-types-include.diff:
+    - Fix typo.
+  * debian/control:
+    - Switch Vcs-* to new location.
+  * debian/copyright:
+    - Use secure copyright format URI.
+    - Change years for me.
+  * debian/watch:
+    - Use secure URI.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Wed, 03 Oct 2018 12:27:12 +0200
+
 xbase64 (3.1.2-12) unstable; urgency=medium
 
   * Rewrite *.maintscript for unhandled DPKG_MAINTSCRIPT_PACKAGE
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 fb6c475..f31cf13 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,14 @@
 Source: xbase64
 Priority: optional
 Section: libs
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Standards-Version: 3.9.8
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
+Standards-Version: 4.2.1
 Build-Depends:
- debhelper (>= 10),
- dh-autoreconf,
+ debhelper (>= 11),
  doxygen
 Homepage: http://sourceforge.net/projects/xdb/
-Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/xbase64.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xbase64.git
+Vcs-Git: git://jff.email/opt/git/xbase64.git
+Vcs-Browser: https://jff.email/cgit/xbase64.git
 
 Package: libxbase64-1
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 9f64ef1..e354bb2 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: xbase64
 Source: https://sourceforge.net/projects/xdb/
 
@@ -13,7 +13,7 @@ Copyright: 1997-2003  Gary A. Kunkel <gkunkel@zhsac.com>
 License: GPL-2+
 
 Files: debian/*
-Copyright: 2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net>
+Copyright: 2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3.0+
 
 License: LGPL-2.1+
diff --git a/debian/patches/0120-fix-types-include.diff b/debian/patches/0120-fix-types-include.diff
index 8643c44..95fbbe6 100644
--- a/debian/patches/0120-fix-types-include.diff
+++ b/debian/patches/0120-fix-types-include.diff
@@ -1,6 +1,6 @@
 Author: Pino Toscano <pino@debian.org>
 Description: Fix xbtypes.h usage
- a) do not redefine xbOffT everytime xbtypes.h is included
+ a) do not redefine xbOffT every time xbtypes.h is included
  b) do not include xbtypes.h in xbcdx.cpp, since it will be indirectly pulled
     by xbase64.h
 Forwarded: no
diff --git a/debian/rules b/debian/rules
index 14144a0..d95b933 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
 
 %:
-	dh $@ --with autoreconf
+	dh $@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-static
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..1500dd8
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# superfluous since debhelper 11
+source: ancient-libtool
diff --git a/debian/watch b/debian/watch
index 7b25691..96f5808 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=4
-http://qa.debian.org/watch/sf.php/xdb/xbase64[_\-](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
+https://qa.debian.org/watch/sf.php/xdb/xbase64[_\-](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)