From f97ae7d7267a5514e9f44da85302b0e26f219237 Mon Sep 17 00:00:00 2001
From: Sven Neumann <sven@gimp.org>
Date: Sat, 20 Mar 2004 20:45:17 +0000
Subject: [PATCH] set version number to 2.0.0, version string to "2.0rc1".

2004-03-20  Sven Neumann  <sven@gimp.org>

	* configure.in: set version number to 2.0.0, version string to
	"2.0rc1".

	* app/Makefile.am
	* libgimp/Makefile.am
	* libgimpbase/Makefile.am
	* libgimpcolor/Makefile.am
	* libgimpmath/Makefile.am
	* libgimpmodule/Makefile.am
	* libgimpthumb/Makefile.am
	* libgimpwidgets/Makefile.am
	* tools/Makefile.am: changed 1.3 to 2.0 all over the place.

	* README
	* NEWS: updated for the 2.0rc1 release.
---
 ChangeLog                  | 18 ++++++++++++++++++
 NEWS                       | 20 +++++++++++++++++---
 README                     | 27 +++++++++++++--------------
 app/Makefile.am            | 16 ++++++++--------
 configure.in               | 20 ++++++++++----------
 libgimp/Makefile.am        | 18 +++++++++---------
 libgimpbase/Makefile.am    | 10 +++++-----
 libgimpcolor/Makefile.am   | 10 +++++-----
 libgimpmath/Makefile.am    | 10 +++++-----
 libgimpmodule/Makefile.am  | 10 +++++-----
 libgimpthumb/Makefile.am   |  8 ++++----
 libgimpwidgets/Makefile.am | 22 +++++++++++-----------
 tools/Makefile.am          |  6 +++---
 13 files changed, 113 insertions(+), 82 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 20cff3b7e2..49b7841166 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-03-20  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: set version number to 2.0.0, version string to
+	"2.0rc1".
+
+	* app/Makefile.am
+	* libgimp/Makefile.am
+	* libgimpbase/Makefile.am
+	* libgimpcolor/Makefile.am
+	* libgimpmath/Makefile.am
+	* libgimpmodule/Makefile.am
+	* libgimpthumb/Makefile.am
+	* libgimpwidgets/Makefile.am
+	* tools/Makefile.am: changed 1.3 to 2.0 all over the place.
+
+	* README
+	* NEWS: updated for the 2.0rc1 release.
+
 2004-03-20  Sven Neumann  <sven@gimp.org>
 
 	* app/text/gimptextlayer.c: it wasn't such a good idea to let
diff --git a/NEWS b/NEWS
index 127728b9e4..b9238c751a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-2
+
             The GNU Image Manipulation Program Version 1.3
                           A Colorspace Odyssey
 
@@ -7,8 +7,8 @@ GIMP 1.3 is the development branch of The GIMP. Here's where the
 development takes place on the road to the next stable release
 GIMP version 2.0.
 
-Bugs fixed since the last release
-=================================
+Bugs fixed in GIMP 2.0rc1
+=========================
 - 136124: count animation frames starting with 1 (Simon)
 - 122519: allow to share paint options between tools (Mitch)
 - 136227: allow to toggle the histogram scale from the tool dialogs (Sven)
@@ -41,6 +41,20 @@ Bugs fixed since the last release
 - 137076: don't discard session info for dialogs hidden with Tab (Mitch)
 - 124176: use a counter to track undo_[freeze|thaw] (Simon)
 - 128833: don't make tool dialogs transient to the image window (Sven)
+- 64835:  on startup test if a swap file can be created (Simon, Raphael)
+- 136909, 137242, 81479: update the menus when a plug-in finished (Simon)
+- 137435: fixed sort order in plug-in menus for broken locales (Simon)
+- 137529: don't crash on invalid brush hoses (Simon)
+- 136996: search help pages in the users locale (Sven)
+- 137151: make accelerators work in gtk+-2.4 if there's no menubar (Mitch)
+- 136623, 136645: properly handle modifications to text layers (Sven)
+- 130985, 120021: implemented text undo (Sven)
+- 137612: improve tooltips for GimpScaleEntry (Sven)
+- 137737: show all user interface elements in the Jigsaw plug-in (Sven)
+- 137753: added a shortcut for the Path tool (Simon)
+- 137754: added a menu entry and shortcut for "Path to Selection" (Simon)
+- 137170: fixed crash with floating selections on quick-mask (Simon, Sven)
+- 137786: duplicate the text when duplicating a text layer (Sven)
 
 
 Bugs fixed in GIMP 2.0pre4
diff --git a/README b/README
index 08276023ad..9a3458bf4e 100644
--- a/README
+++ b/README
@@ -1,25 +1,24 @@
 The GIMP: The GNU Image Manipulation Program
 ============================================
 
-This is a pre-release of GIMP version 2.0. Actually it still is GIMP-1.3,
-the developers version of The GIMP. But we got pretty close to the final
-2.0 release, the plug-in API has settled and you are encouraged to try
-this software. Your feedback can help to make the 2.0 release a success.
-If you encounter any problems, please report them to our bug-tracker at
-bugzilla.gnome.org. There are still a number of known problems, so please
-check first if your problem has already been reported.
+This is a release candidate of GIMP version 2.0. Unless there are
+major problems, this will be released as GIMP 2.0 very soon. Your
+feedback can help to make the 2.0 release a success.  If you
+encounter any problems, please report them to our bug-tracker a
+bugzilla.gnome.org. There are still a number of known problems, so
+please check first if your problem has already been reported.
 
-GIMP-2.0 installs side-by-side with GIMP-1.2 so there's no need to
-uninstall GIMP-1.2 (but sooner or later you will not be using it any
+GIMP 2.0 installs side-by-side with GIMP 1.2 so there's no need to
+uninstall GIMP 1.2 (but sooner or later you will not be using it any
 longer...).
 
 Some features that were present in GIMP 1.2 are not included in this
 release. The perl bindings as well as all the perl scripts are not any
 longer included in this source tree. They have been moved into its own
 module called gimp-perl. Sooner or later there will be a gimp-perl
-release for GIMP-2.0. GAP, a set of plug-ins that used to live in the
+release for GIMP 2.0. GAP, a set of plug-ins that used to live in the
 Video submenu has also become a separate package. Expect a preview
-release of this software for GIMP-2.0 soon.
+release of this software for GIMP 2.0 soon.
 
 For detailed installation instructions, see the file INSTALL.
 
@@ -95,13 +94,13 @@ Many of the developers hang out there.  One of the Byxnet 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-1.3/gtkrc so
+http://gtk.themes.org.  Additionally GIMP reads ~/.gimp-2.0/gtkrc so
 you can have settings that only apply to The 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-1.3/menurc. You can also manually change the keybindings to
-any of your choice by editing ~/.gimp-1.3/menurc.
+to ~/.gimp-2.0/menurc. You can also manually change the keybindings to
+any of your choice by editing ~/.gimp-2.0/menurc.
 
 
 Have fun,
diff --git a/app/Makefile.am b/app/Makefile.am
index 552ddf9ebf..dca79fcd73 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -28,12 +28,12 @@ SUBDIRS = \
 scriptdata =
 
 if ENABLE_GIMP_CONSOLE
-bin_PROGRAMS = gimp-1.3 gimp-console-1.3
+bin_PROGRAMS = gimp-2.0 gimp-console-2.0
 else
-bin_PROGRAMS = gimp-1.3
+bin_PROGRAMS = gimp-2.0
 endif
 
-gimp_1_3_SOURCES = \
+gimp_2_0_SOURCES = \
 	app_procs.c	\
 	app_procs.h	\
 	main.c		\
@@ -71,13 +71,13 @@ INCLUDES = \
 	$(GTK_CFLAGS)	\
 	-I$(includedir)
 
-gimp_1_3_LDFLAGS = \
+gimp_2_0_LDFLAGS = \
 	$(mwindows)				\
 	-u $(SYMPREFIX)gimp_container_filter	\
 	-u $(SYMPREFIX)gimp_xml_parser_new	\
 	-u $(SYMPREFIX)gimp_drawable_stroke_vectors
 
-gimp_1_3_LDADD = \
+gimp_2_0_LDADD = \
 	config/libappconfig.a		\
 	gui/libappgui.a			\
 	display/libappdisplay.a		\
@@ -112,10 +112,10 @@ gimp_1_3_LDADD = \
 	$(REGEXREPL)
 
 if ENABLE_GIMP_CONSOLE
-gimp_console_1_3_SOURCES = $(gimp_1_3_SOURCES)
-gimp_console_1_3_LDFLAGS = $(gimp_1_3_LDFLAGS)
+gimp_console_2_0_SOURCES = $(gimp_2_0_SOURCES)
+gimp_console_2_0_LDFLAGS = $(gimp_2_0_LDFLAGS)
 
-gimp_console_1_3_LDADD = \
+gimp_console_2_0_LDADD = \
 	config/libappconfig.a		\
 	pdb/libapppdb.a			\
 	core/libappcore.a		\
diff --git a/configure.in b/configure.in
index 2295810a69..567db9f169 100644
--- a/configure.in
+++ b/configure.in
@@ -10,9 +10,9 @@ AC_PREREQ(2.54)
 # if backwards compatibility has been broken,
 # set GIMP_BINARY_AGE and GIMP_INTERFACE_AGE to 0.
 
-m4_define([gimp_major_version], [1])
-m4_define([gimp_minor_version], [3])
-m4_define([gimp_micro_version], [27])
+m4_define([gimp_major_version], [2])
+m4_define([gimp_minor_version], [0])
+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])
@@ -20,20 +20,20 @@ m4_define([gimp_interface_age], [0])
 m4_define([gimp_binary_age], [0])
 
 # For overriding the version string. Comment out if not needed.
-m4_define([gimp_version], [2.0pre4])
+m4_define([gimp_version], [2.0rc1])
 
 # This is the X.Y used in -lgimp-X.Y
-m4_define([gimp_api_version], [1.3])
+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], [1.3])
-m4_define([gimp_plugin_version], [1.3])
+m4_define([gimp_app_version], [2.0])
+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], [1.3])
-m4_define([gimp_sysconf_version], [1.3])
-m4_define([gimp_user_version], [1.3])
+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]))
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index e6528b3b6a..c3da2b2cc9 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -71,7 +71,7 @@ EXTRA_DIST = \
 	gimp.def	\
 	gimpui.def
 
-lib_LTLIBRARIES = libgimp-1.3.la libgimpui-1.3.la
+lib_LTLIBRARIES = libgimp-2.0.la libgimpui-2.0.la
 
 PDB_WRAPPERS_C = \
 	gimpbrushes_pdb.c		\
@@ -152,7 +152,7 @@ PDB_WRAPPERS_H = \
 	gimpundo_pdb.h			\
 	gimpunit_pdb.h
 
-libgimp_1_3_la_SOURCES = \
+libgimp_2_0_la_SOURCES = \
 	gimp.c			\
 	gimp.h			\
 	gimpcompat.h		\
@@ -192,7 +192,7 @@ libgimp_1_3_la_SOURCES = \
 	stdplugins-intl.h	\
 	libgimp-intl.h
 
-libgimpui_1_3_la_SOURCES = \
+libgimpui_2_0_la_SOURCES = \
 	gimpui.c		\
 	gimpui.h		\
 	gimpuitypes.h		\
@@ -239,24 +239,24 @@ gimpinclude_HEADERS = \
 	gimpgradientmenu.h	\
 	gimppatternmenu.h
 
-libgimp_1_3_la_LDFLAGS = \
+libgimp_2_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(libgimp_export_symbols)
 
-libgimp_1_3_la_LIBADD = $(libgimpcolor) $(libgimpbase) $(GLIB_LIBS) $(RT_LIBS)
+libgimp_2_0_la_LIBADD = $(libgimpcolor) $(libgimpbase) $(GLIB_LIBS) $(RT_LIBS)
 
-libgimp_1_3_la_DEPENDENCIES = $(gimp_def) $(libgimpcolor) $(libgimpbase)
+libgimp_2_0_la_DEPENDENCIES = $(gimp_def) $(libgimpcolor) $(libgimpbase)
 
-libgimpui_1_3_la_LDFLAGS = \
+libgimpui_2_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(libgimpui_export_symbols)
 
-libgimpui_1_3_la_LIBADD = $(libgimp) $(libgimpwidgets) $(libgimpcolor) \
+libgimpui_2_0_la_LIBADD = $(libgimp) $(libgimpwidgets) $(libgimpcolor) \
 	 $(libgimpbase) $(libgimpmodule) $(GTK_LIBS) $(RT_LIBS)
 
-libgimpui_1_3_la_DEPENDENCIES = $(gimpui_def) $(libgimp) $(libgimpwidgets) $(libgimpbase)
+libgimpui_2_0_la_DEPENDENCIES = $(gimpui_def) $(libgimp) $(libgimpwidgets) $(libgimpbase)
 
 install-data-local: install-ms-lib install-libtool-import-lib
 
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index aaf398c019..84fe20c3af 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -58,14 +58,14 @@ EXTRA_DIST = \
 	makefile.msc	\
 	gimpbase.def
 
-lib_LTLIBRARIES = libgimpbase-1.3.la
+lib_LTLIBRARIES = libgimpbase-2.0.la
 
 # help `make' along by giving another name for the file, which it knows
 # how to build
 ../libgimpbase/gimpversion.h: gimpversion.h
 	@:
 
-libgimpbase_1_3_la_SOURCES = \
+libgimpbase_2_0_la_SOURCES = \
 	gimpbase.h		\
 	gimpbasetypes.h		\
 	gimplimits.h		\
@@ -107,14 +107,14 @@ libgimpbaseinclude_HEADERS = \
 	gimpunit.h		\
 	gimputils.h
 
-libgimpbase_1_3_la_LDFLAGS = \
+libgimpbase_2_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined) 			\
 	$(libgimpbase_export_symbols)
 
-libgimpbase_1_3_la_DEPENDENCIES = $(gimpbase_def)
+libgimpbase_2_0_la_DEPENDENCIES = $(gimpbase_def)
 
-libgimpbase_1_3_la_LIBADD = $(GLIB_LIBS)
+libgimpbase_2_0_la_LIBADD = $(GLIB_LIBS)
 
 install-data-local: install-ms-lib install-libtool-import-lib
 
diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am
index aeabec7542..790893688a 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -59,9 +59,9 @@ EXTRA_DIST = \
 	makefile.msc		\
 	gimpcolor.def
 
-lib_LTLIBRARIES = libgimpcolor-1.3.la
+lib_LTLIBRARIES = libgimpcolor-2.0.la
 
-libgimpcolor_1_3_la_SOURCES = \
+libgimpcolor_2_0_la_SOURCES = \
 	gimpcolor.h			\
 	gimpcolortypes.h		\
 	gimpadaptivesupersample.c	\
@@ -87,14 +87,14 @@ libgimpcolorinclude_HEADERS = \
 	gimphsv.h			\
 	gimprgb.h
 
-libgimpcolor_1_3_la_LDFLAGS = \
+libgimpcolor_2_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined) 			\
 	$(libgimpcolor_export_symbols)
 
-libgimpcolor_1_3_la_DEPENDENCIES = $(gimpcolor_def) $(libgimpbase)
+libgimpcolor_2_0_la_DEPENDENCIES = $(gimpcolor_def) $(libgimpbase)
 
-libgimpcolor_1_3_la_LIBADD = $(GLIB_LIBS) $(libm)
+libgimpcolor_2_0_la_LIBADD = $(GLIB_LIBS) $(libm)
 
 install-data-local: install-ms-lib install-libtool-import-lib
 
diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am
index c16fe68560..df3add3ecd 100644
--- a/libgimpmath/Makefile.am
+++ b/libgimpmath/Makefile.am
@@ -59,9 +59,9 @@ EXTRA_DIST = \
 	makefile.msc		\
 	gimpmath.def
 
-lib_LTLIBRARIES = libgimpmath-1.3.la
+lib_LTLIBRARIES = libgimpmath-2.0.la
 
-libgimpmath_1_3_la_SOURCES = \
+libgimpmath_2_0_la_SOURCES = \
 	gimpmath.h	\
 	gimpmathtypes.h	\
 	gimpmatrix.c	\
@@ -78,14 +78,14 @@ libgimpmathinclude_HEADERS = \
 	gimpmd5.h	\
 	gimpvector.h
 
-libgimpmath_1_3_la_LDFLAGS = \
+libgimpmath_2_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(libgimpmath_export_symbols)
 
-libgimpmath_1_3_la_DEPENDENCIES = $(gimpmath_def) $(libgimpbase)
+libgimpmath_2_0_la_DEPENDENCIES = $(gimpmath_def) $(libgimpbase)
 
-libgimpmath_1_3_la_LIBADD = $(GLIB_LIBS) $(libm)
+libgimpmath_2_0_la_LIBADD = $(GLIB_LIBS) $(libm)
 
 
 #
diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am
index a6de593415..325cdd6386 100644
--- a/libgimpmodule/Makefile.am
+++ b/libgimpmodule/Makefile.am
@@ -61,9 +61,9 @@ EXTRA_DIST = \
 	makefile.msc	\
 	gimpmodule.def
 
-lib_LTLIBRARIES = libgimpmodule-1.3.la
+lib_LTLIBRARIES = libgimpmodule-2.0.la
 
-libgimpmodule_1_3_la_SOURCES = \
+libgimpmodule_2_0_la_SOURCES = \
 	gimpmoduletypes.h	\
 	gimpmodule.c		\
 	gimpmodule.h		\
@@ -75,14 +75,14 @@ libgimpmoduleinclude_HEADERS = \
 	gimpmodule.h		\
 	gimpmoduledb.h
 
-libgimpmodule_1_3_la_LDFLAGS = \
+libgimpmodule_2_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined) 			\
 	$(libgimpmodule_export_symbols)
 
-libgimpmodule_1_3_la_DEPENDENCIES = $(gimpmodule_def)
+libgimpmodule_2_0_la_DEPENDENCIES = $(gimpmodule_def)
 
-libgimpmodule_1_3_la_LIBADD = \
+libgimpmodule_2_0_la_LIBADD = \
 	$(libgimpbase)	\
 	$(GMODULE_LIBS)
 
diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
index 48d3d628bd..12ae9082a8 100644
--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -52,9 +52,9 @@ EXTRA_DIST = \
 	makefile.msc	\
 	gimpthumb.def
 
-lib_LTLIBRARIES = libgimpthumb-1.3.la
+lib_LTLIBRARIES = libgimpthumb-2.0.la
 
-libgimpthumb_1_3_la_SOURCES = \
+libgimpthumb_2_0_la_SOURCES = \
 	gimpthumb.h		\
 	gimpthumb-enums.c	\
 	gimpthumb-enums.h	\
@@ -74,12 +74,12 @@ libgimpthumbinclude_HEADERS = \
 	gimpthumb-utils.h	\
 	gimpthumbnail.h
 
-libgimpthumb_1_3_la_LDFLAGS = \
+libgimpthumb_2_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(libgimpthumb_export_symbols)
 
-libgimpthumb_1_3_la_LIBADD = $(libgimpmath) $(GDK_PIXBUF_LIBS)
+libgimpthumb_2_0_la_LIBADD = $(libgimpmath) $(GDK_PIXBUF_LIBS)
 
 
 install-data-local: install-ms-lib install-libtool-import-lib
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 025c64ec27..4426da81bb 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -56,9 +56,9 @@ INCLUDES = \
 	$(GTK_CFLAGS)	\
 	-I$(includedir)
 
-lib_LTLIBRARIES = libgimpwidgets-1.3.la
+lib_LTLIBRARIES = libgimpwidgets-2.0.la
 
-libgimpwidgets_1_3_la_sources = \
+libgimpwidgets_2_0_la_sources = \
 	gimpwidgets.c		\
 	gimpwidgets.h		\
 	gimpwidgetstypes.h	\
@@ -113,20 +113,20 @@ libgimpwidgets_1_3_la_sources = \
 	gimpwidgets-private.c	\
 	gimpwidgets-private.h
 
-libgimpwidgets_1_3_la_built_sources = \
+libgimpwidgets_2_0_la_built_sources = \
 	gimpwidgetsmarshal.c	\
 	gimpwidgetsmarshal.h
 
-libgimpwidgets_1_3_la_extra_sources = gimpwidgetsmarshal.list
+libgimpwidgets_2_0_la_extra_sources = gimpwidgetsmarshal.list
 
 EXTRA_DIST = \
 	makefile.msc				\
 	gimpwidgets.def				\
-	$(libgimpwidgets_1_3_la_extra_sources)
+	$(libgimpwidgets_2_0_la_extra_sources)
 
-libgimpwidgets_1_3_la_SOURCES = 		\
-	$(libgimpwidgets_1_3_la_built_sources)	\
-	$(libgimpwidgets_1_3_la_sources)
+libgimpwidgets_2_0_la_SOURCES = 		\
+	$(libgimpwidgets_2_0_la_built_sources)	\
+	$(libgimpwidgets_2_0_la_sources)
 
 libgimpwidgetsinclude_HEADERS = \
 	gimpwidgets.h		\
@@ -156,18 +156,18 @@ libgimpwidgetsinclude_HEADERS = \
 	gimpstock.h		\
 	gimpunitmenu.h
 
-libgimpwidgets_1_3_la_LDFLAGS = \
+libgimpwidgets_2_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined) 			\
 	$(libgimpwidgets_export_symbols)
 
-libgimpwidgets_1_3_la_LIBADD = \
+libgimpwidgets_2_0_la_LIBADD = \
 	$(libgimpbase)	\
 	$(libgimpcolor) \
 	$(GTK_LIBS) 	\
 	$(libm)
 
-libgimpwidgets_1_3_la_DEPENDENCIES = $(gimpwidgets_def)
+libgimpwidgets_2_0_la_DEPENDENCIES = $(gimpwidgets_def)
 
 #
 # rules to generate built sources
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2399d6ff78..08e910d2e7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,12 +17,12 @@ SUBDIRS = $(D_pdbgen) $(D_authorgen)
 bin_PROGRAMS = $(GIMP_REMOTE)
 
 EXTRA_PROGRAMS = \
-	gimp-remote-1.3	\
+	gimp-remote-2.0	\
 	kernelgen
 
-gimp_remote_1_3_SOURCES = gimp-remote.c
+gimp_remote_2_0_SOURCES = gimp-remote.c
 
-gimp_remote_1_3_LDADD = \
+gimp_remote_2_0_LDADD = \
 	$(GTK_LIBS)	\
 	$(LIBXMU)