[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99-2-89-g90f7556
X2go dev team
git-admin at x2go.org
Sun Jul 17 21:52:14 CEST 2011
The branch, master has been updated
via 90f7556e461cd5f626f7a53e0d874a274a6c58da (commit)
via f9d2b298dea7a78b35205119bc124f0ac986e727 (commit)
via 93e38fdce2366863b121ac5a79ead3ea7deef317 (commit)
via ccd4ea167eedebc17f62d30c939b1bb880cfcf8a (commit)
from 9628cb541a6618e1ad96c8a49411028133e4b1cb (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 90f7556e461cd5f626f7a53e0d874a274a6c58da
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Jul 17 21:52:09 2011 +0200
* Fix of Debian clean rules, fix of Makefile's clean rules.
commit f9d2b298dea7a78b35205119bc124f0ac986e727
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Jul 17 21:50:36 2011 +0200
make man2html build easily available in base folder's Makefile
commit 93e38fdce2366863b121ac5a79ead3ea7deef317
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Jul 17 21:50:08 2011 +0200
rebuilt html man pages
commit ccd4ea167eedebc17f62d30c939b1bb880cfcf8a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun Jul 17 21:47:43 2011 +0200
Use source format 3.0 (native).
-----------------------------------------------------------------------
Summary of changes:
Makefile | 5 +++++
debian/changelog | 2 ++
debian/rules | 9 ++++++++-
debian/source/format | 1 +
.../html/man8/x2gosetkeyboard.8.html | 2 +-
.../.build_man2html/html/man8/x2goversion.8.html | 2 +-
.../html/man8/x2gocleansessions.8.html | 2 +-
.../html/man8/x2gocmdexitmessage.8.html | 2 +-
.../html/man8/x2golistdesktops.8.html | 2 +-
.../html/man8/x2golistsessions.8.html | 2 +-
.../.build_man2html/html/man8/x2gomountdirs.8.html | 2 +-
.../.build_man2html/html/man8/x2goprint.8.html | 2 +-
.../html/man8/x2goresume-session.8.html | 2 +-
.../html/man8/x2goruncommand.8.html | 2 +-
.../html/man8/x2goshowblocks.8.html | 2 +-
.../html/man8/x2gostartagent.8.html | 2 +-
.../html/man8/x2gosuspend-session.8.html | 2 +-
.../html/man8/x2goterminate-session.8.html | 2 +-
.../html/man8/x2goumount-session.8.html | 2 +-
x2goserver/Makefile | 7 +++++--
20 files changed, 36 insertions(+), 18 deletions(-)
create mode 100644 debian/source/format
The diff of changes is:
diff --git a/Makefile b/Makefile
index eee6d3d..a9208da 100755
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,11 @@ all: build
build: build-indep
+# make man2html build available from project's base folder...
+build_man2html:
+ cd x2goserver && make $@
+ cd x2goserver-extensions && make $@
+
clean:
cd x2goserver && make $@
cd x2goserver-extensions && make $@
diff --git a/debian/changelog b/debian/changelog
index f5b8dd6..7b83786 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low
local folder sharing.
* Provide C wrapper for setuid call of x2gosqlitewrapper.pl. Remove dependency
from perlsuid.
+ * Use source format 3.0 (native).
+ * Fix of Debian clean rules, fix of Makefile's clean rules.
[Martin Oehler]
* Removes old debug code fragment, fixes x2golistsessions parsing.
diff --git a/debian/rules b/debian/rules
index a5143a5..2af70c1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,11 @@
dh $@
override_dh_auto_install:
- make -f Makefile build-arch
\ No newline at end of file
+ make -f Makefile build-arch
+
+override_dh_auto_clean:
+ rm -fv x2gosqlitewrapper
+ rm -Rfv x2goserver/.build_html
+ rm -Rfv x2goserver-extensions/.build_html
+ dh_auto_clean
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..9f67427
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
\ No newline at end of file
diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
index d787004..4666fa0 100644
--- a/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
+++ b/x2goserver-extensions/.build_man2html/html/man8/x2gosetkeyboard.8.html
@@ -56,6 +56,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
index eeae817..481f392 100644
--- a/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
+++ b/x2goserver-extensions/.build_man2html/html/man8/x2goversion.8.html
@@ -64,6 +64,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
index e25e5d8..8d896e5 100644
--- a/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gocleansessions.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
index c7cab5d..8c45019 100644
--- a/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gocmdexitmessage.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
index 843c9a0..535f75b 100644
--- a/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2golistdesktops.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
index 5f938d9..9d42577 100644
--- a/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2golistsessions.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
index e187787..c0c64b5 100644
--- a/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gomountdirs.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goprint.8.html b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
index fe9e175..e42f484 100644
--- a/x2goserver/.build_man2html/html/man8/x2goprint.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goprint.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
index a6f792d..4c6c3e0 100644
--- a/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goresume-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
index 4c2720d..c9aff9e 100644
--- a/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goruncommand.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
index 4c2720d..c9aff9e 100644
--- a/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goshowblocks.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
index 45fb4f5..a5c2f51 100644
--- a/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gostartagent.8.html
@@ -60,6 +60,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
index 2fe037d..2c28940 100644
--- a/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2gosuspend-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
index ef27d29..063b1fa 100644
--- a/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goterminate-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
index 68f48b9..3a4f259 100644
--- a/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
+++ b/x2goserver/.build_man2html/html/man8/x2goumount-session.8.html
@@ -44,6 +44,6 @@ This manual has been written by Mike Gabriel <<A HREF="mailto:mike.gabriel at da
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 11:58:19 GMT, July 14, 2011
+Time: 19:49:43 GMT, July 17, 2011
</BODY>
</HTML>
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index a4fec0f..2f79e00 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -45,10 +45,13 @@ build_man2html:
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
-clean: clean_man2html
+clean: clean_arch clean_man2html
+
+clean_arch:
+ rm -f x2gosqlitewrapper
clean_man2html:
- rm -rf `dirname $(MAN2HTML_DEST)`
+ rm -Rf `dirname $(MAN2HTML_DEST)`
install: install_scripts install_config install_man install_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