[SCM] Samba Shared Repository - branch v3-4-test updated

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  f35a774... create-tarball: Make it more comfortable to use the --copy-docs option.
      from  e3dc0f5... s3: Fix bug 6338 -- net rpc trustdom list always display "none"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit f35a774cd0a6837e5440acf51ef1fc032d434007
Author: Karolin Seeger <kseeger at samba.org>
Date:   Thu Nov 26 11:18:39 2009 +0100

    create-tarball: Make it more comfortable to use the --copy-docs option.
    
    Now you can directly specify the 'make release' output dir without any
    modifications.
    
    Karolin
    (cherry picked from commit 77e2d2f1d29b69699f4539abfce7b2f32db843e4)
    (cherry picked from commit 62df932f9dc333f69bf901fe88bfac6fc4e59bcd)

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

Summary of changes:
 release-scripts/create-tarball |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 5c9df90..26a7270 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -116,6 +116,19 @@ function buildDocs
 	rsync -av "${OPT_DOCSDIR}"/ docs/
 	exitOnError $? "Failed top copy docs from ${OPT_DOCSDIR}"
 
+	cd docs/
+	/bin/rm -rf test.pdf Samba4*pdf htmldocs/Samba4* htmldocs/test
+	if [ -d manpages-3 ]; then
+		mv manpages-3 manpages
+	fi
+	if [ -d htmldocs/manpages-3 ]; then
+		mv htmldocs/manpages-3 htmldocs/manpages
+	fi
+	# Sync thanks, history and registry/ into the docs dir
+	rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/registry ../docs/
+	rsync -Ca --exclude=.svn ../../$OPT_BRANCH/docs-xml/archives/ ../docs/
+	cd ../
+
 	return 0
     fi
 


-- 
Samba Shared Repository