[SCM] flac/master: Repair upstream manpage regeneration rule.

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Thu Jun 6 10:31:13 UTC 2013


The following commit has been merged in the master branch:
commit e50f163cd4136d90d962101dbd3be1d1e0b3e3dc
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Jun 6 12:13:14 2013 +0200

    Repair upstream manpage regeneration rule.

diff --git a/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch b/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch
new file mode 100644
index 0000000..3f82157
--- /dev/null
+++ b/debian/patches/Revert-man-Makefile-Fail-more-gracefully.patch
@@ -0,0 +1,44 @@
+From f19bf6e040c11ba5535cf141ab7a76af64614a97 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian at greffrath.com>
+Date: Thu, 6 Jun 2013 12:07:58 +0200
+Subject: [PATCH] Revert "man/Makefile : Fail more gracefully."
+
+This reverts commit 023f06f6cbc316127ca1a4fb4178ef344a413bd5.
+---
+ man/Makefile.am |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -18,12 +18,10 @@
+ 
+ if FLaC__HAS_DOCBOOK_TO_MAN
+ flac.1: flac.sgml
+-	docbook-to-man $? > $@
+-	(docbook2man $? && mv FLAC.1 $@)
++	docbook-to-man $? > $@ || (docbook2man $? && mv FLAC.1 $@)
+ 
+ metaflac.1: metaflac.sgml
+-	docbook-to-man $? > $@
+-	(docbook2man $? && mv METAFLAC.1 $@)
++	docbook-to-man $? > $@ || (docbook2man $? && mv METAFLAC.1 $@)
+ else
+ flac.1:
+ 	echo "*** Warning: docbook-to-man not found; man pages will not be built."
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -536,12 +536,10 @@ uninstall-man: uninstall-man1
+ 
+ 
+ @FLaC__HAS_DOCBOOK_TO_MAN_TRUE at flac.1: flac.sgml
+- at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $? > $@
+- at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	(docbook2man $? && mv FLAC.1 $@)
++ at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $? > $@ || (docbook2man $? && mv FLAC.1 $@)
+ 
+ @FLaC__HAS_DOCBOOK_TO_MAN_TRUE at metaflac.1: metaflac.sgml
+- at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $? > $@
+- at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	(docbook2man $? && mv METAFLAC.1 $@)
++ at FLaC__HAS_DOCBOOK_TO_MAN_TRUE@	docbook-to-man $? > $@ || (docbook2man $? && mv METAFLAC.1 $@)
+ @FLaC__HAS_DOCBOOK_TO_MAN_FALSE at flac.1:
+ @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@	echo "*** Warning: docbook-to-man not found; man pages will not be built."
+ @FLaC__HAS_DOCBOOK_TO_MAN_FALSE@	touch $@
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..17e97af
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Revert-man-Makefile-Fail-more-gracefully.patch

-- 
flac packaging



More information about the pkg-multimedia-commits mailing list