From 6a6d2f789b4d0debfb1f367fca1bb1fa776bf2c5 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Mon, 29 Sep 2008 20:33:13 +0000 Subject: [PATCH] bumped version to 2.6.0. 2008-09-29 Sven Neumann * configure.in: bumped version to 2.6.0. * app/Makefile.am * tools/Makefile.am: changed accordingly. * docs/gimprc.5.in * etc/gimprc: regenerated. svn path=/trunk/; revision=27081 --- ChangeLog | 10 ++++++++++ app/Makefile.am | 16 ++++++++-------- configure.in | 10 +++++----- docs/gimprc.5.in | 6 +++--- etc/gimprc | 6 +++--- tools/Makefile.am | 6 +++--- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c21144f768..6c68c33b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-09-29 Sven Neumann + + * configure.in: bumped version to 2.6.0. + + * app/Makefile.am + * tools/Makefile.am: changed accordingly. + + * docs/gimprc.5.in + * etc/gimprc: regenerated. + 2008-09-29 Sven Neumann * data/images/gimp-splash.png: splash screen for GIMP 2.6. Created diff --git a/app/Makefile.am b/app/Makefile.am index a2c4d18581..d0463bee86 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -33,9 +33,9 @@ SUBDIRS = \ if ENABLE_GIMP_CONSOLE -bin_PROGRAMS = gimp-2.5 gimp-console-2.5 +bin_PROGRAMS = gimp-2.6 gimp-console-2.6 else -bin_PROGRAMS = gimp-2.5 +bin_PROGRAMS = gimp-2.6 endif app_sources = \ @@ -59,7 +59,7 @@ app_sources = \ gimp-log.h \ gimp-intl.h -gimp_2_5_SOURCES = $(app_sources) +gimp_2_6_SOURCES = $(app_sources) EXTRA_DIST = \ @@ -102,9 +102,9 @@ AM_LDFLAGS = \ -u $(SYMPREFIX)gimp_image_map_config_get_type \ -u $(SYMPREFIX)gimp_plug_in_manager_restore -gimp_2_5_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags) +gimp_2_6_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags) -gimp_2_5_LDADD = \ +gimp_2_6_LDADD = \ gui/libappgui.a \ actions/libappactions.a \ dialogs/libappdialogs.a \ @@ -146,13 +146,13 @@ gimp_2_5_LDADD = \ if ENABLE_GIMP_CONSOLE -gimp_console_2_5_SOURCES = $(app_sources) +gimp_console_2_6_SOURCES = $(app_sources) -gimp_console_2_5_CPPFLAGS = \ +gimp_console_2_6_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DGIMP_CONSOLE_COMPILATION -gimp_console_2_5_LDADD = \ +gimp_console_2_6_LDADD = \ widgets/widgets-enums.o \ display/display-enums.o \ display/gimpdisplayoptions.o \ diff --git a/configure.in b/configure.in index c407e27d51..145445e7eb 100644 --- a/configure.in +++ b/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], [5]) -m4_define([gimp_micro_version], [5]) +m4_define([gimp_minor_version], [6]) +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.5.0]) +# m4_define([gimp_version], [2.6.0]) # 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.5]) +m4_define([gimp_app_version], [2.6]) 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.5]) +m4_define([gimp_user_version], [2.6]) m4_define([gimp_unstable], m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no])) diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in index 1920b67aa1..5df8588dc6 100644 --- a/docs/gimprc.5.in +++ b/docs/gimprc.5.in @@ -208,8 +208,8 @@ are yes and no. .TP (default-image - (width 610) - (height 377) + (width 640) + (height 400) (unit pixels) (xresolution 72.000000) (yresolution 72.000000) @@ -802,7 +802,7 @@ When enabled, the online user manual will be used by the help system. Otherwise the locally installed copy is used. Possible values are yes and no. .TP -(user-manual-online-uri "http://docs.gimp.org/2.5") +(user-manual-online-uri "http://docs.gimp.org/2.6") The location of the online user manual. This is used if 'user-manual-online' is enabled. This is a string value. diff --git a/etc/gimprc b/etc/gimprc index 2f69a9e66c..38519c3326 100644 --- a/etc/gimprc +++ b/etc/gimprc @@ -159,8 +159,8 @@ # Sets the default image in the "File/New" dialog. This is a parameter list. # # (default-image -# (width 610) -# (height 377) +# (width 640) +# (height 400) # (unit pixels) # (xresolution 72.000000) # (yresolution 72.000000) @@ -636,7 +636,7 @@ # The location of the online user manual. This is used if # 'user-manual-online' is enabled. This is a string value. # -# (user-manual-online-uri "http://docs.gimp.org/2.5") +# (user-manual-online-uri "http://docs.gimp.org/2.6") # The window type hint that is set on the toolbox. This may affect how your # window manager decorates and handles the toolbox window. Possible values diff --git a/tools/Makefile.am b/tools/Makefile.am index 53211ac5c8..997c4b91bd 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -13,15 +13,15 @@ bin_PROGRAMS = $(GIMP_REMOTE) gimptool-2.0 noinst_PROGRAMS = test-clipboard EXTRA_PROGRAMS = \ - gimp-remote-2.5 \ + gimp-remote-2.6 \ kernelgen -gimp_remote_2_5_SOURCES = \ +gimp_remote_2_6_SOURCES = \ gimp-remote.c \ gimp-remote.h \ gimp-remote-x11.c -gimp_remote_2_5_LDADD = \ +gimp_remote_2_6_LDADD = \ $(GTK_LIBS) \ $(XMU_LIBS)