From d7da2573a1f18a2856dec46a7fa8652f68fb945e Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 3 Sep 2007 16:03:36 +0000 Subject: [PATCH] Made 2.4.0-rc2 release. 2007-09-03 Michael Natterer * Made 2.4.0-rc2 release. * app/Makefile.am (dist-dump-gimprc): added some sed voodoo to make sure the num-processors in the distributed gimprc and its manpage don't depend on the machine that does make dist. svn path=/trunk/; revision=23453 --- ChangeLog | 10 +++++++++- app/Makefile.am | 16 ++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2213a9e78..9c24573e82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,15 @@ +2007-09-03 Michael Natterer + + * Made 2.4.0-rc2 release. + + * app/Makefile.am (dist-dump-gimprc): added some sed voodoo to + make sure the num-processors in the distributed gimprc and its + manpage don't depend on the machine that does make dist. + 2007-09-03 Michael Natterer * app/core/gimp-transform-region.c: Applied slightly reformatted - patch by Jakub Friedl and Daniel Hornung which ROUND()s the + patch from Jakub Friedl and Daniel Hornung which ROUND()s the floating point result values before assigning them to integers to avoid reducing the output space to [0..254] (thus darkening the image). Fixes bug #472806. diff --git a/app/Makefile.am b/app/Makefile.am index 33911e715b..b2f30310ab 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -220,13 +220,17 @@ endif # dist-dump-gimprc: gimp-console-$(GIMP_APP_VERSION)$(EXEEXT) ./$< --dump-gimprc-system > gimprc.tmp \ - && (cmp -s gimprc.tmp $(top_srcdir)/etc/gimprc || \ - cp gimprc.tmp $(top_srcdir)/etc/gimprc) \ - && rm gimprc.tmp + && sed -e "s/num-processors [0-9]*/num-processors 1/" \ + gimprc.tmp > gimprc.tmp2 \ + && (cmp -s gimprc.tmp2 $(top_srcdir)/etc/gimprc || \ + cp gimprc.tmp2 $(top_srcdir)/etc/gimprc) \ + && rm gimprc.tmp gimprc.tmp2 ./$< --dump-gimprc-manpage > gimprc.tmp \ - && (cmp -s gimprc.tmp $(top_srcdir)/docs/gimprc.5.in || \ - cp gimprc.tmp $(top_srcdir)/docs/gimprc.5.in) \ - && rm gimprc.tmp + && sed -e "s/num-processors [0-9]*/num-processors 1/" \ + gimprc.tmp > gimprc.tmp2 \ + && (cmp -s gimprc.tmp2 $(top_srcdir)/docs/gimprc.5.in ||\ + cp gimprc.tmp2 $(top_srcdir)/docs/gimprc.5.in) \ + && rm gimprc.tmp gimprc.tmp2 dist-hook: dist-check-gimp-console dist-dump-gimprc