Accepting request 179631 from X11:common:Factory

- Add Categories introduced in the new Desktop Menu Specification
  (map-desktop-category.sh, bnc#443364), map removed PuzzleGame. (forwarded request 179606 from sbrabec)

OBS-URL: https://build.opensuse.org/request/show/179631
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/update-desktop-files?expand=0&rev=86

map-desktop-category.sh

@@ -45,6 +45,10 @@ function mapCategory() {
        ret="Teaching"
        echo WARNING: School is an outdated Category, mapping it to Teaching
        ;;
+    PuzzleGame)
+       ret="LogicGame"
+       echo WARNING: PuzzleGame is an outdated Category, mapping it to LogicGame
+       ;;
 
 
 #special cases
@@ -82,7 +86,7 @@ function mapCategory() {
     Warehouse|Addressbook)
        ret="X-SuSE-$in";;
 #Internet/Network Menu:
-    P2P|HamRadio|Email|News|Dialup|IRCClient|FileTransfer|InstantMessaging|WebBrowser|WebDevelopment) ret=$in ;;
+    P2P|HamRadio|Email|News|Dialup|IRCClient|FileTransfer|InstantMessaging|WebBrowser|WebDevelopment|Feed) ret=$in ;;
     RSS-News)
        ret="X-SuSE-$in";;
 #Development Menu:
@@ -90,10 +94,10 @@ function mapCategory() {
     Design)
        ret="X-SuSE-$in";;
 #Graphics Menu:
-    3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics) ret=$in ;;
+    3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics|Maps) ret=$in ;;
-#Education Menu:
+#Education and Science Menu:
-    Teaching|Science|Math|Chemistry|Astronomy|Art|Construction|Languages| \
+    Teaching|Math|Chemistry|Astronomy|Art|Construction|Languages| \
-    Engineering|Geography) ret=$in ;;
+    Engineering|Geography|Spirituality|Humanities) ret=$in ;;
 #Multimedia Menu:
     AudioVideoEditing|Music|DiscBurning|Mixer|Player|Midi|Sequencer| \
     TV|Tuner|Recorder|Video) ret=$in ;;
@@ -114,7 +118,7 @@ function mapCategory() {
 #Game Menu:
     3DGame|Amusement|ArcadeGame|CardGame|FirstPersonGame|BoardGame|\
     PlatformGame|PuzzleGame|SportsGame|StrategyGame|BlocksGame| \
-    ActionGame|AdventureGame|KidsGame|LogicGame|Simulation|RolePlaying)
+    ActionGame|AdventureGame|KidsGame|LogicGame|Simulation|RolePlaying|Shooter)
        ret=$in ;;
 #Control Center Categories:
     ControlCenter-Personal|ControlCenter-Hardware|ControlCenter-LookAndFeel|ControlCenter-System)
@@ -126,7 +130,7 @@ function mapCategory() {
     Application|Qt|KDE|GTK|GNOME|XFCE|Motif|ConsoleOnly|Shell|X-Red-*| \
     X-Ximian-*|X-GNOME-*|X-KDE-*|Settings|DesktopSettings|HardwareSettings| \
     Office|Network|Game|Graphics|Education|Documentation|Development| \
-    Viewer|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;
+    Viewer|Science|System|Utility|AudioVideo|AdvancedSettings|More) ret=$in ;;
     Core-Edutainment|Core-Game|Core-Graphics|Core-Internet| \
     Core-Multimedia|Core-Office|Core-Settings|Core-Utility|Core-System| \
     Core-Configuration|Core-Development|core)

update-desktop-files.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 18 20:04:08 CEST 2013 - sbrabec@suse.cz
+
+- Add Categories introduced in the new Desktop Menu Specification
+  (map-desktop-category.sh, bnc#443364), map removed PuzzleGame.
+
 -------------------------------------------------------------------
 Fri Apr 13 13:24:04 UTC 2012 - gber@opensuse.org
 

update-desktop-files.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed