[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-9-g52b8c82
X2go dev team
git-admin at x2go.org
Mon Feb 13 20:17:56 CET 2012
The branch, master has been updated
via 52b8c8294c461f9ee3a9311074bc4453833818a2 (commit)
via 53ce826d7ea804ca27c03e382571bdf5f54ed974 (commit)
from b9ece48b618177723721afd452e506bfe521adc5 (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 52b8c8294c461f9ee3a9311074bc4453833818a2
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon Feb 13 20:17:43 2012 +0100
Use ,,'' instead of ,,make'' in Makefile.
commit 53ce826d7ea804ca27c03e382571bdf5f54ed974
Author: Jan Engelhardt <jengelh at medozas.de>
Date: Mon Feb 13 20:00:00 2012 +0100
Use /cgi-bin/man/ path in web'ified man pages.
-----------------------------------------------------------------------
Summary of changes:
Makefile.docupload | 2 +-
debian/changelog | 5 +++++
x2goserver-compat/Makefile | 2 +-
x2goserver-extensions/Makefile | 2 +-
x2goserver-printing/Makefile | 2 +-
x2goserver-pyhoca/Makefile | 2 +-
x2goserver-xsession/Makefile | 2 +-
x2goserver/Makefile | 2 +-
8 files changed, 12 insertions(+), 7 deletions(-)
The diff of changes is:
diff --git a/Makefile.docupload b/Makefile.docupload
index 70dfc1c..8c9e770 100644
--- a/Makefile.docupload
+++ b/Makefile.docupload
@@ -15,7 +15,7 @@ all: doc
doc: clean docbuild docupload
docbuild:
- make -f Makefile build_man2html
+ ${MAKE} -f Makefile build_man2html
docupload:
ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATCH_x2goserver}; rm -Rfv ${DOC_PATCH_x2goserver}/*; }"
diff --git a/debian/changelog b/debian/changelog
index 748b3cb..159a8f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,11 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
- Only run kdialog/zenity from x2goumount-session if either of them exists
in the system's $PATH.
+ [ Jan Engelhardt ]
+ * New upstream version (3.1.0.0):
+ - Use /cgi-bin/man/ path in web'ified man pages.
+ - Use ,,${MAKE}'' instead of ,,make'' in Makefile.
+
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100
x2goserver (3.0.99.10-0~x2go1) unstable; urgency=low
diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile
index 576f9ce..6bdc94c 100755
--- a/x2goserver-compat/Makefile
+++ b/x2goserver-compat/Makefile
@@ -41,7 +41,7 @@ build-arch:
build_man2html:
mkdir -p $(MAN2HTML_DEST)
for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
- for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+ for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
clean: clean_man2html
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index 02a9525..2fe807c 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -41,7 +41,7 @@ build-arch:
build_man2html:
mkdir -p $(MAN2HTML_DEST)
for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
- for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+ for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
clean: clean_man2html
diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile
index 04f93bf..28ee92a 100755
--- a/x2goserver-printing/Makefile
+++ b/x2goserver-printing/Makefile
@@ -41,7 +41,7 @@ build-arch:
build_man2html:
mkdir -p $(MAN2HTML_DEST)
for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
- for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+ for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
clean: clean_man2html
diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile
index aa6a562..8fc06fa 100755
--- a/x2goserver-pyhoca/Makefile
+++ b/x2goserver-pyhoca/Makefile
@@ -41,7 +41,7 @@ build-arch:
build_man2html:
mkdir -p $(MAN2HTML_DEST)
for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
- for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+ for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
clean: clean_man2html
diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile
index 741ec99..7a56c87 100755
--- a/x2goserver-xsession/Makefile
+++ b/x2goserver-xsession/Makefile
@@ -43,7 +43,7 @@ build-arch:
build_man2html:
# mkdir -p $(MAN2HTML_DEST)
# for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
-# for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+# for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
clean: clean_man2html
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index d934497..c90f1c9 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -44,7 +44,7 @@ build-indep: build_man2html
build_man2html:
mkdir -p $(MAN2HTML_DEST)
for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done
- for man_page in $(man_pages); do $(MAN2HTML_BIN) -r $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
+ for man_page in $(man_pages); do $(MAN2HTML_BIN) $(MAN2HTML_SRC)/$$man_page > $(MAN2HTML_DEST)/$$man_page.html; done
clean: clean_arch clean_man2html
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