[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-312-gee076cc

X2go dev team git-admin at x2go.org
Mon Sep 26 10:34:29 CEST 2011


The branch, master has been updated
       via  ee076cc20cbafd6057ed5541b0746ce150b2ff3c (commit)
      from  2ed8115be0a51a24cdfdb8fb5b691b9adbaabd95 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ee076cc20cbafd6057ed5541b0746ce150b2ff3c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 26 10:34:14 2011 +0200

    Improve Makefile.docupload.

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

Summary of changes:
 Makefile.docupload |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/Makefile.docupload b/Makefile.docupload
index fece265..70dfc1c 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -5,19 +5,30 @@
 VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
 DOC_HOST=code.x2go.org
 DOC_PATCH_x2goserver=/srv/sites/x2go.org/packages/doc/x2goserver/man/
+DOC_PATCH_printing=/srv/sites/x2go.org/packages/doc/x2goserver-printing/man/
 DOC_PATCH_compat=/srv/sites/x2go.org/packages/doc/x2goserver-compat/man/
 DOC_PATCH_extensions=/srv/sites/x2go.org/packages/doc/x2goserver-extensions/man/
 DOC_USER=x2go-admin
 
-doc: docbuild docupload
+all: doc
+
+doc: clean docbuild docupload
 
 docbuild:
 	make -f Makefile build_man2html
 
 docupload:
 	ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_x2goserver}; rm -Rfv ${DOC_PATCH_x2goserver}/*; }"
+	ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_printing}; rm -Rfv ${DOC_PATCH_printing}/*; }"
 	ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_compat}; rm -Rfv ${DOC_PATCH_compat}/*; }"
 	ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_extensions}; rm -Rfv ${DOC_PATCH_extensions}/*; }"
 	scp -r x2goserver/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATCH_x2goserver}/
+	scp -r x2goserver-printing/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATCH_printing}/
 	scp -r x2goserver-compat/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATCH_compat}/
 	scp -r x2goserver-extensions/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATCH_extensions}/
+
+clean:
+	rm -Rf x2goserver/.build_man2html/html/*
+	rm -Rf x2goserver-printing/.build_man2html/html/*
+	rm -Rf x2goserver-compat/.build_man2html/html/*
+	rm -Rf x2goserver-extensions/.build_man2html/html/*


hooks/post-receive
-- 
x2goserver.git (X2go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2go Server).




More information about the x2go-commits mailing list