r15867 - in /desktop/unstable/gnome-menus/debian: changelog control control.in patches/09_games-menu.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue May  6 18:50:56 2008
New Revision: 15867

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15867
Log:
* 09_games-menu.patch: don't use the flawed <OnlyUnallocated> marker, 
  simply filter out all subcategories of the games menu. This should 
  avoid issues when the user or another menu system displays these 
  entries elsewhere. Closes: #479761.
* Fix capitalization of Python in the description.

Modified:
    desktop/unstable/gnome-menus/debian/changelog
    desktop/unstable/gnome-menus/debian/control
    desktop/unstable/gnome-menus/debian/control.in
    desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch

Modified: desktop/unstable/gnome-menus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/changelog?rev=15867&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/changelog (original)
+++ desktop/unstable/gnome-menus/debian/changelog Tue May  6 18:50:56 2008
@@ -1,3 +1,13 @@
+gnome-menus (2.22.1-2) unstable; urgency=low
+
+  * 09_games-menu.patch: don't use the flawed <OnlyUnallocated> marker, 
+    simply filter out all subcategories of the games menu. This should 
+    avoid issues when the user or another menu system displays these 
+    entries elsewhere. Closes: #479761.
+  * Fix capitalization of Python in the description.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 06 May 2008 20:52:16 +0200
+
 gnome-menus (2.22.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/gnome-menus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control?rev=15867&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control (original)
+++ desktop/unstable/gnome-menus/debian/control Tue May  6 18:50:56 2008
@@ -86,4 +86,4 @@
  Also contained here are the GNOME menu layout configuration files, .directory
  files and assorted menu related utility programs.
  .
- This package contains the python binding.
+ This package contains the Python binding.

Modified: desktop/unstable/gnome-menus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/control.in?rev=15867&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/control.in (original)
+++ desktop/unstable/gnome-menus/debian/control.in Tue May  6 18:50:56 2008
@@ -86,4 +86,4 @@
  Also contained here are the GNOME menu layout configuration files, .directory
  files and assorted menu related utility programs.
  .
- This package contains the python binding.
+ This package contains the Python binding.

Modified: desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch?rev=15867&op=diff
==============================================================================
--- desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch (original)
+++ desktop/unstable/gnome-menus/debian/patches/09_games-menu.patch Tue May  6 18:50:56 2008
@@ -1,15 +1,26 @@
---- gnome-menus-2.19.6.orig/layout/applications.menu	2007-08-03 11:38:07.000000000 +0200
-+++ gnome-menus-2.19.6/layout/applications.menu	2007-08-03 11:38:08.000000000 +0200
-@@ -73,11 +73,100 @@
-   <Menu>
-     <Name>Games</Name>
-     <Directory>Games.directory</Directory>
-+    <OnlyUnallocated/>
+Index: gnome-menus-2.22.1/layout/applications.menu
+===================================================================
+--- gnome-menus-2.22.1.orig/layout/applications.menu	2008-05-06 20:40:15.070962933 +0200
++++ gnome-menus-2.22.1/layout/applications.menu	2008-05-06 20:42:59.298963290 +0200
+@@ -76,8 +76,107 @@
      <Include>
        <And>
          <Category>Game</Category>
-       </And>
-     </Include>
+-      </And>
+-    </Include>
++        <Not><Category>ActionGame</Category></Not>
++        <Not><Category>AdventureGame</Category></Not>
++        <Not><Category>ArcadeGame</Category></Not>
++        <Not><Category>BoardGame</Category></Not>
++        <Not><Category>BlocksGame</Category></Not>
++        <Not><Category>CardGame</Category></Not>
++        <Not><Category>KidsGame</Category></Not>
++        <Not><Category>LogicGame</Category></Not>
++        <Not><Category>Simulation</Category></Not>
++        <Not><Category>SportsGame</Category></Not>
++        <Not><Category>StrategyGame</Category></Not>
++      </And>
++    </Include>
 +    <DefaultLayout inline="true" inline_limit="8" inline_header="false">
 +      <Merge type="menus"/>
 +      <Merge type="files"/>
@@ -101,7 +112,7 @@
    </Menu> <!-- End Games -->
  
    <!-- Graphics -->
-@@ -132,6 +221,7 @@
+@@ -132,6 +231,7 @@
        <And>
          <Category>System</Category>
          <Not><Category>Settings</Category></Not>