From 4813d06f0ca8c3da2be59cbef350ae566dac90c0 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 31 Oct 2007 11:18:09 +0000 Subject: [PATCH] INSTALL README updated for 2.5. 2007-10-31 Sven Neumann * INSTALL * README * NEWS: updated for 2.5. svn path=/trunk/; revision=24015 --- ChangeLog | 6 ++++++ INSTALL | 28 ++++++++++++++-------------- NEWS | 5 ++--- README | 22 ++++++++++++++-------- 4 files changed, 36 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74e64163b0..b9e589eb75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-31 Sven Neumann + + * INSTALL + * README + * NEWS: updated for 2.5. + 2007-10-31 Michael Natterer * configure.in: depend on glib 2.14.1 diff --git a/INSTALL b/INSTALL index 1ce99eded3..c05c775702 100644 --- a/INSTALL +++ b/INSTALL @@ -1,11 +1,11 @@ -Installation instructions for GIMP 2.4 +Installation instructions for GIMP 2.5 -------------------------------------- There are some basic steps to building and installing GIMP. -GIMP 2.4 replaces earlier GIMP 2.x versions. It is advised that you -uninstall them before installing GIMP 2.4. If you want to keep your -older GIMP 2.x installation in parallel to GIMP 2.4, you have to +GIMP 2.5 replaces earlier GIMP 2.x versions. It is advised that you +uninstall them before installing GIMP 2.5. If you want to keep your +older GIMP 2.x installation in parallel to GIMP 2.5, you have to choose a separate prefix which is not in your default library search path. @@ -29,7 +29,7 @@ header files installed. from http://www.freedesktop.org/software/pkgconfig/. 2. You need to have installed GTK+ version 2.10.13 or newer. GIMP - needs an even more recent version of GLib (>= 2.12.3). It also + needs an even more recent version of GLib (>= 2.14.1). It also wants Pango (>= 1.12.2). Sources for these can be grabbed from ftp://ftp.gtk.org/. @@ -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.4. + with other versions of GIMP, we install a binary called gimp-2.5. By default there's also a link created so that you can type 'gimp' - to start gimp-2.4. + to start gimp-2.5. 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.4.x.tar.gz # unpack the sources - % cd gimp-2.4.x # change to the toplevel directory + % tar xvfz gimp-2.5.x.tar.gz # unpack the sources + % cd gimp-2.5.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.4 - (the directory .gimp-2.4 in the users home directory) to DIR. + GIMP uses to search for its configuration files from ~/.gimp-2.5 + (the directory .gimp-2.5 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.4 the default gimp installation. Otherwise a link called - gimp pointing to the gimp-2.4 executable will be installed. + gimp-2.5 the default gimp installation. Otherwise a link called + gimp pointing to the gimp-2.5 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.4' in `app'. + - The main GIMP program 'gimp-2.5' 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 diff --git a/NEWS b/NEWS index 79336dd22f..89e0b216ac 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,9 @@ ------------------------------ GNU Image Manipulation Program - 2.4 Stable Branch + Development Branch ------------------------------ -This is the stable branch of GIMP. No new features are being added -here, just bug-fixes. +This is the unstable development branch of GIMP. Changes in GIMP 2.4.1 diff --git a/README b/README index ea12f39601..3014391583 100644 --- a/README +++ b/README @@ -1,11 +1,17 @@ - The GNU Image Manipulation Program Version 2.4 ----------------------------------------------- + ------------------------------ + GNU Image Manipulation Program + Development Branch + ------------------------------ -GIMP 2.4 replaces earlier GIMP 2.x versions. It is advised that you -uninstall them before installing GIMP 2.4. If you want to keep your -older GIMP 2.x installation in parallel to GIMP 2.4, you have to +This is the unstable development branch of GIMP. It is intended to +developers only. If you are a user, please use the stable gimp-2-4 +branch or a tarball release from the 2.4 series. + +GIMP 2.5 replaces earlier GIMP 2.x versions. It is advised that you +uninstall them before installing GIMP 2.5. If you want to keep your +older GIMP 2.x installation in parallel to GIMP 2.5, 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 +path. Otherwise your GIMP 2.4 or GIMP 2.2 installation will start to use the new libraries. You have been warned. If you think you found a bug in this version, please make sure that it @@ -92,8 +98,8 @@ 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.4/menurc. You can also manually change the keybindings to -any of your choice by editing ~/.gimp-2.4/menurc. +to ~/.gimp-2.5/menurc. You can also manually change the keybindings to +any of your choice by editing ~/.gimp-2.5/menurc. Have fun,