diff --git a/ChangeLog b/ChangeLog index 26506adbd2..a319ccbbdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-01-05 Michael Natterer + + * configure.in: changed --with-gnome-desktop to --with-gnome-datadir + + * data/misc/gimp.applications + * data/misc/gimp.keys: added mime info files from Hadess + so gnome-vfs can associate various mime types + with GIMP. + + * data/misc/Makefile.am: install everything into the right + subdirectories of GNOME_DATADIR. + 2003-01-05 Maurits Rijk * libgimp/gimpmisc.c (gimp_pixel_fetcher_get_pixel2): x and y @@ -6,7 +18,7 @@ 2003-01-05 Sven Neumann - * libgimpwidgets/gimpchainbutton.[ch] + * libgimpwidgets/gimpchainbutton.[ch] * libgimpwidgets/gimpcolorarea.[ch] * libgimpwidgets/gimpcolorbutton.[ch] * libgimpwidgets/gimpdialog.c diff --git a/configure.in b/configure.in index 36949e9473..eb3eabda56 100644 --- a/configure.in +++ b/configure.in @@ -946,20 +946,20 @@ fi AM_CONDITIONAL(BUILD_PYTHON, test "x$enable_python" != xno) -#################################################### -# Determine where to install the GNOME2 desktop file -#################################################### +################################################################# +# Determine where to install the GNOME2 desktop & mime info files +################################################################# -AC_ARG_WITH(gnome-desktop, [ --with-gnome-desktop=PATH install a gimp.desktop link here [default=auto]]) +AC_ARG_WITH(gnome-datadir, [ --with-gnome-datadir=PATH where to install GNOME2 files [default=auto]]) -if test "x$with_gnome_desktop" != x; then - GNOME_DESKTOP_PATH=$with_gnome_desktop +if test "x$with_gnome_datadir" != x; then + GNOME_DATADIR=$with_gnome_datadir else - GNOME_DESKTOP_PATH="$datadir/applications" + GNOME_DATADIR="$datadir" fi -AM_CONDITIONAL(GNOME_DESKTOP_PATH, test "x$with_gnome_desktop" != xno) -AC_SUBST(GNOME_DESKTOP_PATH) +AM_CONDITIONAL(GNOME_DATADIR, test "x$with_gnome_datadir" != xno) +AC_SUBST(GNOME_DATADIR) ###################################### diff --git a/data/misc/Makefile.am b/data/misc/Makefile.am index 40fbc0f7c9..5b0b2e6962 100644 --- a/data/misc/Makefile.am +++ b/data/misc/Makefile.am @@ -4,9 +4,17 @@ miscdatadir = $(gimpdatadir)/misc miscdata_in_files = gimp.desktop.in.in -miscdata_DATA = $(miscdata_in_files:.desktop.in.in=.desktop) +miscdata_data_files = $(miscdata_in_files:.desktop.in.in=.desktop) -EXTRA_DIST = gimp.desktop.in.in +miscdata_DATA = \ + $(miscdata_data_files) \ + gimp.applications \ + gimp.keys + +EXTRA_DIST = \ + $(miscdata_in_files) \ + gimp.applications \ + gimp.keys gen_sources = desktop-foo CLEANFILES = $(gen_sources) @@ -19,18 +27,36 @@ gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po) && rm -r desktop-foo install-data-local: -if GNOME_DESKTOP_PATH - if test -d $(DESTDIR)@GNOME_DESKTOP_PATH@; then \ - cd $(DESTDIR)@GNOME_DESKTOP_PATH@ \ +if GNOME_DATADIR + if test -d $(DESTDIR)@GNOME_DATADIR@/applications; then \ + cd $(DESTDIR)@GNOME_DATADIR@/applications \ && rm -f gimp-1.3.desktop \ && $(LN_S) $(miscdatadir)/gimp.desktop gimp-1.3.desktop \ ; fi + if test -d $(DESTDIR)@GNOME_DATADIR@/application-registry; then \ + cd $(DESTDIR)@GNOME_DATADIR@/application-registry \ + && rm -f gimp-1.3.applications \ + && $(LN_S) $(miscdatadir)/gimp.applications gimp-1.3.applications \ + ; fi + if test -d $(DESTDIR)@GNOME_DATADIR@/mime-info; then \ + cd $(DESTDIR)@GNOME_DATADIR@/mime-info \ + && rm -f gimp-1.3.keys \ + && $(LN_S) $(miscdatadir)/gimp.keys gimp-1.3.keys \ + ; fi endif uninstall-local: -if GNOME_DESKTOP_PATH - if test -d $(DESTDIR)@GNOME_DESKTOP_PATH@; then \ - cd $(DESTDIR)@GNOME_DESKTOP_PATH@ \ +if GNOME_DATADIR + if test -d $(DESTDIR)@GNOME_DATADIR@/applications; then \ + cd $(DESTDIR)@GNOME_DATADIR@/applications \ && rm -f gimp-1.3.desktop \ ; fi + if test -d $(DESTDIR)@GNOME_DATADIR@/application-registry; then \ + cd $(DESTDIR)@GNOME_DATADIR@/application-registry \ + && rm -f gimp-1.3.applications \ + ; fi + if test -d $(DESTDIR)@GNOME_DATADIR@/mime-info; then \ + cd $(DESTDIR)@GNOME_DATADIR@/mime-info \ + && rm -f gimp-1.3.keys \ + ; fi endif diff --git a/data/misc/gimp.applications b/data/misc/gimp.applications new file mode 100644 index 0000000000..13657fb42e --- /dev/null +++ b/data/misc/gimp.applications @@ -0,0 +1,9 @@ +gimp-1.3 + command=gimp-remote-1.3 --new + name=The GIMP (unstable) + can_open_multiple_files=true + expects_uris=non-file + requires_terminal=false + supported_uri_schemes=file,http,ftp + mime_types=image/bmp,image/g3fax,image/gif,image/jpeg,image/png,image/tiff,image/x-bmp,image/x-compressed-xcf,image/x-pcx,image/x-png,image/x-portable-anymap,image/x-portable-bitmap,image/x-portable-graymap,image/x-portable-pixmap,image/x-psd,image/x-sun-raster,image/x-tga,image/x-xbitmap,image/x-xcf,image/x-xpixmap,image/x-xwindowdump + diff --git a/data/misc/gimp.applications.in b/data/misc/gimp.applications.in new file mode 100644 index 0000000000..13657fb42e --- /dev/null +++ b/data/misc/gimp.applications.in @@ -0,0 +1,9 @@ +gimp-1.3 + command=gimp-remote-1.3 --new + name=The GIMP (unstable) + can_open_multiple_files=true + expects_uris=non-file + requires_terminal=false + supported_uri_schemes=file,http,ftp + mime_types=image/bmp,image/g3fax,image/gif,image/jpeg,image/png,image/tiff,image/x-bmp,image/x-compressed-xcf,image/x-pcx,image/x-png,image/x-portable-anymap,image/x-portable-bitmap,image/x-portable-graymap,image/x-portable-pixmap,image/x-psd,image/x-sun-raster,image/x-tga,image/x-xbitmap,image/x-xcf,image/x-xpixmap,image/x-xwindowdump + diff --git a/data/misc/gimp.keys b/data/misc/gimp.keys new file mode 100644 index 0000000000..a599ae20c3 --- /dev/null +++ b/data/misc/gimp.keys @@ -0,0 +1,110 @@ +# also image/x-bmp +image/bmp + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/g3fax + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/gif + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/jpeg + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + category=Images + +# also image/x-png +image/png + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/tiff + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +# also image/bmp +image/x-bmp + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-compressed-xcf + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-pcx + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +# also image/png +image/x-png + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-portable-anymap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-portable-bitmap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-portable-graymap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-portable-pixmap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-psd + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-sun-raster + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-tga + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-xbitmap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-xcf + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-xpixmap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-xwindowdump + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + diff --git a/data/misc/gimp.keys.in b/data/misc/gimp.keys.in new file mode 100644 index 0000000000..a599ae20c3 --- /dev/null +++ b/data/misc/gimp.keys.in @@ -0,0 +1,110 @@ +# also image/x-bmp +image/bmp + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/g3fax + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/gif + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/jpeg + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + category=Images + +# also image/x-png +image/png + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/tiff + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +# also image/bmp +image/x-bmp + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-compressed-xcf + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-pcx + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +# also image/png +image/x-png + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-portable-anymap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-portable-bitmap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-portable-graymap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-portable-pixmap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-psd + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-sun-raster + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-tga + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-xbitmap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-xcf + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-xpixmap + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 + +image/x-xwindowdump + short_list_application_ids_for_novice_user_level=gimp-1.3 + short_list_application_ids_for_intermediate_user_level=gimp-1.3 + short_list_application_ids_for_advanced_user_level=gimp-1.3 +