[X2go-Commits] x2gognomebindings.git - master (branch) updated: 2.0.1.1-17-gb36385a

[X2go dev team]

The branch, master has been updated
       via  b36385ad0b603cc5199e8b0e02bbab314764456d (commit)
      from  b183ea694b44fe6577d8e84932ed67c301de47a9 (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 b36385ad0b603cc5199e8b0e02bbab314764456d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 25 17:50:32 2011 +0200

    re-added x2gosuspend xdg-menu item (now that I have understood the mechanism...)

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

Summary of changes:
 debian/changelog                   |    1 -
 debian/x2gognomebindings.install   |    1 +
 sbin/update-gnome-menu-x2go        |    2 +-
 xdg-menus/gnome-settings-x2go.menu |   13 +++++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 xdg-menus/gnome-settings-x2go.menu

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index c72984a..e6d78f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,6 @@ x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low
   * Now fully use debhelper for packaging. Reduced linitian issues
     nearly completely (still open: old-format-menu-file
     /usr/share/menu/x2gognomebindings).
-  * Remove XDG menu item, not needed for GNOME specific package.
   * Use source format 3.0 (native).
   * Add linitian-overrides an man pages to package.
 
diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install
index 5b17624..f07eb37 100644
--- a/debian/x2gognomebindings.install
+++ b/debian/x2gognomebindings.install
@@ -7,3 +7,4 @@ VERSION.x2gognomebindings               usr/share/x2go/versions/
 #extension/libnautilus-x2goumount.la     usr/lib/nautilus/extensions-2.0/
 #extension/libnautilus-x2goumount.so     usr/lib/nautilus/extensions-2.0/
 share/*                                 usr/share/
+xdg-menus/*                             etc/xdg/menus/
\ No newline at end of file
diff --git a/sbin/update-gnome-menu-x2go b/sbin/update-gnome-menu-x2go
index cecf4ba..9d4de0f 100755
--- a/sbin/update-gnome-menu-x2go
+++ b/sbin/update-gnome-menu-x2go
@@ -43,7 +43,7 @@ else
      die "Settings menu not found in /etc/xdg/menus";
 }
 
-my $menustr="<MergeFile>/etc/xdg/menus/gnome-settingsx2go.menu</MergeFile>\n";
+my $menustr="<MergeFile>/etc/xdg/menus/gnome-settings-x2go.menu</MergeFile>\n";
 
 open(FILE,"<$menu");
 my @ln=<FILE>;
diff --git a/xdg-menus/gnome-settings-x2go.menu b/xdg-menus/gnome-settings-x2go.menu
new file mode 100644
index 0000000..0f7207c
--- /dev/null
+++ b/xdg-menus/gnome-settings-x2go.menu
@@ -0,0 +1,13 @@
+<!DOCTYPE Menu PUBLIC '-//freedesktop//DTD Menu 1.0//EN' 'http://standards.freedesktop.org/menu-spec/menu-1.0.dtd'>
+<Menu>
+    <Name>Desktop</Name>
+    <Include>
+            <Filename>x2gosuspend.desktop</Filename>
+    </Include>
+    <Layout>
+        <Merge type="menus"/>
+        <Separator/>
+        <Filename>x2gosuspend.desktop</Filename>
+        <Merge type="files"/>
+    </Layout>
+</Menu>


hooks/post-receive
-- 
x2gognomebindings.git (X2go bindings for GNOME)

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" (X2go bindings for GNOME).