[X2Go-Commits] x2gognomebindings.git - master (branch) updated: 2.0.2.0-21-g6d854fb

[X2Go dev team]

The branch, master has been updated
       via  6d854fb0a0434702da63884f6d5ed3ea54437b78 (commit)
      from  121eee90603f77e86de63fe0c17590ffe0589bd8 (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 6d854fb0a0434702da63884f6d5ed3ea54437b78
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 17 23:02:37 2013 +0100

    Update MIME cache, desktop database on %post/%postun. Fix installation of icon symlinks.

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

Summary of changes:
 debian/changelog       |    2 ++
 x2gognomebindings.spec |   17 ++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 61b81b2..e8ca121 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ x2gognomebindings (2.0.2.1-0~x2go1) UNRELEASED; urgency=low
       the X2Go GNOMEv2 Bindings package.
     + Use autogen.sh to build package.
     + Install scripts with 0755 permissions.
+    + Update MIME cache, desktop database on %post/%postun.
+    + Fix installation of icon symlinks.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 28 Jul 2013 12:42:33 +0200
 
diff --git a/x2gognomebindings.spec b/x2gognomebindings.spec
index 5fc4db7..d955ece 100644
--- a/x2gognomebindings.spec
+++ b/x2gognomebindings.spec
@@ -60,6 +60,7 @@ make %{?_smp_mflags};
 %install
 mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_sbindir}
 make install DESTDIR="%buildroot" INSTALL_ROOT="%buildroot" STRIP="true";
+install -p -m 755 bin/x2gonautilus %{buildroot}%{_bindir}/
 install -p -m 755 bin/x2gosuspend-session-gnome %{buildroot}%{_bindir}/
 install -p -m 755 bin/x2goumount-session-gnome %{buildroot}%{_bindir}/
 install -p -m 755 sbin/update-gnome-menu-x2go %{buildroot}%{_sbindir}/
@@ -68,9 +69,9 @@ install -p -m 644 VERSION.x2gognomebindings %{buildroot}%{_datadir}/x2go/version
 mkdir -p %{buildroot}%{_datadir}/{applications,icons/gnome/scalable/mimetypes,mime/packages}
 desktop-file-install --vendor="" --dir %{buildroot}%{_datadir}/applications/ share/applications/x2gonautilus.desktop
 desktop-file-install --vendor="" --dir %{buildroot}%{_datadir}/applications/ share/applications/x2gosuspend-gnome2.desktop
-ln -s -f ../../../gnome-colors-common/scalable/devices/drive-harddisk.svg %{buildroot}%{_datadir}/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg
-ln -s -f ../../../gnome-colors-common/scalable/devices/drive-removable-media.svg %{buildroot}%{_datadir}/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg
-ln -s -f ../../../gnome-colors-common/scalable/devices/drive-optical.svg %{buildroot}%{_datadir}/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg
+ln -s -f ../../../gnome/scalable/devices/drive-harddisk.svg %{buildroot}%{_datadir}/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg
+ln -s -f ../../../gnome/scalable/devices/drive-removable-media.svg %{buildroot}%{_datadir}/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg
+ln -s -f ../../../gnome/scalable/devices/drive-optical.svg %{buildroot}%{_datadir}/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg
 install -p -m 644 share/mime/packages/*.xml %{buildroot}%{_datadir}/mime/packages/
 mkdir -p %{buildroot}%{_datadir}/x2go/x2gofeature.d/
 install -p -m 755 share/x2go/x2gofeature.d/*.features %{buildroot}%{_datadir}/x2go/x2gofeature.d/
@@ -83,14 +84,20 @@ install -p -m 644 lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ig
 %post
 /bin/touch --no-create %{_datadir}/icons/gnome &>/dev/null || :
 /usr/sbin/update-gnome-menu-x2go &>/dev/null || :
+/usr/bin/update-mime-database /usr/share/mime &>/dev/null || :
+/usr/bin/update-desktop-database &>/dev/null || :
 
 %preun
 /usr/sbin/update-gnome-menu-x2go --remove &>/dev/null || :
+/usr/bin/update-mime-database /usr/share/mime &>/dev/null || :
+/usr/bin/update-desktop-database &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/gnome &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
+	/bin/touch --no-create %{_datadir}/icons/gnome &>/dev/null
+	/usr/bin/gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
+	/usr/bin/update-mime-database /usr/share/mime &>/dev/null || :
+	/usr/bin/update-desktop-database &>/dev/null || :
 fi
 
 %posttrans


hooks/post-receive
-- 
x2gognomebindings.git (GNOMEv2 bindings for X2Go)

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 "x2gognomebindings.git" (GNOMEv2 bindings for X2Go).