Attachment 8436 Details for Bug 9512 – now it is the proposed patch cherry-picked from master

[patch] now it is the proposed patch cherry-picked from master

0001-wafsamba-use-additional-xml-catalog-file-bug-9512.patch (text/plain), 1.57 KB, created by Björn Baumbach on 2013-01-15 22:31:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2013-01-15 22:31:43 UTC

Size: 1.57 KB

patch

obsolete

>From 22f7d7f0619cab81b781a4a4c0e68df37fefd739 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Thu, 20 Dec 2012 10:01:43 +0100
>Subject: [PATCH] wafsamba: use additional xml catalog file (bug #9512)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Add additional "/usr/local/share/xml/catalog" catalog file
>platforms (used by freebsd).
>Fix manual page build on freebsd.
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit d61d2af3727a19cc4ddc88ec2faa8aafff9c7422)
>---
> buildtools/wafsamba/wafsamba.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
>index 9409669..c49f7aa 100644
>--- a/buildtools/wafsamba/wafsamba.py
>+++ b/buildtools/wafsamba/wafsamba.py
>@@ -790,7 +790,8 @@ def SAMBAMANPAGES(bld, manpages):
>     '''build and install manual pages'''
>     bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
>     bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
>-    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
>+    bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
>+
>     for m in manpages.split():
>         source = m + '.xml'
>         bld.SAMBA_GENERATOR(m,
>-- 
>1.7.12.4
>

Flags:

abartlet: review+
obnox: review+

Actions: View

Attachments on bug 9512: 8358 | 8361 | 8363 | 8435 | 8436