[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-341-g416b3d7

X2Go dev team git-admin at x2go.org
Sat Jan 4 11:55:09 CET 2014


The branch, master has been updated
       via  416b3d7d94824f7e272e71adbc02911b205d09db (commit)
      from  1e456df9ead1de07477f79f4eb0f4fab7ab406fa (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 416b3d7d94824f7e272e71adbc02911b205d09db
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Jan 4 11:46:29 2014 +0100

    Fix x2gofm.desktop syntax. (Fixes: #391). x2goserver.spec: Enhance requirement of desktop-file-utils, validate x2gofm.desktop during package build.
    
    Conflicts (resolved by Mike Gabriel):
    	x2goserver.spec

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

Summary of changes:
 debian/changelog                                   |    6 +++++-
 .../share/applications/x2gofm.desktop              |    2 +-
 x2goserver.spec                                    |    5 +++++
 3 files changed, 11 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5bd1722..3a0d29c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,7 +98,11 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low
 
 x2goserver (4.0.1.11-0x2go1) UNRELEASED; urgency=low
 
-  * Continue development on stable branch of X2Go Server...
+  * New upstream version (4.0.1.11):
+    - Fix x2gofm.desktop syntax. (Fixes: #391).
+  * x2goserver.spec:
+    - Enhance requirement of desktop-file-utils, validate x2gofm.desktop
+      during package build.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 04 Jan 2014 11:29:35 +0100
 
diff --git a/x2goserver-fmbindings/share/applications/x2gofm.desktop b/x2goserver-fmbindings/share/applications/x2gofm.desktop
index d747b1e..337cf3d 100644
--- a/x2goserver-fmbindings/share/applications/x2gofm.desktop
+++ b/x2goserver-fmbindings/share/applications/x2gofm.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=x2gofm
-MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go
+MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go;
 Exec=x2gofm %f
 Type=Application
 Terminal=false
diff --git a/x2goserver.spec b/x2goserver.spec
index 5ffac11..1d0928a 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -26,6 +26,7 @@ BuildRequires:  systemd
 %else
 BuildRequires:  man
 %endif
+BuildRequires:  desktop-file-utils
 # So XSESSIONDIR gets linked
 BuildRequires:  xorg-x11-xinit
 # For x2goruncommand - for now
@@ -225,6 +226,8 @@ Summary:        X2Go Server (file manager bindings)
 Requires:       %{name} = %{version}-%{release}
 Requires:       xdg-utils
 Requires:       desktop-file-utils
+Requires(post):   desktop-file-utils
+Requires(postun): desktop-file-utils
 Group:          Applications/Communications
 
 %description fmbindings
@@ -297,6 +300,8 @@ install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver
 %endif
 %endif
 
+desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop
+
 
 %pre common
 getent group x2gouser >/dev/null || groupadd -r x2gouser


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