[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.1.9-45-g0b67dd2

X2Go dev team git-admin at x2go.org
Mon Jan 6 18:28:29 CET 2014


The branch, build-main has been updated
       via  0b67dd24d737a1a13d83b9ebe1d429480a754fba (commit)
      from  5ef17da0fbb0c8b688fdc80f7e02099cec8fe4e2 (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                                   |    6 +++++-
 .../share/applications/x2gofm.desktop              |    2 +-
 x2goserver.spec                                    |    7 ++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7e03fa5..e5869f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 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 f0b43aa..54e83b7 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -1,5 +1,5 @@
 Name:           x2goserver
-Version:        4.0.1.10
+Version:        4.0.1.11
 Release:        0.0x2go1%{?dist}
 Summary:        X2Go Server
 
@@ -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
@@ -166,6 +167,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
@@ -239,6 +242,8 @@ install -pm0755 %SOURCE2 %{buildroot}%{_initddir}/x2goserver
 %endif
 %endif
 
+desktop-file-validate %{buildroot}%{_datadir}/applications/x2gofm.desktop
+
 
 %pre
 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