bumped the version to 2.4.0-rc1.

2007-08-15  Sven Neumann  <sven@gimp.org>

	* configure.in: bumped the version to 2.4.0-rc1.

	* README
	* INSTALL: updated for the GIMP 2.4 release candidate(s).

	* data/images/gimp-splash.png: added splash screen for the 2.4
	release candidate(s).

	* app/Makefile.am
	* tools/Makefile.am: adjust targets for 2.4.


svn path=/trunk/; revision=23281

ChangeLog

@@ -1,3 +1,16 @@
+2007-08-15  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: bumped the version to 2.4.0-rc1.
+
+	* README
+	* INSTALL: updated for the GIMP 2.4 release candidate(s).
+
+	* data/images/gimp-splash.png: added splash screen for the 2.4
+	release candidate(s).
+
+	* app/Makefile.am
+	* tools/Makefile.am: adjust targets for 2.4.
+
 2007-08-15  Sven Neumann  <sven@gimp.org>
 
 	* data/images: renamed old splash and logo images.

INSTALL

@@ -1,11 +1,11 @@
-Installation instructions for GIMP 2.3
+Installation instructions for GIMP 2.4
 --------------------------------------
 
 There are some basic steps to building and installing GIMP.
 
-GIMP 2.3 replaces earlier GIMP 2.x versions. It is advised that you
+GIMP 2.4 replaces earlier GIMP 2.x versions. It is advised that you
-uninstall them before installing GIMP 2.3. If you want to keep your
+uninstall them before installing GIMP 2.4. If you want to keep your
-older GIMP 2.x installation in parallel to GIMP 2.3, you have to
+older GIMP 2.x installation in parallel to GIMP 2.4, you have to
 choose a separate prefix which is not in your default library search
 path.
 
@@ -66,9 +66,9 @@ header files installed.
      of make, we'd appreciate if you'd send us a patch with the changes.
 
  10. Install GIMP by running `make install'. In order to avoid clashes
-     with other versions of GIMP, we install a binary called gimp-2.3.
+     with other versions of GIMP, we install a binary called gimp-2.4.
      By default there's also a link created so that you can type 'gimp'
-     to start gimp-2.3.
+     to start gimp-2.4.
 
 Please make sure you don't have any old GTK+-2.x, jpeg, etc. libraries 
 lying around on your system, otherwise configure may fail to find the 
@@ -80,8 +80,8 @@ packages are included below. Here is an illustration of commands that
 might be used to build and install GIMP. The actual configuration,
 compilation and installation output is not shown.
 
-  % tar xvfz gimp-2.3.x.tar.gz   # unpack the sources
+  % tar xvfz gimp-2.4.x.tar.gz   # unpack the sources
-  % cd gimp-2.3.x                # change to the toplevel directory
+  % cd gimp-2.4.x                # change to the toplevel directory
   % ./configure                  # run the `configure' script
   % make                         # build GIMP
   % make install                 # install GIMP
@@ -116,8 +116,8 @@ These are:
      is intended primarily as a convenience for developers.
 
   --enable-gimpdir=DIR.  This option changes the default directory
-     GIMP uses to search for its configuration files from ~/.gimp-2.3 
+     GIMP uses to search for its configuration files from ~/.gimp-2.4 
-     (the directory .gimp-2.3 in the users home directory) to DIR.
+     (the directory .gimp-2.4 in the users home directory) to DIR.
 
   --enable-binreloc.  When compiled for Linux with this option enabled,
      GIMP will be binary relocatable.  Plug-ins and data files will
@@ -209,8 +209,8 @@ These are:
      if you call configure with --without-desktop-dir.
 
   --disable-default-binary. Use this option if you don't want to make
-     gimp-2.3 the default gimp installation. Otherwise a link called
+     gimp-2.4 the default gimp installation. Otherwise a link called
-     gimp pointing to the gimp-2.3 executable will be installed.
+     gimp pointing to the gimp-2.4 executable will be installed.
 
   --disable-gimp-console.  Use this option if you don't want the
      gimp-console binary to be built in addition to the standard binary.
@@ -227,7 +227,7 @@ The `make' command builds several things:
  - A bunch of public libraries in the directories starting with 'libgimp'.
  - The plug-in programs in the 'plug-ins' directory.
  - Some modules in the 'modules' subdirectory.
- - The main GIMP program 'gimp-2.3' in `app'.
+ - The main GIMP program 'gimp-2.4' in `app'.
 
 The `make install' commands installs the gimp header files associated 
 with the libgimp libraries, the plug-ins, some data files and the GIMP 

README

@@ -1,14 +1,18 @@
-The GNU Image Manipulation Program Version 2.3
+The GNU Image Manipulation Program Version 2.4
 ----------------------------------------------
 
-This is an unstable development version of GIMP. Please realize that
+This is a release candidate for GIMP 2.4, the new stable version of
-this is in no way a final product. A lot of new features are
+GIMP. Please realize that this is in not yet the 2.4.0 release. This
-incomplete and some things may even be completely broken. If you need
+release candidate should be feature complete and pretty close to what
-to get work done, please use the stable version, GIMP 2.2.
+you will get with 2.4.0. But there might still be bugs and even some
+minor changes pending in some places.  you way a final product. A lot
+of new features are incomplete and some things may even be completely
+broken. If you need to get work done, please stick to the stable
+version, GIMP 2.2 until GIMP 2.4 is released.
 
-GIMP 2.3 replaces earlier GIMP 2.x versions. It is advised that you
+GIMP 2.4 replaces earlier GIMP 2.x versions. It is advised that you
-uninstall them before installing GIMP 2.3. If you want to keep your
+uninstall them before installing GIMP 2.4. If you want to keep your
-older GIMP 2.x installation in parallel to GIMP 2.3, you have to
+older GIMP 2.x installation in parallel to GIMP 2.4, you have to
 choose a separate prefix which is not in your default library search
 path. Otherwise your GIMP 2.2 or GIMP 2.0 installation will start to
 use the new libraries. You have been warned.
@@ -95,13 +99,13 @@ servers are:
 The look of GIMP's interface can be customized like any other GTK app
 by editing the ~/.gtkrc-2.0 file or by using "themes" (ready-made
 customizations).  For downloadable themes and further details, see
-http://gtk.themes.org.  Additionally, GIMP reads ~/.gimp-2.3/gtkrc so
+http://gtk.themes.org.  Additionally, GIMP reads ~/.gimp-2.4/gtkrc so
 you can have settings that only apply to GIMP.
 
 Included is a set of keybindings similar to those in Adobe Photoshop.
 You can find them in the ps-menurc file.  To use them, copy this file
-to ~/.gimp-2.3/menurc. You can also manually change the keybindings to
+to ~/.gimp-2.4/menurc. You can also manually change the keybindings to
-any of your choice by editing ~/.gimp-2.3/menurc.
+any of your choice by editing ~/.gimp-2.4/menurc.
 
 
 Have fun,

app/Makefile.am

@@ -32,9 +32,9 @@ SUBDIRS = \
 
 
 if ENABLE_GIMP_CONSOLE
-bin_PROGRAMS = gimp-2.3 gimp-console-2.3
+bin_PROGRAMS = gimp-2.4 gimp-console-2.4
 else
-bin_PROGRAMS = gimp-2.3
+bin_PROGRAMS = gimp-2.4
 endif
 
 app_sources = \
@@ -52,7 +52,7 @@ app_sources = \
 	units.h		\
 	gimp-intl.h
 
-gimp_2_3_SOURCES = $(app_sources)
+gimp_2_4_SOURCES = $(app_sources)
 
 
 EXTRA_DIST = \
@@ -97,7 +97,7 @@ AM_LDFLAGS = $(mwindows) $(munix) \
 	-u $(SYMPREFIX)gimp_coords_mix		\
 	-u $(SYMPREFIX)gimp_plug_in_manager_restore
 
-gimp_2_3_LDADD = \
+gimp_2_4_LDADD = \
 	gui/libappgui.a			\
 	actions/libappactions.a		\
 	dialogs/libappdialogs.a		\
@@ -139,13 +139,13 @@ gimp_2_3_LDADD = \
 
 if ENABLE_GIMP_CONSOLE
 
-gimp_console_2_3_SOURCES = $(app_sources)
+gimp_console_2_4_SOURCES = $(app_sources)
 
-gimp_console_2_3_CPPFLAGS = \
+gimp_console_2_4_CPPFLAGS = \
 	$(AM_CPPFLAGS)			\
 	-DGIMP_CONSOLE_COMPILATION
 
-gimp_console_2_3_LDADD = \
+gimp_console_2_4_LDADD = \
 	widgets/widgets-enums.o		\
 	display/display-enums.o		\
 	display/gimpdisplayoptions.o	\

configure.in

@@ -7,8 +7,8 @@ AC_PREREQ(2.54)
 #   GIMP_INTERFACE_AGE += 1;
 
 m4_define([gimp_major_version], [2])
-m4_define([gimp_minor_version], [3])
+m4_define([gimp_minor_version], [4])
-m4_define([gimp_micro_version], [20])
+m4_define([gimp_micro_version], [0])
 m4_define([gimp_real_version],
           [gimp_major_version.gimp_minor_version.gimp_micro_version])
 m4_define([gimp_version], [gimp_real_version])
@@ -17,20 +17,20 @@ m4_define([gimp_binary_age],
           [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
 
 # For overriding the version string. Comment out if not needed.
-# m4_define([gimp_version], [2.2.0])
+m4_define([gimp_version], [2.4.0-rc1])
 
 # This is the X.Y used in -lgimp-X.Y
 m4_define([gimp_api_version], [2.0])
 
 # Versions used for apps, plugins, tools, pkg-config files, and data,
 # as well as global and user prefs
-m4_define([gimp_app_version], [2.3])
+m4_define([gimp_app_version], [2.4])
 m4_define([gimp_plugin_version], [2.0])
 m4_define([gimp_tool_version], [2.0])
 m4_define([gimp_pkgconfig_version], [2.0])
 m4_define([gimp_data_version], [2.0])
 m4_define([gimp_sysconf_version], [2.0])
-m4_define([gimp_user_version], [2.3])
+m4_define([gimp_user_version], [2.4])
 
 m4_define([gimp_unstable],
           m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no]))

tools/Makefile.am

@@ -13,12 +13,12 @@ bin_PROGRAMS = $(GIMP_REMOTE)
 noinst_PROGRAMS = test-clipboard
 
 EXTRA_PROGRAMS = \
-	gimp-remote-2.3	\
+	gimp-remote-2.4	\
 	kernelgen
 
-gimp_remote_2_3_SOURCES = gimp-remote.c
+gimp_remote_2_4_SOURCES = gimp-remote.c
 
-gimp_remote_2_3_LDADD = \
+gimp_remote_2_4_LDADD = \
 	$(GTK_LIBS)	\
 	$(LIBXMU)