[X2Go-Commits] [x2goserver] 11/27: x2goserver-fmbindings/Makefile: install share/mime/packages/sshfs-x2go.xml as a plain file, not an executable.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit df066835c108e3ada36e296961c709807e19f5fe
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Feb 20 04:21:47 2018 +0100

    x2goserver-fmbindings/Makefile: install share/mime/packages/sshfs-x2go.xml as a plain file, not an executable.
---
 debian/changelog               | 2 ++
 x2goserver-fmbindings/Makefile | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3c4a7dc..f131bcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
     - x2goserver-x2goagent/Makefile: do not stage rgb file any longer.
       Obsoleted, is now hardcoded into nxagent directly.
     - x2goserver-x2goagent/etc: remove rgb file.
+    - x2goserver-fmbindings/Makefile: install
+      share/mime/packages/sshfs-x2go.xml as a plain file, not an executable.
   * debian/{control,compat}:
     + Bump DH compat level to 9.
   * debian/:
diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile
index 9e4c983..4b68d95 100755
--- a/x2goserver-fmbindings/Makefile
+++ b/x2goserver-fmbindings/Makefile
@@ -58,7 +58,7 @@ install_scripts:
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/applications
 	$(INSTALL_PROGRAM) share/applications/x2gofm.desktop $(DESTDIR)$(PREFIX)/share/applications/
 	$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/mime/packages
-	$(INSTALL_PROGRAM) share/mime/packages/sshfs-x2go.xml $(DESTDIR)$(PREFIX)/share/mime/packages/
+	$(INSTALL_FILE) share/mime/packages/sshfs-x2go.xml $(DESTDIR)$(PREFIX)/share/mime/packages/
 
 install_config:
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git