diff -Nru cluster-glue-1.0.12/debian/changelog cluster-glue-1.0.12/debian/changelog --- cluster-glue-1.0.12/debian/changelog 2018-06-09 08:27:12.000000000 +0000 +++ cluster-glue-1.0.12/debian/changelog 2018-10-12 08:27:51.000000000 +0000 @@ -1,3 +1,12 @@ +cluster-glue (1.0.12-11) unstable; urgency=medium + + * Add patch to use perl interpreter in vcenter script + * Update my email address in Uploaders + * Update Standards-Version to 4.2.1 + * Use asciidoctor instead of asciidoc + + -- Valentin Vidic Fri, 12 Oct 2018 10:27:51 +0200 + cluster-glue (1.0.12-10) unstable; urgency=medium [ Edward Betts ] diff -Nru cluster-glue-1.0.12/debian/control cluster-glue-1.0.12/debian/control --- cluster-glue-1.0.12/debian/control 2018-06-09 08:24:29.000000000 +0000 +++ cluster-glue-1.0.12/debian/control 2018-10-12 07:25:14.000000000 +0000 @@ -3,9 +3,9 @@ Priority: optional Maintainer: Debian HA Maintainers Uploaders: - Valentin Vidic + Valentin Vidic Build-Depends: debhelper (>= 11), - asciidoc, + asciidoctor, autoconf, automake, bison, @@ -44,7 +44,7 @@ uuid-dev, xsltproc, zlib1g-dev -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 Homepage: https://github.com/ClusterLabs/cluster-glue Vcs-Browser: https://salsa.debian.org/ha-team/cluster-glue Vcs-Git: https://salsa.debian.org/ha-team/cluster-glue.git diff -Nru cluster-glue-1.0.12/debian/lintian-overrides cluster-glue-1.0.12/debian/lintian-overrides --- cluster-glue-1.0.12/debian/lintian-overrides 2018-04-25 11:21:25.000000000 +0000 +++ cluster-glue-1.0.12/debian/lintian-overrides 2018-10-12 08:27:51.000000000 +0000 @@ -1,4 +1,3 @@ # Ignore false positive spelling errors cluster-glue: spelling-error-in-binary usr/lib/heartbeat/lrmd EVERYTIME EVERY TIME cluster-glue: spelling-error-in-binary usr/sbin/lrmadmin EVERYTIME EVERY TIME -cluster-glue: spelling-error-in-manpage usr/share/man/man8/hb_report.8.gz some system some systems diff -Nru cluster-glue-1.0.12/debian/patches/asciidoctor.patch cluster-glue-1.0.12/debian/patches/asciidoctor.patch --- cluster-glue-1.0.12/debian/patches/asciidoctor.patch 1970-01-01 00:00:00.000000000 +0000 +++ cluster-glue-1.0.12/debian/patches/asciidoctor.patch 2018-10-12 08:27:51.000000000 +0000 @@ -0,0 +1,45 @@ +Description: Replace deprecated asciidoc with asciidoctor +Author: Valentin Vidic +Last-Update: 2018-10-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -42,12 +42,18 @@ + XSLTPROC_HTML_OPTIONS ?= $(XSLTPROC_OPTIONS) + XSLTPROC_FO_OPTIONS ?= $(XSLTPROC_OPTIONS) + ++if IS_A2X ++MANPAGE_GENERATOR = $(A2X) -f manpage ++else ++MANPAGE_GENERATOR = $(ASCIIDOCTOR) -b manpage ++endif ++ + %.5 %.8 %.1: %.xml + $(XSLTPROC) \ + $(XSLTPROC_MANPAGES_OPTIONS) \ + $(MANPAGES_STYLESHEET) $< + + hb_report.8: hb_report.8.txt +- a2x -f manpage $< ++ $(MANPAGE_GENERATOR) $< + + endif +--- a/configure.ac ++++ b/configure.ac +@@ -526,9 +526,12 @@ + if test "x$XSLTPROC" = "x"; then + AC_MSG_WARN([xsltproc not installed, unable to (re-)build manual pages]) + fi +- AC_PATH_PROGS(ASCIIDOC, asciidoc) +- if test "x$ASCIIDOC" = "x"; then +- AC_MSG_WARN([asciidoc not installed, unable to (re-)build manual pages]) ++ ++ AC_PATH_PROGS(A2X, a2x) ++ AC_PATH_PROGS(ASCIIDOCTOR, asciidoctor) ++ AM_CONDITIONAL(IS_A2X, test x"${A2X}" != x"") ++ if test "x$A2X" = "x" && test "x$ASCIIDOCTOR" = "x"; then ++ AC_MSG_WARN([asciidoc(tor) not installed, unable to (re-)build manual pages]) + fi + fi + AM_CONDITIONAL(BUILD_DOC, test "x$XSLTPROC" != "x" ) diff -Nru cluster-glue-1.0.12/debian/patches/perl-interpreter.patch cluster-glue-1.0.12/debian/patches/perl-interpreter.patch --- cluster-glue-1.0.12/debian/patches/perl-interpreter.patch 1970-01-01 00:00:00.000000000 +0000 +++ cluster-glue-1.0.12/debian/patches/perl-interpreter.patch 2018-08-17 04:25:50.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Fix interpreter for perl scripts + Policy 10.4 states that Perl scripts must use + /usr/bin/perl directly and not via /usr/bin/env +Author: Valentin Vidic +Last-Update: 2018-08-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/plugins/stonith/external/vcenter ++++ b/lib/plugins/stonith/external/vcenter +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # + # External STONITH module for VMWare vCenter/ESX + # diff -Nru cluster-glue-1.0.12/debian/patches/series cluster-glue-1.0.12/debian/patches/series --- cluster-glue-1.0.12/debian/patches/series 2018-05-29 08:46:24.000000000 +0000 +++ cluster-glue-1.0.12/debian/patches/series 2018-10-12 07:21:24.000000000 +0000 @@ -11,3 +11,5 @@ spelling.patch systemd-doc.patch openipmi-selector.patch +perl-interpreter.patch +asciidoctor.patch