Commit e8d62cff authored by Manish Singh's avatar Manish Singh Committed by Manish Singh

add m4_defines for gimp_unstable and gimp_full_name, and define a

2004-01-26  Manish Singh  <yosh@gimp.org>

        * configure.in: add m4_defines for gimp_unstable and gimp_full_name,
        and define a GIMP_VISIBLE_NAME based on that.

        * data/misc/Makefile.am
        * data/misc/gimp.applications.in
        * data/misc/gimp.keys.in: made these configured files, so they can
        use GIMP_APP_VERSION and GIMP_VISIBLE_NAME.

        * data/misc/gimp.desktop.in.in: use GIMP_APP_VERSION and
        GIMP_VISIBLE_NAME.
parent ac9a2935
2004-01-26 Manish Singh <yosh@gimp.org>
* configure.in: add m4_defines for gimp_unstable and gimp_full_name,
and define a GIMP_VISIBLE_NAME based on that.
* data/misc/Makefile.am
* data/misc/gimp.applications.in
* data/misc/gimp.keys.in: made these configured files, so they can
use GIMP_APP_VERSION and GIMP_VISIBLE_NAME.
* data/misc/gimp.desktop.in.in: use GIMP_APP_VERSION and
GIMP_VISIBLE_NAME.
2004-01-27 Jakub Steiner <jimmac@ximian.com>
* themes/Default/images/stock-layer-mask-32.png
......@@ -35,6 +35,11 @@ m4_define([gimp_data_version], [1.3])
m4_define([gimp_sysconf_version], [1.3])
m4_define([gimp_user_version], [1.3])
m4_define([gimp_unstable],
m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no]))
m4_define([gimp_full_name], [The GIMP])
# required versions of other packages
m4_define([glib_required_version], [2.2.0])
m4_define([gtk_required_version], [2.2.2])
......@@ -73,6 +78,8 @@ GIMP_PKGCONFIG_VERSION=gimp_pkgconfig_version
GIMP_DATA_VERSION=gimp_data_version
GIMP_SYSCONF_VERSION=gimp_sysconf_version
GIMP_USER_VERSION=gimp_user_version
GIMP_UNSTABLE=gimp_unstable
GIMP_FULL_NAME="gimp_full_name"
AC_SUBST(GIMP_MAJOR_VERSION)
AC_SUBST(GIMP_MINOR_VERSION)
AC_SUBST(GIMP_MICRO_VERSION)
......@@ -89,6 +96,8 @@ AC_SUBST(GIMP_PKGCONFIG_VERSION)
AC_SUBST(GIMP_DATA_VERSION)
AC_SUBST(GIMP_SYSCONF_VERSION)
AC_SUBST(GIMP_USER_VERSION)
AC_SUBST(GIMP_UNSTABLE)
AC_SUBST(GIMP_FULL_NAME)
# libtool versioning
......@@ -107,6 +116,14 @@ AC_SUBST(LT_VERSION_INFO)
AC_SUBST(LT_CURRENT_MINUS_AGE)
if test "gimp_unstable" = "yes"; then
GIMP_VISIBLE_NAME="gimp_full_name (unstable)"
else
GIMP_VISIBLE_NAME="gimp_full_name"
fi
AC_SUBST(GIMP_VISIBLE_NAME)
GETTEXT_PACKAGE=gimp20
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
......@@ -1536,6 +1553,8 @@ data/Makefile
data/environ/Makefile
data/misc/Makefile
data/misc/gimp.desktop.in
data/misc/gimp.keys
data/misc/gimp.applications
data/images/Makefile
data/brushes/Makefile
data/gradients/Makefile
......
......@@ -3,3 +3,5 @@ Makefile
gimp.desktop
gimp.desktop.in
gimp.desktop.in.in.h
gimp.keys
gimp.applications
......@@ -13,8 +13,8 @@ miscdata_DATA = \
EXTRA_DIST = \
$(miscdata_in_files) \
gimp.applications \
gimp.keys
gimp.applications.in \
gimp.keys.in
gen_sources = desktop-foo
CLEANFILES = $(gen_sources)
......@@ -30,18 +30,18 @@ install-data-local:
if DESKTOP_DATADIR
if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/applications \
&& rm -f gimp-$(GIMP_APP_VERSION).desktop \
&& $(LN_S) $(miscdatadir)/gimp.desktop gimp-$(GIMP_APP_VERSION).desktop \
&& rm -f gimp-@GIMP_APP_VERSION@.desktop \
&& $(LN_S) $(miscdatadir)/gimp.desktop gimp-@GIMP_APP_VERSION@.desktop \
; fi
if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \
&& rm -f gimp-$(GIMP_APP_VERSION).applications \
&& $(LN_S) $(miscdatadir)/gimp.applications gimp-$(GIMP_APP_VERSION).applications \
&& rm -f gimp-@GIMP_APP_VERSION@.applications \
&& $(LN_S) $(miscdatadir)/gimp.applications gimp-@GIMP_APP_VERSION@.applications \
; fi
if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \
&& rm -f gimp-$(GIMP_APP_VERSION).keys \
&& $(LN_S) $(miscdatadir)/gimp.keys gimp-$(GIMP_APP_VERSION).keys \
&& rm -f gimp-@GIMP_APP_VERSION@.keys \
&& $(LN_S) $(miscdatadir)/gimp.keys gimp-@GIMP_APP_VERSION@.keys \
; fi
endif
......@@ -49,15 +49,15 @@ uninstall-local:
if DESKTOP_DATADIR
if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/applications \
&& rm -f gimp-$(GIMP_APP_VERSION).desktop \
&& rm -f gimp-@GIMP_APP_VERSION@.desktop \
; fi
if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \
&& rm -f gimp-$(GIMP_APP_VERSION).applications \
&& rm -f gimp-@GIMP_APP_VERSION@.applications \
; fi
if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \
cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \
&& rm -f gimp-$(GIMP_APP_VERSION).keys \
&& rm -f gimp-@GIMP_APP_VERSION@.keys \
; fi
endif
......
gimp-1.3
command=gimp-remote-1.3
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
gimp-1.3
command=gimp-remote-1.3
name=The GIMP (unstable)
gimp-@GIMP_APP_VERSION@
command=gimp-remote-@GIMP_APP_VERSION@
name=@GIMP_VISIBLE_NAME@
can_open_multiple_files=true
expects_uris=non-file
requires_terminal=false
......
[Desktop Entry]
Encoding=UTF-8
_Name=The GIMP (unstable)
_Name=@GIMP_VISIBLE_NAME@
_Comment=Create and edit images or photographs
Exec=gimp-remote-1.3 %U
TryExec=gimp-1.3
Exec=gimp-remote-@GIMP_APP_VERSION@ %U
TryExec=gimp-@GIMP_APP_VERSION@
Icon=@gimpdatadir@/images/wilber-icon.png
Terminal=false
Type=Application
......
# 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
# 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
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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@
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
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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-1.3
short_list_application_ids_for_intermediate_user_level=gimp-1.3
short_list_application_ids_for_advanced_user_level=gimp-1.3
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@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment