gnome-menus 3.10.1 update

[Pierangelo Mancusi]

Hi all,

here the patch to update gnome-menus from 3.8.0 to 3.10.1
the new entry in changelog was for testing the new pkg building.
apply the patch at the root of the svn project.

let me know everything :)

cheers,
Pierangelo


Index: debian/changelog
===================================================================
--- debian/changelog (revision 8)
+++ debian/changelog (working copy)
@@ -1,3 +1,12 @@
+gnome-menus (3.10.1) UNRELEASED; urgency=low
+
+  [ Pierangelo Mancusi ]
+  * New upstream release.
+  * debian/patches/30-gnome-calculator-desktop-file.patch:
+    + Removed from series. It was integrated in the new upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 13 Jul 2014 21:38:06
+0200
+
 gnome-menus (3.8.0-3) UNRELEASED; urgency=low

   [ Emilio Pozuelo Monfort ]
Index: debian/patches/08_settings-menus.patch
===================================================================
--- debian/patches/08_settings-menus.patch (revision 11)
+++ debian/patches/08_settings-menus.patch (working copy)
@@ -1,11 +1,12 @@
-Index: gnome-menus-3.8.0/layout/gnome-applications.menu
+Index: a/layout/gnome-applications.menu
 ===================================================================
---- gnome-menus-3.8.0.orig/layout/gnome-applications.menu 2013-06-14
15:48:17.509604188 -0400
-+++ gnome-menus-3.8.0/layout/gnome-applications.menu 2013-06-14
15:57:09.689581931 -0400
-@@ -233,6 +233,118 @@
-         <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
-       </And>
-     </Include>
+--- a/layout/gnome-applications.menu (revision 9)
++++ b/layout/gnome-applications.menu (working copy)
+@@ -259,6 +259,119 @@
+       <Filename>dconf-editor.desktop</Filename>
+       <Filename>setroubleshoot.desktop</Filename>
+     </Exclude>
++
 +    <Menu>
 +      <Name>Preferences</Name>
 +      <Directory>Settings.directory</Directory>
Index: debian/patches/09_games-menu.patch
===================================================================
--- debian/patches/09_games-menu.patch (revision 5)
+++ debian/patches/09_games-menu.patch (working copy)
@@ -1,11 +1,11 @@
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -99,8 +99,107 @@
+Index: a/layout/gnome-applications.menu
+===================================================================
+--- a/layout/gnome-applications.menu (revision 10)
++++ b/layout/gnome-applications.menu (working copy)
+@@ -115,8 +115,107 @@
      <Include>
        <And>
          <Category>Game</Category>
--      </And>
--    </Include>
 +        <Not><Category>ActionGame</Category></Not>
 +        <Not><Category>AdventureGame</Category></Not>
 +        <Not><Category>ArcadeGame</Category></Not>
@@ -17,8 +17,8 @@
 +        <Not><Category>Simulation</Category></Not>
 +        <Not><Category>SportsGame</Category></Not>
 +        <Not><Category>StrategyGame</Category></Not>
-+      </And>
-+    </Include>
+       </And>
+     </Include>
 +    <DefaultLayout inline="true" inline_limit="6" inline_header="false">
 +      <Merge type="menus"/>
 +      <Merge type="files"/>
@@ -110,11 +110,12 @@
    </Menu> <!-- End Games -->

    <!-- Graphics -->
-@@ -223,6 +322,7 @@
+@@ -238,6 +337,7 @@
+     <Include>
        <And>
          <Category>System</Category>
-         <Not><Category>Settings</Category></Not>
 +        <Not><Category>Game</Category></Not>
-         <Not><Filename>baobab.desktop</Filename></Not>
-         <Not><Filename>gnome-system-log.desktop</Filename></Not>
-         <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
+         <Not><Category>Settings</Category></Not>
+         <Not><Category>X-GNOME-Utilities</Category></Not>
+       </And>
+
Index: debian/patches/series
===================================================================
--- debian/patches/series (revision 8)
+++ debian/patches/series (working copy)
@@ -5,4 +5,3 @@
 08_settings-menus.patch
 09_games-menu.patch
 11_science-menu.patch
-30-gnome-calculator-desktop-file.patch
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20140714/405aeae9/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gnome-menus_3.10.1.patch
Type: text/x-patch
Size: 3770 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20140714/405aeae9/attachment-0001.bin>