[X2Go-Commits] x2gomatebindings.git - build-main (branch) updated: 8e182c47b6cd57587588f06e1bcfa00f11c29434

[X2Go dev team]

The branch, build-main has been updated
       via  8e182c47b6cd57587588f06e1bcfa00f11c29434 (commit)
      from  7576438990bbd9a19f5f51f9f0e4832492c9fe21 (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                                   |    1 +
 debian/control                                     |    3 ++-
 share/applications/x2gonautilus.desktop            |    2 +-
 ...nome-mime-application-sshfscdrom-x2go-gnome.svg |    1 +
 .../gnome-mime-application-sshfscdrom.svg          |    1 -
 ...gnome-mime-application-sshfsdisk-x2go-gnome.svg |    1 +
 .../mimetypes/gnome-mime-application-sshfsdisk.svg |    1 -
 ...-mime-application-sshfsremovable-x2go-gnome.svg |    1 +
 .../gnome-mime-application-sshfsremovable.svg      |    1 -
 share/mime/packages/sshfs.xml                      |    6 +++---
 10 files changed, 10 insertions(+), 8 deletions(-)
 create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg
 delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg
 create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg
 delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg
 create mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg
 delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b5d21e1..2a3e170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low
     - Add man apges for x2goumount-session-gnome, x2gosuspend-session-gnome.
     - Add simple man page for x2gonautilus.
     - Place x2go-suspend.desktop icon in GNOME Network submenu.
+    - Define unique MIME name spaces for X2go SSHFS GNOME icons.
   * Add gnome-menus as dependency.
   * Now fully use debhelper for packaging. Reduced linitian issues
     nearly completely (still open: old-format-menu-file
diff --git a/debian/control b/debian/control
index 51e8346..6f55d7d 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,8 @@ Depends: ${shlibs:Depends},
  ${misc:Depends},
  x2goserver,
  zenity,
- gnome-menus
+ gnome-menus,
+ gnome-colors-common
 Description: Description: x2gognomebindings (GNOME mimetypes for X2go)
  X2go is a server based computing environment with
     - session resuming
diff --git a/share/applications/x2gonautilus.desktop b/share/applications/x2gonautilus.desktop
index 4b9f090..c653e6d 100644
--- a/share/applications/x2gonautilus.desktop
+++ b/share/applications/x2gonautilus.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=x2gonautilus
-MimeType=application/sshfsdisk;application/sshfscdrom;application/sshfsremovable
+MimeType=application/sshfsdisk-x2go-gnome;application/sshfscdrom-x2go-gnome;application/sshfsremovable-x2go-gnome
 Exec=x2gonautilus %f
 Type=Application
 Terminal=false
diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg
new file mode 120000
index 0000000..20f78dd
--- /dev/null
+++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg
@@ -0,0 +1 @@
+/usr/share/icons/gnome-colors-common/scalable/devices/drive-optical.svg
\ No newline at end of file
diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg
deleted file mode 120000
index 92dbac8..0000000
--- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom.svg
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icons/gnome/scalable/devices/drive-optical.svg
\ No newline at end of file
diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg
new file mode 120000
index 0000000..3a2e8f9
--- /dev/null
+++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg
@@ -0,0 +1 @@
+/usr/share/icons/gnome-colors-common/scalable/devices/drive-harddisk.svg
\ No newline at end of file
diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg
deleted file mode 120000
index 388c35e..0000000
--- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk.svg
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icons/gnome/scalable/devices/drive-harddisk.svg
\ No newline at end of file
diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg
new file mode 120000
index 0000000..7ca88a1
--- /dev/null
+++ b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg
@@ -0,0 +1 @@
+/usr/share/icons/gnome-colors-common/scalable/devices/drive-removable-media.svg
\ No newline at end of file
diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg
deleted file mode 120000
index ab47d4e..0000000
--- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable.svg
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/icons/gnome/scalable/devices/drive-removable-media.svg
\ No newline at end of file
diff --git a/share/mime/packages/sshfs.xml b/share/mime/packages/sshfs.xml
index fe04e48..5c8b19e 100644
--- a/share/mime/packages/sshfs.xml
+++ b/share/mime/packages/sshfs.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/sshfscdrom">
+  <mime-type type="application/sshfscdrom-x2go-gnome">
     <comment>SSHFS CDROM</comment>
     <comment xml:lang="de">SSHFS CDROM</comment>
     <glob pattern="*(sshfs-cdrom)"/>
   </mime-type>
-  <mime-type type="application/sshfsdisk">
+  <mime-type type="application/sshfsdisk-x2go-gnome">
     <comment>SSHFS Disk</comment>
     <comment xml:lang="de">SSHFS Freigabe</comment>
     <glob pattern="*(sshfs-disk)"/>
   </mime-type>
-  <mime-type type="application/sshfsremovable">
+  <mime-type type="application/sshfsremovable-x2go-gnome">
     <comment>SSHFS Removable</comment>
     <comment xml:lang="de">SSHFS Gerät</comment>
     <glob pattern="*(sshfs-removable)"/>


hooks/post-receive
-- 
x2gomatebindings.git (x2gomatebindings upstream project)

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 "x2gomatebindings.git" (x2gomatebindings upstream project).