diff --git a/ChangeLog b/ChangeLog index 0e69872e1d..59f5040d7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-06-05 Sven Neumann + + * Made 2.3.9 development release. + 2006-06-05 Michael Natterer * app/tools/gimpdrawtool.c diff --git a/devel-docs/libgimpbase/tmpl/gimpcpuaccel.sgml b/devel-docs/libgimpbase/tmpl/gimpcpuaccel.sgml index 0e5021e3b9..a58e7bdb1a 100644 --- a/devel-docs/libgimpbase/tmpl/gimpcpuaccel.sgml +++ b/devel-docs/libgimpbase/tmpl/gimpcpuaccel.sgml @@ -9,13 +9,11 @@ gimpcpuaccel - - diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in index 48e5a2f07b..48288b7b84 100644 --- a/docs/gimprc.5.in +++ b/docs/gimprc.5.in @@ -38,10 +38,10 @@ Valid properties and their default values are: .TP (temp-path "${gimp_dir}/tmp") -Sets the temporary storage directory. Files will appear here during the course -of running the GIMP. Most files will disappear when the GIMP exits, but some -files are likely to remain, so it is best if this directory not be one that is -shared by other users. This is a single folder. +Sets the folder for temporary storage. Files will appear here during the +course of running the GIMP. Most files will disappear when the GIMP exits, +but some files are likely to remain, so it is best if this folder not be one +that is shared by other users. This is a single folder. .TP (swap-path "${gimp_dir}") @@ -50,8 +50,8 @@ Sets the swap file location. GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if GIMP is used with large images. Also, things can get horribly slow if the swap file is created -on a directory that is mounted over NFS. For these reasons, it may be -desirable to put your swap file in "/tmp". This is a single folder. +on a folder that is mounted over NFS. For these reasons, it may be desirable +to put your swap file in "/tmp". This is a single folder. .TP (num-processors 2) @@ -149,7 +149,8 @@ search. .TP (font-path "${gimp_dir}/fonts:${gimp_data_dir}/fonts") -Where to look for fonts. This is a colon-separated list of folders to search. +Where to look for fonts in addition to the system-wide installed fonts. This +is a colon-separated list of folders to search. .TP (default-brush "Circle (11)") @@ -160,26 +161,22 @@ path. This is a string value. .TP (default-pattern "Pine") -Specify a default pattern. The pattern is searched for in the specified -pattern path. This is a string value. +Specify a default pattern. This is a string value. .TP (default-palette "Default") -Specify a default palette. The palette is searched for in the specified -palette path. This is a string value. +Specify a default palette. This is a string value. .TP (default-gradient "FG to BG (RGB)") -Specify a default gradient. The gradient is searched for in the specified -gradient path. This is a string value. +Specify a default gradient. This is a string value. .TP (default-font "Sans") -Specify a default font. The font is searched for in the fontconfig font path. - This is a string value. +Specify a default font. This is a string value. .TP (global-brush yes) @@ -578,7 +575,7 @@ large, extra-large, huge, enormous and gigantic. (show-grid no) (show-sample-points yes) (padding-mode default) - (padding-color (color-rgba 1.000000 1.000000 1.000000 1.000000))) + (padding-color (color-rgb 1.000000 1.000000 1.000000))) Sets the default settings for the image view. This is a parameter list. @@ -594,7 +591,7 @@ Sets the default settings for the image view. This is a parameter list. (show-grid no) (show-sample-points yes) (padding-mode default) - (padding-color (color-rgba 1.000000 1.000000 1.000000 1.000000))) + (padding-color (color-rgb 1.000000 1.000000 1.000000))) Sets the default settings used when an image is viewed in fullscreen mode. This is a parameter list. diff --git a/etc/gimprc b/etc/gimprc index 2e83e5cec3..db3317019e 100644 --- a/etc/gimprc +++ b/etc/gimprc @@ -12,9 +12,9 @@ # used. If GIMP2_DIRECTORY is not an absolute path, it is interpreted # relative to your home directory. -# Sets the temporary storage directory. Files will appear here during the +# Sets the folder for temporary storage. Files will appear here during the # course of running the GIMP. Most files will disappear when the GIMP exits, -# but some files are likely to remain, so it is best if this directory not be +# but some files are likely to remain, so it is best if this folder not be # one that is shared by other users. This is a single folder. # # (temp-path "${gimp_dir}/tmp") @@ -23,9 +23,9 @@ # scheme. The swap file is used to quickly and easily swap tiles out to disk # and back in. Be aware that the swap file can easily get very large if GIMP # is used with large images. Also, things can get horribly slow if the swap -# file is created on a directory that is mounted over NFS. For these -# reasons, it may be desirable to put your swap file in "/tmp". This is a -# single folder. +# file is created on a folder that is mounted over NFS. For these reasons, +# it may be desirable to put your swap file in "/tmp". This is a single +# folder. # # (swap-path "${gimp_dir}") @@ -107,8 +107,8 @@ # # (gradient-path-writable "${gimp_dir}/gradients") -# Where to look for fonts. This is a colon-separated list of folders to -# search. +# Where to look for fonts in addition to the system-wide installed fonts. +# This is a colon-separated list of folders to search. # # (font-path "${gimp_dir}/fonts:${gimp_data_dir}/fonts") @@ -117,23 +117,19 @@ # # (default-brush "Circle (11)") -# Specify a default pattern. The pattern is searched for in the specified -# pattern path. This is a string value. +# Specify a default pattern. This is a string value. # # (default-pattern "Pine") -# Specify a default palette. The palette is searched for in the specified -# palette path. This is a string value. +# Specify a default palette. This is a string value. # # (default-palette "Default") -# Specify a default gradient. The gradient is searched for in the specified -# gradient path. This is a string value. +# Specify a default gradient. This is a string value. # # (default-gradient "FG to BG (RGB)") -# Specify a default font. The font is searched for in the fontconfig font -# path. This is a string value. +# Specify a default font. This is a string value. # # (default-font "Sans") @@ -444,7 +440,7 @@ # (show-grid no) # (show-sample-points yes) # (padding-mode default) -# (padding-color (color-rgba 1.000000 1.000000 1.000000 1.000000))) +# (padding-color (color-rgb 1.000000 1.000000 1.000000))) # Sets the default settings used when an image is viewed in fullscreen mode. # This is a parameter list. @@ -460,7 +456,7 @@ # (show-grid no) # (show-sample-points yes) # (padding-mode default) -# (padding-color (color-rgba 1.000000 1.000000 1.000000 1.000000))) +# (padding-color (color-rgb 1.000000 1.000000 1.000000))) # When enabled, an image will become the active image when its image window # receives the focus. This is useful for window managers using "click to diff --git a/po/Makefile.in.in b/po/Makefile.in.in index d2d4e4cdcd..deeb686368 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -22,6 +22,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ SHELL = /bin/sh +@SET_MAKE@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -33,8 +34,9 @@ exec_prefix = @exec_prefix@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = $(libdir)/locale +gnulocaledir = $(datadir)/locale +gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -44,6 +46,7 @@ mkdir_p = $(install_sh) -d INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +CC = @CC@ GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ @@ -52,22 +55,31 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot -ALL_LINGUAS = @ALL_LINGUAS@ +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) +INCLUDES = -I.. -I$(top_srcdir)/intl -POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done) +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) +SOURCES = +POFILES = @POFILES@ +GMOFILES = @GMOFILES@ +DISTFILES = ChangeLog Makefile.in.in POTFILES.in \ +$(POFILES) $(SOURCES) EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS POTFILES = \ -#This Gets Replace for some reason -CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ .SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat +.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat + +.c.o: + $(COMPILE) $< .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot @@ -93,63 +105,76 @@ all-no: $(GETTEXT_PACKAGE).pot: $(POTFILES) $(GENPOT) -install: install-data +install: install-exec install-data +install-exec: install-data: install-data-@USE_NLS@ install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(itlocaledir) - if test -n "$(PO_LINGUAS)"; then \ - linguas="$(PO_LINGUAS)"; \ - else \ - linguas="$(ALL_LINGUAS)"; \ - fi; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ + *.gmo) destdir=$(gnulocaledir);; \ + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \ else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ + $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $(srcdir)/$$cat as" \ "$$dir/$(GETTEXT_PACKAGE).mo"; \ fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + if test -r $$cat.m; then \ + $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ + if test -r $(srcdir)/$$cat.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$cat.m \ $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ + echo "installing $(srcdir)/$$cat as" \ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ else \ true; \ fi; \ fi; \ done - -# Empty stubs to satisfy archaic automake needs -dvi info tags TAGS ID: + if test "$(PACKAGE)" = "glib"; then \ + $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi # Define this as empty until I found a useful application. installcheck: uninstall: - if test -n "$(PO_LINGUAS)"; then \ - linguas="$(PO_LINGUAS)"; \ - else \ - linguas="$(ALL_LINGUAS)"; \ - fi; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done + if test "$(PACKAGE)" = "glib"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + fi check: all $(GETTEXT_PACKAGE).pot +dvi info tags TAGS ID: + mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -fr *.o rm -f .intltool-merge-cache clean: mostlyclean @@ -163,7 +188,7 @@ maintainer-clean: distclean @echo "it deletes files that may require special tools to rebuild." rm -f Makefile.in.in -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) dist distdir: $(DISTFILES) dists="$(DISTFILES)"; \ extra_dists="$(EXTRA_DISTFILES)"; \ @@ -179,12 +204,10 @@ dist distdir: $(DISTFILES) update-po: Makefile $(MAKE) $(GETTEXT_PACKAGE).pot tmpdir=`pwd`; \ - if test -n "$(PO_LINGUAS)"; then \ - linguas="$(PO_LINGUAS)"; \ - else \ - linguas="$(ALL_LINGUAS)"; \ - fi; \ - for lang in $$linguas; do \ + catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ echo "$$lang:"; \ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ if $$result; then \ @@ -200,7 +223,7 @@ update-po: Makefile fi; \ fi; \ else \ - echo "msgmerge for $$lang.gmo failed!"; \ + echo "msgmerge for $$cat failed!"; \ rm -f $$tmpdir/$$lang.new.po; \ fi; \ done