[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-311-g0c9b769

[X2Go dev team]

The branch, master has been updated
       via  0c9b769cfbc166bbeab517a88295bacc0e09cea6 (commit)
      from  11ac71b5991581581645a906f75d46b92df79b75 (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 0c9b769cfbc166bbeab517a88295bacc0e09cea6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 28 23:20:46 2013 +0100

    Provide man page for x2goserver.conf.
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

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

Summary of changes:
 debian/changelog                                   |    1 +
 x2goserver/Makefile                                |    3 +++
 .../man/man5/x2goserver.conf.5                     |    0
 3 files changed, 4 insertions(+)
 copy {x2goserver-common => x2goserver}/man/man5/x2goserver.conf.5 (100%)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7950bad..fb8d308 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -104,6 +104,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low
       (derived) systems.
     - Avoid one argument system calls and backticks in x2gocleansessions and
       x2golistsessions_root.
+    - Provide man page for x2goserver.conf.
   * x2goserver.spec:
     + Ship x2goserver.spec (RPM package definitions) in upstream project.
       (Thanks to the Fedora package maintainers).
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index d0ba7e9..43c4304 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -75,6 +75,9 @@ install_config:
 
 install_man:
 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5
+	$(INSTALL_FILE) man/man5/*.5           $(DESTDIR)$(MANDIR)/man5
+	gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5
 	$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8
 	$(INSTALL_FILE) man/man8/*.8           $(DESTDIR)$(MANDIR)/man8
 	gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8
diff --git a/x2goserver-common/man/man5/x2goserver.conf.5 b/x2goserver/man/man5/x2goserver.conf.5
similarity index 100%
copy from x2goserver-common/man/man5/x2goserver.conf.5
copy to x2goserver/man/man5/x2goserver.conf.5


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