From 336483a6cc5e593393651863944ded9c1ea24246 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 16 Dec 2011 00:21:21 -0600 Subject: [PATCH 1/2] docs: correctly invoke man2html man2html expects to find its input on stdin, so just passing the filename will cause it to hang waiting for input. [man2html 1.6g as shipped in Debian seems to be fine with files on the command line, but apparently other versions aren't? -smcv] Signed-off-by: Jack Nagel Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=43875 --- doc/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 3fdb7803..591efc99 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -118,7 +118,7 @@ if DBUS_HAVE_MAN2HTML html_DATA += $(MAN_HTML_FILES) %.1.html: %.1 - $(AM_V_GEN)( $(MAN2HTML) $< > $@.tmp && mv $@.tmp $@ ) + $(AM_V_GEN)( $(MAN2HTML) < $< > $@.tmp && mv $@.tmp $@ ) endif if DBUS_CAN_UPLOAD_DOCS From a9e14209a25051a119a207a014750af83251b6b1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 8 Feb 2012 19:06:30 +0000 Subject: [PATCH 2/2] NEWS --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 7703661c..100235f9 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,9 @@ D-Bus 1.4.18 (UNRELEASED) • Build tests successfully with older GLib, as found in e.g. Debian 6 (fd.o #41219, Simon McVittie) +• Build documentation correctly if man2html doesn't support filenames on + its command-line (fd.o #43875, Jack Nagel) + • Unix-specific: · Avoid a highly unlikely fd leak (fd.o #29881, Simon McVittie) · Don't close invalid fd -1 if getaddrinfo fails (fd.o #37258, eXeC001er)