[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-275-g9e15a9e

[X2Go dev team]

The branch, master has been updated
       via  9e15a9e0fdb87caab4205a2813844323e8c0af79 (commit)
      from  b39ad0b4b92fdd124cffd823495a72b6f932091a (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 9e15a9e0fdb87caab4205a2813844323e8c0af79
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Dec 9 10:13:36 2013 +0100

    x2goserver-fmbindings/Makefile: install share/applications and share/mime.

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

Summary of changes:
 debian/changelog               |    1 +
 x2goserver-fmbindings/Makefile |    4 ++++
 2 files changed, 5 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 51f6a13..197a8a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,7 @@ x2goserver (4.0.1.10-0x2go1) UNRELEASED; urgency=low
       we broke by trying to fix the fullscreen/geometry issue in x2gostartagent.
       Thanks to Harvey Eneman for tracking this down!!! (Fixes: #355).
     - x2goserver-fmbindings/Makefile: install x2gofm.
+    - x2goserver-fmbindings/Makefile: install share/applications and share/mime.
   * Grab systemd service file from Fedora and ship it upstream.
   * Add init script for RPM based distro. Taken from the Fedora
     package.
diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile
index fecd1f2..dabb659 100755
--- a/x2goserver-fmbindings/Makefile
+++ b/x2goserver-fmbindings/Makefile
@@ -56,6 +56,10 @@ install_scripts:
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
 	$(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/applications
+	$(INSTALL_PROGRAM) share/applications/x2gofm.desktop $(DESTDIR)$(SHAREDIR)/applications/
+	$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/mime/packages
+	$(INSTALL_PROGRAM) share/mime/packages/sshfs-x2go.xml $(DESTDIR)$(SHAREDIR)/mime/packages/
 
 install_config:
 


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