diff --git a/ChangeLog b/ChangeLog index 1f3bf58038..687f50b742 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-06-16 Sven Neumann + + * desktop/gimp.applications.in: expand the GIMP acronym. + + * desktop/gimp.keys.in: removed some cruft. + 2005-06-16 Sven Neumann * INSTALL diff --git a/desktop/Makefile.am b/desktop/Makefile.am index 80e4d8630e..71ba694ed7 100644 --- a/desktop/Makefile.am +++ b/desktop/Makefile.am @@ -4,23 +4,18 @@ desktop_in_files = gimp.desktop.in.in desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) -applicationsdir = @DESKTOP_DATADIR@/applications - -icondir = @DESKTOP_DATADIR@/icons/hicolor/48x48/apps - -mimeinfodir = @DESKTOP_DATADIR@/mime-info - -registrydir = @DESKTOP_DATADIR@/application-registry - - if DESKTOP_DATADIR +applicationsdir = @DESKTOP_DATADIR@/applications applications_DATA = $(desktop_files) +icondir = @DESKTOP_DATADIR@/icons/hicolor/48x48/apps icon_DATA = gimp.png +mimeinfodir = @DESKTOP_DATADIR@/mime-info mimeinfo_DATA = gimp.keys +registrydir = @DESKTOP_DATADIR@/application-registry registry_DATA = gimp.applications endif diff --git a/desktop/gimp.applications.in b/desktop/gimp.applications.in index 4bb33310f8..cb984eaa70 100644 --- a/desktop/gimp.applications.in +++ b/desktop/gimp.applications.in @@ -1,6 +1,6 @@ -gimp-@GIMP_APP_VERSION@ +gimp command=gimp-remote-@GIMP_APP_VERSION@ - name=The GIMP + name=GNU Image Manipulation Program can_open_multiple_files=true expects_uris=non-file requires_terminal=false diff --git a/desktop/gimp.keys.in b/desktop/gimp.keys.in index f106ff8248..6aee100de4 100644 --- a/desktop/gimp.keys.in +++ b/desktop/gimp.keys.in @@ -1,109 +1,25 @@ # also image/x-bmp image/bmp - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/g3fax - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/gif - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/jpeg - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - # also image/x-png image/png - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/tiff - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - # also image/bmp image/x-bmp - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-compressed-xcf - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-pcx - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - # also image/png image/x-png - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-portable-anymap - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-portable-bitmap - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-portable-graymap - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-portable-pixmap - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-psd - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-sun-raster - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-tga - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-xbitmap - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-xcf - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-xpixmap - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ - image/x-xwindowdump - short_list_application_ids_for_novice_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_intermediate_user_level=gimp-@GIMP_APP_VERSION@ - short_list_application_ids_for_advanced_user_level=gimp-@GIMP_APP_VERSION@ -