[X2go-Commits] x2goserver.git - backport-lenny (branch) updated: 3.0.99-2-70-g44a17cc
X2go dev team
git-admin at x2go.org
Mon Jul 4 15:25:03 CEST 2011
The branch, backport-lenny has been updated
via 44a17ccb00a05cdcb5ea1986f58ad8227e05d39b (commit)
via 36710609c781da4338857369863b35b828002c26 (commit)
from 427cc2de770109a62fbeebf5b9b683dc1a35b026 (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 44a17ccb00a05cdcb5ea1986f58ad8227e05d39b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jul 4 15:24:50 2011 +0200
re-enable man2html build
commit 36710609c781da4338857369863b35b828002c26
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jul 4 15:24:14 2011 +0200
Fix wrong version file name.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 ++--
debian/x2goserver-extensions.docs | 2 +-
debian/x2goserver.docs | 2 +-
x2goserver-extensions/Makefile | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/Makefile b/Makefile
index 7fe9efe..444112f 100755
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ clean:
cd x2goserver-extensions && make $@
build-indep:
- #cd x2goserver && make $@
- #cd x2goserver-extensions && make $@
+ cd x2goserver && make $@
+ cd x2goserver-extensions && make $@
install:
cd x2goserver && make $@
diff --git a/debian/x2goserver-extensions.docs b/debian/x2goserver-extensions.docs
index 4fbb63c..f000f68 100644
--- a/debian/x2goserver-extensions.docs
+++ b/debian/x2goserver-extensions.docs
@@ -1 +1 @@
-#x2goserver-extensions/.build_man2html/html
+x2goserver-extensions/.build_man2html/html
diff --git a/debian/x2goserver.docs b/debian/x2goserver.docs
index 9486e43..6c7d3af 100644
--- a/debian/x2goserver.docs
+++ b/debian/x2goserver.docs
@@ -1 +1 @@
-#x2goserver/.build_man2html/html
+x2goserver/.build_man2html/html
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index c7ea989..d95bc71 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -71,7 +71,7 @@ install_man:
install_version:
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/versions
- $(INSTALL_FILE) VERSION.x2goserver-extras $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extras
+ $(INSTALL_FILE) VERSION.x2goserver-extensions $(DESTDIR)$(SHAREDIR)/versions/VERSION.x2goserver-extensions
uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
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