x2goserver.git - master (branch) updated: 3.0.99-2-124-gdf5601a - x2go-commits

26 Jul 2011

The branch, master has been updated
       via  df5601ac74bd12e621d4e0c222258f1031a98178 (commit)
      from  1b6f026049a40682116927108bf86e3ad5fac17b (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 df5601ac74bd12e621d4e0c222258f1031a98178
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Jul 26 13:33:47 2011 +0200

    re-arranged server-side paths for man pages

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

Summary of changes:
 Makefile.docupload |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

The diff of changes is:

diff --git a/Makefile.docupload b/Makefile.docupload
index 5eb154f..69cd63a 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -4,7 +4,8 @@
 
 VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,' | cut -d"-" -f1`
 DOC_HOST=code.x2go.org
-DOC_PATH=/srv/sites/x2go.org/packages/doc/x2goserver/man-pages/
+DOC_PATH_1=/srv/sites/x2go.org/packages/doc/x2goserver/man/
+DOC_PATH_2=/srv/sites/x2go.org/packages/doc/x2goserver-extensions/man/
 DOC_USER=x2go-admin
 
 doc: docbuild docupload
@@ -13,9 +14,9 @@ docbuild:
 	make -f Makefile build_man2html
 
 docupload:
-	
-	ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH}; rm -Rfv ${DOC_PATH}/; mkdir -p ${DOC_PATH}/{x2goserver,x2goserver-extensions}; }"
-	scp -r x2goserver/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/x2goserver/
-	scp -r x2goserver-extensions/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/x2goserver-extensions/
+	ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH_1}; rm -Rfv ${DOC_PATH_1}/*; }"
+	ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH_2}; rm -Rfv ${DOC_PATH_2}/*; }"
+	scp -r x2goserver/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH_1}/
+	scp -r x2goserver-extensions/.build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH_2}/
 
 


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).

    