From cb54d6a0333aae87549f51a5d216e39bcd57946a97c6d290aac05879942cd410 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 17 Jul 2009 14:22:50 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/update-desktop-files?expand=0&rev=60

---
 map-desktop-category.sh      |   2 +-
 update-desktop-files.changes |   5 +
 update-desktop-files.spec    | 444 +----------------------------------
 3 files changed, 7 insertions(+), 444 deletions(-)

diff --git a/map-desktop-category.sh b/map-desktop-category.sh
index 2c60686..debaafd 100644
--- a/map-desktop-category.sh
+++ b/map-desktop-category.sh
@@ -93,7 +93,7 @@ function mapCategory() {
     3DGraphics|Photography|Scanning|OCR|VectorGraphics|RasterGraphics|2DGraphics) ret=$in ;;
 #Education Menu:
     Teaching|Science|Math|Chemistry|Astronomy|Art|Construction|Languages| \
-    Engineering) ret=$in ;;
+    Engineering|Geography) ret=$in ;;
 #Multimedia Menu:
     AudioVideoEditing|Music|DiscBurning|Mixer|Player|Midi|Sequencer| \
     TV|Tuner|Recorder|Video) ret=$in ;;
diff --git a/update-desktop-files.changes b/update-desktop-files.changes
index a8839d2..699a258 100644
--- a/update-desktop-files.changes
+++ b/update-desktop-files.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 16 12:44:55 CEST 2009 - beineri@opensuse.org
+
+- add 'Geography' as accepted category
+
 -------------------------------------------------------------------
 Mon Jun  8 16:35:32 CEST 2009 - lrupp@suse.de
 
diff --git a/update-desktop-files.spec b/update-desktop-files.spec
index 8a2abe2..69e80c6 100644
--- a/update-desktop-files.spec
+++ b/update-desktop-files.spec
@@ -20,7 +20,7 @@
 
 Name:           update-desktop-files
 Version:        11.1
-Release:        3
+Release:        4
 Summary:        A Build Tool to Update Desktop Files
 License:        GPL v2 or later
 Group:          Development/Tools/Building
@@ -64,445 +64,3 @@ rm -rf $RPM_BUILD_ROOT
 /etc/rpm/*
 
 %changelog
-* Mon Jun 08 2009 lrupp@suse.de
-- added first usage()
-- fix email
-- print errors to stderr
-* Wed May 20 2009 cmorve69o@yahoo.es
-- fix error message when an unknown category is found
-* Sun Nov 02 2008 coolo@suse.de
-- mark files as translated even if not trimmed
-* Fri Oct 24 2008 ke@suse.de
-- Update translations.
-* Fri Oct 24 2008 coolo@suse.de
-- make trim more complex and leave out the old way
-* Sun Oct 12 2008 ke@suse.de
-- Update translations.
-* Thu Oct 02 2008 vuntz@suse.de
-- Add a -t/--trim option to suse_update_desktop_file.sh in order
-  to trim all translations from a desktop file. The goal is to
-  have the desktops use gettext to translate data from those files
-  and to make it easy to update translations by just shipping an
-  updated mo file. This is for fate#301344.
-- This change requires a change in /usr/lib/rpm/suse_macros (rpm
-  package).
-* Thu Oct 02 2008 ke@suse.de
-- update translations.
-* Tue Sep 30 2008 dmueller@suse.de
-- fix mimetype.prov to not break for most KDE packages
-* Thu Sep 25 2008 sreeves@suse.de
-- add mimetype.prov to generate mime type rpm provides at build time
-* Fri Sep 19 2008 ke@suse.de
-- update translations.
-* Mon Sep 01 2008 ke@suse.de
-- update translations.
-* Mon Aug 25 2008 ke@suse.de
-- update translations.
-* Mon Aug 18 2008 ke@suse.de
-- update translations.
-* Fri Jul 18 2008 ke@suse.de
-- update translations.
-* Fri Jun 06 2008 ke@suse.de
-- update translations.
-* Tue May 27 2008 ke@suse.de
-- Remove test directory.
-- update translations.
-* Mon May 26 2008 ro@suse.de
-- added directories to filelist to fix build
-* Mon May 26 2008 ke@suse.de
-- update translations.
-* Thu May 22 2008 coolo@suse.de
-- reupdate to fix build
-* Mon May 19 2008 ke@suse.de
-- update translations.
-* Fri May 16 2008 ke@suse.de
-- update translations.
-* Fri May 09 2008 ke@suse.de
-- update translations.
-* Mon May 05 2008 ke@suse.de
-- update translations.
-* Sat Apr 26 2008 coolo@suse.de
-- reupdate to fix build
-* Fri Apr 25 2008 ke@suse.de
-- update translations.
-* Tue Apr 01 2008 coolo@suse.de
-- work with split po files - update from SVN
-* Tue Mar 25 2008 ke@suse.de
-- Add /etc/xdg/autostart/ for autostarted applications.  Provided by
-  Vincent Untz; bnc#370483.
-- Update translations.
-* Sun Mar 23 2008 coolo@suse.de
-- adding check against additional newlines and updating
-  from (fixed) SVN
-* Thu Mar 20 2008 ke@suse.de
-- update translations.
-* Tue Feb 12 2008 coolo@suse.de
-- don't rely on perl and command line tools, but on fast C++
-* Mon Feb 11 2008 ke@suse.de
-- update translations.
-* Tue Feb 05 2008 coolo@suse.de
-- do not install it by default (23MB saved)
-* Fri Jan 18 2008 ke@suse.de
-- Update translations.
-* Fri Jan 11 2008 sbrabec@suse.cz
-- Removed broken support for CheckHardware (#255716).
-* Thu Jan 10 2008 ke@suse.de
-- Update translations.
-* Mon Dec 17 2007 ke@suse.de
-- Update translations.
-* Tue Nov 27 2007 ke@suse.de
-- Update translations.
-* Wed Sep 19 2007 ke@suse.de
-- Provide locale info; reported by Stephan Binner [#326424].
-* Thu Sep 13 2007 ke@suse.de
-- Update sk entries file; reported by Ladislav Michnovic [#309868].
-* Mon Sep 10 2007 ke@suse.de
-- Fix German translation (Audacious); reported by Andreas Schwab
-  [#308965].
-* Wed Aug 29 2007 ke@suse.de
-- Update translations.
-* Mon Aug 27 2007 ke@suse.de
-- Update translations.
-* Mon Aug 20 2007 ke@suse.de
-- Update translations.
-* Fri Aug 17 2007 ke@suse.de
-- Update translations.
-* Wed Aug 15 2007 ke@suse.de
-- Update translations.
-* Tue Aug 14 2007 ke@suse.de
-- Adjust PREPARE_PACKAGE to create the old inline format; debugged by
-  Stephan Kulow [#299607]
-- Update translations.
-* Fri Aug 10 2007 ke@suse.de
-- Update for 10.3 beta2.
-* Mon Aug 06 2007 ke@suse.de
-- Update for 10.3 beta1.
-* Wed Jul 18 2007 ke@suse.de
-- update from desktop translations by running PREPARE_PACKAGE.
-* Thu Jul 05 2007 coolo@suse.de
-- don't package kappfinder files anymore and let packages provide their
-  own files
-* Tue Jul 03 2007 coolo@suse.de
-- adding some debug output to indicate copying templates
-* Thu Jun 21 2007 stbinner@suse.de
-- fix invalid .desktop files
-* Tue May 29 2007 coolo@suse.de
-- fix rpmlint problems
-* Mon May 28 2007 coolo@suse.de
-- remove the requires for desktop-file-validate too
-* Mon May 21 2007 coolo@suse.de
-- update from SVN to fix a lot of bugs ;(
-* Tue May 15 2007 coolo@suse.de
-- remove windows line feeds from desktop files
-* Mon May 14 2007 coolo@suse.de
-- remove the desktop-file-validate call again to avoid loops in
-  dependency chains
-- make sure X-SuSE-Translate isn't already part of the file
-* Fri May 11 2007 coolo@suse.de
-- add X-SuSE-YaST2-Virtualization (#258600)
-* Mon May 07 2007 coolo@suse.de
-- add Encoding=UTF-8 to generated .desktop files to keep (older)
-  desktop-file-validate happy
-- fix script error
-* Wed May 02 2007 coolo@suse.de
-- add support for untranslate (so we can grab upstream translations
-  reliable)
-* Sun Apr 29 2007 ro@suse.de
-- ignore return code of validation for now, it causes too much
-  breakage
-* Wed Apr 25 2007 coolo@suse.de
-- following suggestion on IRC and call desktop-file-validate
-  as part of the build check
-* Tue Apr 24 2007 coolo@suse.de
-- don't look at /usr/share twice
-* Tue Apr 24 2007 coolo@suse.de
-- flush translations for another translation round
-* Tue Apr 24 2007 coolo@suse.de
-- move /opt/gnome to /usr
-- deprecate GNOME1 support
-* Thu Mar 15 2007 dmueller@suse.de
-- bump version
-* Thu Dec 07 2006 coolo@suse.de
-- update from translators
-* Mon Nov 20 2006 coolo@suse.de
-- update from translators
-* Tue Nov 07 2006 coolo@suse.de
-- update from desktop translations
-* Thu Nov 02 2006 coolo@suse.de
-- update from new SVN
-* Wed Sep 20 2006 stbinner@suse.de
-- add HardwareSettings category to map-desktop-category.sh (#206753)
-* Tue Jun 13 2006 coolo@suse.de
-- don't ignore NoDisplay .desktop files (#165187 and #180627)
-* Mon Jun 12 2006 coolo@suse.de
-- bugfixes from vendor
-* Fri Jun 09 2006 coolo@suse.de
-- another update for desktop translations
-* Fri Jun 02 2006 dmueller@suse.de
-- updated desktop translations (#175645)
-* Wed Apr 26 2006 stbinner@suse.de
-- update from SVN, more Italian & Japanese translation format fixes
-* Sat Apr 22 2006 stbinner@suse.de
-- update (rebuild 107) to fix Italian mess (#168551)
-* Tue Apr 18 2006 coolo@suse.de
-- another update (rebuild 105)
-* Tue Apr 11 2006 sbrabec@suse.cz
-- Updated cs translation from LCN SVN.
-* Fri Apr 07 2006 stbinner@suse.de
-- update translations from SVN
-* Wed Apr 05 2006 stbinner@suse.de
-- update translations
-* Fri Mar 31 2006 stbinner@suse.de
-- update translations and remove not-to-be-translated strings parts
-* Fri Mar 31 2006 stbinner@suse.de
-- own some more locale dirs on PLUS to fix build
-* Wed Mar 29 2006 sreeves@suse.de
-- Add new X-SuSE-ControlCenter-* categories
-* Fri Mar 24 2006 dmueller@suse.de
-- update translations from SVN (de,es,fr,it,ja,pt_BR,zh_CN,zh_TW)
-* Fri Mar 24 2006 coolo@suse.de
-- update translations from SVN
-* Fri Mar 17 2006 coolo@suse.de
-- update translations from SVN
-* Mon Mar 06 2006 coolo@suse.de
-- fix sed call (#152224)
-* Mon Feb 27 2006 coolo@suse.de
-- update translations from SVN
-* Mon Feb 27 2006 stbinner@suse.de
-- patch map-desktop-category.sh for PLUS distributions
-* Wed Feb 22 2006 stbinner@suse.de
-- add "km" locale dirs to fix build on PLUS
-* Thu Feb 16 2006 sbrabec@suse.cz
-- Fix of DocPath warning check (149699#c12).
-* Wed Feb 15 2006 coolo@suse.de
-- fixed the addition of new tags
-* Tue Feb 14 2006 coolo@suse.de
-- fixed PREPARE_PACKAGE and used it one more time
-* Tue Feb 14 2006 coolo@suse.de
-- enhance the script/macro:
-  * the docpath is guessed now
-  * allow -D to overwrite guessing of docpaths
-  * allow -N/-G/-C to overwrite Name/GenericName/Comment
-* Mon Feb 13 2006 coolo@suse.de
-- update translations from lcn SVN
-* Tue Feb 07 2006 coolo@suse.de
-- fix the escaping of to translated text
-* Mon Feb 06 2006 dmueller@suse.de
-- remove duplicate desktop files and add a check
-  to avoid the same happening in the future
-* Mon Feb 06 2006 coolo@suse.de
-- let the translations work again (workaround #147685)
-* Fri Feb 03 2006 coolo@suse.de
-- updated translations received so far
-* Fri Jan 27 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Fri Jan 20 2006 dmueller@suse.de
-- split off desktop-translations package. install translations there.
-* Wed Jan 18 2006 dmueller@suse.de
-- sync kappfinder desktop files/icons with upstream
-  (fixes lyx failure)
-* Mon Jan 09 2006 coolo@suse.de
-- print the error to STDERR, so Rudi sees them
-* Mon Jan 09 2006 coolo@suse.de
-- brp-desktop is a bit picky: fixing format
-* Sat Jan 07 2006 coolo@suse.de
-- fixing obvious perl knowledge lack
-* Thu Jan 05 2006 coolo@suse.de
-- fix bug related to groups
-* Fri Dec 16 2005 coolo@suse.de
-- rework translation applying script
-- readding translations
-* Thu Nov 03 2005 coolo@suse.de
-- reset the translations to prepare a new way of handling them
-* Thu Sep 29 2005 stbinner@suse.de
-- add "Photograph" -> "Photography" category mapping
-* Mon Sep 12 2005 coolo@suse.de
-- update translations (mainly hu)
-* Mon Sep 05 2005 adrian@suse.de
-- add finish translations
-* Fri Sep 02 2005 aj@suse.de
-- Revert changes to extra-files, kappfinder-* since they cause
-  build problems.
-* Thu Sep 01 2005 adrian@suse.de
-- final translation update
-* Wed Aug 31 2005 adrian@suse.de
-- update translations
-* Wed Aug 17 2005 coolo@suse.de
-- update translations
-* Thu Aug 11 2005 adrian@suse.de
-- add X-SuSE-YaST-AppArmor
-* Mon May 23 2005 adrian@suse.de
-- do only warn about not existing DocPath
-* Thu May 19 2005 adrian@suse.de
-- validate DocPath target
-* Wed Mar 16 2005 adrian@suse.de
-- translation updates
-* Mon Mar 14 2005 adrian@suse.de
-- fixed hu desktop entries by Karl
-* Wed Mar 09 2005 adrian@suse.de
-- allow RSS-News tag
-* Thu Feb 17 2005 adrian@suse.de
-- do not move screensaver entries
-- prefer .png icons during install
-* Wed Feb 16 2005 adrian@suse.de
-- auto move desktop files from legacy applnk path to XDG path
-* Tue Feb 15 2005 schwab@suse.de
-- Use the first icon found.
-* Thu Feb 10 2005 adrian@suse.de
-- fix german Planner menu entry
-- new hungarian translations
-* Fri Jan 14 2005 adrian@suse.de
-- accept Feedback as Category (#41682)
-* Thu Jan 13 2005 adrian@suse.de
-- update to current translation state from cvs.
-* Wed Nov 17 2004 adrian@suse.de
-- honor only [Desktop Entry] section
-- allow "Clock" Category
-* Tue Nov 16 2004 adrian@suse.de
-- package also some icon templates, which can get installed via -i
-* Mon Nov 15 2004 adrian@suse.de
-- install also icon files with -i
-* Thu Oct 28 2004 adrian@suse.de
-- add -d/--docid switch to add identifier for documentation team
-* Tue Oct 19 2004 adrian@suse.de
-- update french and chinese translations
-* Tue Oct 05 2004 adrian@suse.de
-- add translation for Office Suite to czech (#46833)
-* Mon Oct 04 2004 adrian@suse.de
-- new translations for el
-* Fri Oct 01 2004 adrian@suse.de
-- update translations
-- do not add Categories line, if empty
-* Sun Sep 26 2004 adrian@suse.de
-- use current translations from cvs
-* Tue Aug 17 2004 coolo@suse.de
-- handle packaged CVS dirs for convenience
-* Tue Aug 17 2004 coolo@suse.de
-- new translation round
-* Tue Aug 03 2004 adrian@suse.de
-- fix encoding of impress.desktop
-- update kappfinder templates to KDE 3.3 state
-* Fri Jul 30 2004 coolo@suse.de
-- make the warning an error - no one cares for WARNINGS in %%install
-  sections ;(
-* Mon May 17 2004 adrian@suse.de
-- update chinese translations
-* Sun Apr 04 2004 adrian@suse.de
-- mark desktop files to translate with X-SuSE-translate=true
-- update translations
-* Fri Apr 02 2004 adrian@suse.de
-- adding sk and it files
-- export direct from cvs
-* Wed Mar 31 2004 coolo@suse.de
-- adding some more german files
-* Tue Mar 30 2004 adrian@suse.de
-- add functionality to update explicit given files
-  (needed for directory files)
-- update hungarian translations
-* Mon Mar 29 2004 coolo@suse.de
-- adding bulgarian
-- adding japanish
-- adding slowenian
-* Wed Mar 24 2004 adrian@suse.de
-- auto convert Gnome 1 desktop files to Utf8
-  (script by Stanislav, #36835)
-* Mon Mar 22 2004 coolo@suse.de
-- adding dutch
-- adding hungarian
-* Wed Mar 17 2004 adrian@suse.de
-- add spanish translations
-- add norwegian translations
-* Tue Mar 16 2004 coolo@suse.de
-- adding czech translations
-* Tue Mar 16 2004 coolo@suse.de
-- updating german translations
-* Sun Mar 14 2004 coolo@suse.de
-- adding translations (#34304)
-* Wed Mar 10 2004 adrian@suse.de
-- update kappfinder data (from KDE 3.2.1)
-* Wed Mar 03 2004 adrian@suse.de
-- fix typo in map-desktop-files
-* Sun Feb 29 2004 adrian@suse.de
-- add WebUtility Category
-* Tue Feb 17 2004 adrian@suse.de
-- remove Mixer -> AudioMixer mapping
-  (the other way arround exists and is valid)
-- check for double Category entries
-- add ContactManagement Category
-* Mon Feb 16 2004 adrian@suse.de
-- fix build as user
-* Mon Feb 16 2004 adrian@suse.de
-- Viewer is also an official tag now
-- temp. fail on outdated Categories
-- introduce "Jukebox"
-* Mon Nov 10 2003 adrian@suse.de
-- adjust Categories to match the Menu Standard Version 0.8
-* Thu Oct 30 2003 adrian@suse.de
-- add slovak translations
-* Mon Oct 06 2003 adrian@suse.de
-- fix tail usage
-* Fri Sep 26 2003 adrian@suse.de
-- add KDE 3.2 applications path
-* Wed Sep 17 2003 adrian@suse.de
-- add more transalations
-* Wed Sep 17 2003 adrian@suse.de
-- fix OO template call (#31130)
-* Sat Sep 13 2003 adrian@suse.de
-- higher MimeType priorities for OO
-- remove version number from OO desktop file templates
-* Thu Sep 11 2003 adrian@suse.de
-- fix a very stupid bug, we don't have the rpm yet, during the
-  build .... CheckHardware stuff is working now (#30469)
-* Sun Sep 07 2003 adrian@suse.de
-- fix: ProjectManagement is an official group
-* Fri Sep 05 2003 adrian@suse.de
-- implement support for CheckHardware
-* Fri Sep 05 2003 adrian@suse.de
-- introduce Video group
-* Thu Sep 04 2003 adrian@suse.de
-- define icons and remove Categories from OO desktop files
-- add new possible Categories
-* Tue Sep 02 2003 adrian@suse.de
-- list all X-SuSE-Core- groups explicit
-* Mon Sep 01 2003 adrian@suse.de
-- fix conflict between "X-SuSE-Core" and  "Core" Category
-* Mon Sep 01 2003 adrian@suse.de
-- fix usage of multiple switches
-* Mon Sep 01 2003 adrian@suse.de
-- several mapping fixes
-- add -u option to hide entries unimportant entries by default
-* Thu Aug 28 2003 adrian@suse.de
-- change desktop search path order to install the right files
-  for OpenOffice.org
-* Mon Aug 25 2003 adrian@suse.de
-- mapping fixes
-* Mon Aug 18 2003 adrian@suse.de
-- add template files for OpenOffice
-* Sun Aug 17 2003 adrian@suse.de
-- fix: map Categories always
-- some more mappings
-* Sat Aug 16 2003 adrian@suse.de
-- add .desktop file templates from kappfinder
-* Fri Aug 15 2003 adrian@suse.de
-- add /opt/gnome/share/gnome/apps/ path
-* Thu Aug 14 2003 adrian@suse.de
-- ignore also NoDisplay=true files
-* Tue Aug 12 2003 adrian@suse.de
-- add DialUp Category
-- map Internet -> Network
-* Tue Aug 12 2003 adrian@suse.de
-- add -r|--reset option
-* Mon Aug 11 2003 adrian@suse.de
-- add /usr/lib/rpm/map-desktop-category.sh to check Categories
-  and to set X-SuSE- prefix automagically
-* Wed Jul 30 2003 adrian@suse.de
-- use $RPM_SOURCE_DIR
-* Mon Jul 28 2003 adrian@suse.de
-- add --create and --install switches for %%suse_update_desktop_file
-* Thu Jul 24 2003 adrian@suse.de
-- ignore desktop files with Hidden flag
-* Thu Jul 24 2003 adrian@suse.de
-- initial package
-  * provide suse_update_desktop_file.sh script for the
-  %%suse_update_desktop_file rpm macro
-  * a first po-file with translations