r38515 - in /desktop/unstable/gnome-menus/debian: changelog patches/30-gnome-calculator-desktop-file.patch

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Jun 10 11:01:39 2013
New Revision: 38515

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=38515
Log:
* debian/patches/30-gnome-calculator-desktop-file.patch:
  + Cherry-pick change from upstream, gnome-calculator's desktop
    file was renamed back to gcalctool.desktop. Closes: #711605.

Added:
    desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch
Modified:
    desktop/unstable/gnome-menus/debian/changelog

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=38515&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-menus/debian/changelog [utf-8] Mon Jun 10 11:01:39 2013
@@ -1,3 +1,11 @@
+gnome-menus (3.8.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/30-gnome-calculator-desktop-file.patch:
+    + Cherry-pick change from upstream, gnome-calculator's desktop
+      file was renamed back to gcalctool.desktop. Closes: #711605.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 10 Jun 2013 12:59:28 +0200
+
 gnome-menus (3.8.0-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch?rev=38515&op=file
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch (added)
+++ desktop/unstable/gnome-menus/debian/patches/30-gnome-calculator-desktop-file.patch [utf-8] Mon Jun 10 11:01:39 2013
@@ -1,0 +1,45 @@
+From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember at gmail.com>
+Date: Thu, 28 Mar 2013 22:54:34 +0100
+Subject: [PATCH] Adapt for gnome-calculator -> gcalctool desktop file rename
+
+gnome-calculator.desktop was renamed back to gcalctool.desktop, at the
+very last minute before the 3.8.0 release.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696816
+---
+ layout/gnome-applications.menu | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
+index 84d13ed..503f9ca 100644
+--- a/layout/gnome-applications.menu
++++ b/layout/gnome-applications.menu
+@@ -38,7 +38,6 @@
+         <Not><Filename>file-roller.desktop</Filename></Not>
+         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+         <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
+-        <Not><Filename>gnome-calculator.desktop</Filename></Not>
+         <Not><Filename>gcalctool.desktop</Filename></Not>
+         <Not><Filename>gucharmap.desktop</Filename></Not>
+         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+@@ -251,7 +250,7 @@
+     <Directory>X-GNOME-Utilities.directory</Directory>
+     <Include>
+       <Filename>file-roller.desktop</Filename>
+-      <Filename>gnome-calculator.desktop</Filename>
++      <Filename>gcalctool.desktop</Filename>
+       <Filename>gnome-font-viewer.desktop</Filename>
+       <Filename>gucharmap.desktop</Filename>
+       <Filename>seahorse.desktop</Filename>
+@@ -287,7 +286,6 @@
+         <Not><Filename>gnome-eog.desktop</Filename></Not>
+         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
+         <Not><Filename>gnome-gucharmap.desktop</Filename></Not>
+-        <Not><Filename>gcalctool.desktop</Filename></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
+-- 
+1.8.3
+