[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.0.99-2-89-g90f7556

[X2Go dev team]

The branch, build-baikal has been updated
       via  90f7556e461cd5f626f7a53e0d874a274a6c58da (commit)
      from  f9d2b298dea7a78b35205119bc124f0ac986e727 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog    |    2 ++
 debian/rules        |    9 ++++++++-
 x2goserver/Makefile |    7 +++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

The diff of changes is:
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/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).