dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure.in app/Makefile.am bumped version to 2.2.0-pre1, set app version 

2004-10-25  Sven Neumann  <sven@gimp.org>

	* configure.in
	* app/Makefile.am
	* tools/Makefile.am: bumped version to 2.2.0-pre1, set app version
	to 2.2, reset other versions to 2.0. Changed library versioning so
	we install with the same soname as gimp-2.0 again.
This commit is contained in:
Sven Neumann 2004-10-24 22:55:36 +00:00 committed by Sven Neumann
parent 726821fef7
commit 6108dc0212
8 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cvsignore
View File

@ -12,7 +12,7 @@ config.guess
config.sub
ltmain.sh
gimp.spec
gimptool-2.1
gimptool-2.0
gimptool-win32.c
gimp-2.0.pc
gimpthumb-2.0.pc
@ -30,4 +30,3 @@ mkinstalldirs
stamp-h
stamp-h1
stamp-h.in
ABOUT-NLS

9
ChangeLog
View File

@ -1,3 +1,12 @@
2004-10-25 Sven Neumann <sven@gimp.org>
* configure.in
* app/Makefile.am
* tools/Makefile.am: bumped version to 2.2.0-pre1, set app
version to 2.2, reset most versions to 2.0, changed library
versioning so we install with the same soname as gimp-2.0 again.
2004-10-25 Sven Neumann <sven@gimp.org>
* app/core/gimpimagefile.c (gimp_imagefile_get_desc_string): say

4
app/.cvsignore
View File

@ -3,5 +3,5 @@ Makefile.in
makefile.mingw
.deps
.libs
gimp-2.1
gimp-console-2.1
gimp-2.2
gimp-console-2.2

18
app/Makefile.am
View File

@ -31,9 +31,9 @@ SUBDIRS = \
scriptdata =
if ENABLE_GIMP_CONSOLE
bin_PROGRAMS = gimp-2.1 gimp-console-2.1
bin_PROGRAMS = gimp-2.2 gimp-console-2.2
else
bin_PROGRAMS = gimp-2.1
bin_PROGRAMS = gimp-2.2
endif
app_sources = \
@ -50,7 +50,7 @@ app_sources = \
units.h \
gimp-intl.h
gimp_2_1_SOURCES = $(app_sources)
gimp_2_2_SOURCES = $(app_sources)
EXTRA_DIST = \
@ -85,9 +85,9 @@ INCLUDES = \
$(PANGOFT2_CFLAGS) \
-I$(includedir)
gimp_2_1_LDFLAGS = $(mwindows)
gimp_2_2_LDFLAGS = $(mwindows)
gimp_2_1_LDADD = \
gimp_2_2_LDADD = \
gui/libappgui.a \
actions/libappactions.a \
dialogs/libappdialogs.a \
@ -128,15 +128,15 @@ gimp_2_1_LDADD = \
if ENABLE_GIMP_CONSOLE
gimp_console_2_1_SOURCES = $(app_sources)
gimp_console_2_2_SOURCES = $(app_sources)
gimp_console_2_1_CPPFLAGS = \
gimp_console_2_2_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DGIMP_CONSOLE_COMPILATION
gimp_console_2_1_LDFLAGS = $(gimp_2_1_LDFLAGS)
gimp_console_2_2_LDFLAGS = $(gimp_2_2_LDFLAGS)
gimp_console_2_1_LDADD = \
gimp_console_2_2_LDADD = \
widgets/widgets-enums.o \
display/display-enums.o \
display/gimpdisplayoptions.o \

27
configure.in
View File

@ -11,29 +11,30 @@ AC_PREREQ(2.54)
# set GIMP_BINARY_AGE and GIMP_INTERFACE_AGE to 0.
m4_define([gimp_major_version], [2])
m4_define([gimp_minor_version], [1])
m4_define([gimp_micro_version], [7])
m4_define([gimp_minor_version], [2])
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])
m4_define([gimp_interface_age], [0])
m4_define([gimp_binary_age], [0])
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.0])
m4_define([gimp_version], [2.2.0-pre1])
# 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.1])
m4_define([gimp_plugin_version], [2.1])
m4_define([gimp_tool_version], [2.1])
m4_define([gimp_app_version], [2.2])
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.1])
m4_define([gimp_sysconf_version], [2.1])
m4_define([gimp_user_version], [2.1])
m4_define([gimp_data_version], [2.0])
m4_define([gimp_sysconf_version], [2.0])
m4_define([gimp_user_version], [2.0])
m4_define([gimp_unstable],
m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no]))
@ -124,14 +125,8 @@ AC_SUBST(GIMP_DESKTOP_ICON)
m4_define([lt_current], [m4_eval(100 * gimp_minor_version + gimp_micro_version - gimp_interface_age)])
m4_define([lt_revision], [gimp_interface_age])
m4_define([lt_age], [m4_eval(gimp_binary_age - gimp_interface_age)])
LT_CURRENT=lt_current
LT_REVISION=lt_revision
LT_AGE=lt_age
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_SUBST(LT_VERSION_INFO)
AC_SUBST(LT_CURRENT_MINUS_AGE)

8
docs/.cvsignore
View File

@ -1,10 +1,10 @@
Makefile
Makefile.in
.xvpics
gimp-2.1.1
gimprc-2.1.5
gimp-remote-2.1.1
gimptool-2.1.1
gimp-2.2.1
gimprc-2.2.5
gimp-remote-2.2.1
gimptool-2.2.1
Wilber.xcf
Wilber_Construction_Kit.xcf
quick_reference

2
tools/.cvsignore
View File

@ -3,4 +3,4 @@ Makefile.in
.deps
.libs
kernelgen
gimp-remote-2.1
gimp-remote-2.2

6
tools/Makefile.am
View File

@ -17,12 +17,12 @@ SUBDIRS = $(D_pdbgen) $(D_authorgen)
bin_PROGRAMS = $(GIMP_REMOTE)
EXTRA_PROGRAMS = \
gimp-remote-2.1 \
gimp-remote-2.2 \
kernelgen
gimp_remote_2_1_SOURCES = gimp-remote.c
gimp_remote_2_2_SOURCES = gimp-remote.c
gimp_remote_2_1_LDADD = \
gimp_remote_2_2_LDADD = \
$(GTK_LIBS) \
$(LIBXMU)