[SCM] Samba Shared Repository - branch master updated

[Alexander Bokovoy]

The branch, master has been updated
       via  4a21d2e Fix release script to build full set of documentation
      from  dce8a8e librelease.sh: Move the GPG data to the library section.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4a21d2e7790f1c76cf0d0fcfb2f4a8ef13721532
Author: Alexander Bokovoy <ab at samba.org>
Date:   Tue Oct 2 14:53:38 2012 +0300

    Fix release script to build full set of documentation
    
    build-docs script was not setting XML catalog properly.
    
    In addition, some time ago pdf versions of images were introduced as
    generated dependencies in our books but svg -> pdf rule was not added,
    so building books never finished properly.
    
    Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
    Autobuild-Date(master): Tue Oct  2 16:21:23 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/Makefile          |    3 +++
 release-scripts/build-docs |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 0b4e880..b322bed 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -191,6 +191,9 @@ $(PSDIR)/%.ps: %/index.xml $(PSDIR) xslt/latex.xsl %-images-latex-eps
 %.eps: %.png
 	$(PNGTOPNM) $< | $(PNMTOPS) > $@
 
+%.pdf: %.svg
+	$(INKSCAPE) -z -f $(abspath $<) --export-pdf=$(abspath $@)
+
 $(HTMLHELPDIR)/%: $(DOCBOOKDIR)/%.xml %-images-htmlhelp
 	$(XSLTPROC) --stringparam htmlhelp.chm $*.chm \
 				--stringparam manifest.in.base.dir "$@/" \
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index 5da641a..e909e6e 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -11,6 +11,7 @@ DOCSRCDIR=`dirname $0`/../docs-xml
 pushd $DOCSRCDIR || exit 1
 
 git clean -d -x -f
+export XML_CATALOG_FILES="file:///etc/xml/catalog file://$(pwd)/build/catalog.xml"
 autoconf && \
 	./configure --with-papersize=letter && \
 	make smbdotconf/parameters.all.xml && \
@@ -28,8 +29,6 @@ rsync -Ca --exclude=.svn archives/ ../docs/
 cd ../docs || _exit "Error changing dir to ${DOCSDIR}/../docs/"
 
 /bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
-mv manpages-3 manpages
-mv htmldocs/manpages-3 htmldocs/manpages
 
 cd ../docs-xml || _exit "Error changing dir to ${DOCSDIR}/../docs-xml/"
 make distclean


-- 
Samba Shared Repository