new dev release

6 files changed, 402 insertions, 29 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index c201d1bbc5b4..f1adb1384712 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.65 2004/01/14 18:34:08 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.66 2004/01/21 13:53:13 foser Exp $
+
+*gimp-2.0_pre2 (21 Jan 2004)
+
+  21 Jan 2004; <foser@gentoo.org> gimp-2.0_pre2.ebuild :
+  New release, add upstream fix for gimp-remote to fix desktop item behaviour
+  Add gimpprint local USE handling for printing, based on patch by <brix@gimp.org> in #37684
+  Add wmf USE flag on request in #38867
 
   14 Jan 2004; <gustavoz@gentoo.org> gimp-1.2.5.ebuild:
   stable on hppa
@@ -8,7 +15,7 @@
   13 Jan 2004; Jon Portnoy <avenj@gentoo.org> gimp-1.2.5.ebuild :
   Stable on AMD64.
 
-*gimp-2.0_pre1 (09 Jan 2003)
+*gimp-2.0_pre1 (09 Jan 2004)
 
   09 Jan 2004; foser <foser@gentoo.org> gimp-2.0_pre1.ebuild :
   Fix SRC_URI, duh, i thought i double checked that (#37656)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index de6839dd354c..1076bd5df35e 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,10 +1,9 @@
-MD5 72efcb18005f7cce89b02dad70fba9d8 gimp-2.0_pre2.ebuild 3410
-MD5 98e58808202ec45561b20ba1adddbf5c gimp-1.3.23.ebuild 3080
+MD5 66bc396ec3b6b6019110843d4f0c5d6a gimp-2.0_pre2.ebuild 2833
 MD5 f2435ea78fe2898d558c4e427e2d2c28 gimp-1.2.5.ebuild 3220
 MD5 afaef441b50efcf144b3c644592c626b gimp-2.0_pre1.ebuild 3385
 MD5 736c753854776cb1c93f7e89ba807787 gimp-1.2.3-r3.ebuild 4685
 MD5 94d6af458cd63b08afdecab7cce057ee gimp-1.2.4.ebuild 3079
-MD5 b8ec1f509f985bfa604c6077bbae6e90 ChangeLog 10119
+MD5 09a61542da76e6bd9589524e6ba4cd27 ChangeLog 10415
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
 MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
@@ -13,7 +12,7 @@ MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
 MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 7cb224c3321fc461565ba31831ed87a8 files/digest-gimp-1.3.23 66
+MD5 c73865fe1298b84c685ee1314093c7bd files/gimp-2.0_pre2-remote_new_behaviour.patch 11818
 MD5 306a002fbdf9b01208b181663474dbe4 files/digest-gimp-2.0_pre1 67
 MD5 d75b2f3860a49663eec5ad4a3a1aae07 files/digest-gimp-2.0_pre2 67
 MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
diff --git a/media-gfx/gimp/files/digest-gimp-1.3.23 b/media-gfx/gimp/files/digest-gimp-1.3.23
deleted file mode 100644
index 4d97ee3914ab..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.3.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1f30a6979d62241915964db034c4f306 gimp-1.3.23.tar.bz2 12002664
diff --git a/media-gfx/gimp/files/digest-gimp-2.0_pre2 b/media-gfx/gimp/files/digest-gimp-2.0_pre2
new file mode 100644
index 000000000000..282ad34da9f8
--- /dev/null
+++ b/media-gfx/gimp/files/digest-gimp-2.0_pre2
@@ -0,0 +1 @@
+MD5 97898e176c5753269fc869cbe9590517 gimp-2.0pre2.tar.bz2 12029513
diff --git a/media-gfx/gimp/files/gimp-2.0_pre2-remote_new_behaviour.patch b/media-gfx/gimp/files/gimp-2.0_pre2-remote_new_behaviour.patch
new file mode 100644
index 000000000000..490fe1d5866d
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.0_pre2-remote_new_behaviour.patch
@@ -0,0 +1,369 @@
+Index: tools/gimp-remote.c
+===================================================================
+RCS file: /cvs/gnome/gimp/tools/gimp-remote.c,v
+retrieving revision 1.14
+diff -u -p -r1.14 gimp-remote.c
+--- tools/gimp-remote.c	17 Nov 2003 08:46:51 -0000	1.14
++++ tools/gimp-remote.c	20 Jan 2004 12:06:45 -0000
+@@ -2,14 +2,11 @@
+  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+  *
+  * gimp-remote.c
+- * Copyright (C) 2000-2003  Sven Neumann <sven@gimp.org>
++ * Copyright (C) 2000-2004  Sven Neumann <sven@gimp.org>
+  *                          Simon Budig <simon@gimp.org>
+  *
+  * Tells a running gimp to open files by creating a synthetic drop-event.
+  *
+- * compile with
+- *  gcc -o gimp-remote `pkg-config --cflags --libs gtk+-2.0` -lXmu gimp-remote.c
+- *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation; either version 2 of the License, or
+@@ -38,7 +35,6 @@
+  *                                                Simon
+  */
+ 
+-
+ #include "config.h"
+ 
+ #include <errno.h>
+@@ -54,7 +50,7 @@
+ #include "libgimpbase/gimpversion.h"
+ 
+ 
+-static gboolean  start_new = FALSE;
++#define GIMP_BINARY "gimp-1.3"
+ 
+ 
+ static GdkWindow *
+@@ -137,10 +133,8 @@ source_selection_get (GtkWidget        *
+ 		      GtkSelectionData *selection_data,
+ 		      guint             info,
+ 		      guint             time,
+-		      gpointer          data)
++		      const gchar      *uri)
+ {
+-  gchar *uri = (gchar *) data;
+-
+   gtk_selection_data_set (selection_data,
+                           selection_data->target,
+                           8, uri, strlen (uri));
+@@ -165,7 +159,6 @@ usage (const gchar *name)
+ 	   "Usage: %s [options] [FILE|URI]...\n\n", name);
+   g_print ("Valid options are:\n"
+            "  --display <display>  Use the designated X display.\n"
+-	   "  -n --new             Start gimp if no active gimp window was found.\n"
+ 	   "  -h --help            Output this help.\n"
+ 	   "  -v --version         Output version info.\n"
+              "\n");
+@@ -182,9 +175,12 @@ start_new_gimp (gchar   *argv0,
+   gchar  *gimp, *path, *name, *pwd;
+   const gchar *spath;
+ 
+-  file_list = g_string_prepend (file_list, "gimp\n");
++  if (file_list->len > 0)
++    file_list = g_string_prepend (file_list, "\n");
++
++  file_list = g_string_prepend (file_list, "gimp");
++
+   argv = g_strsplit (file_list->str, "\n", 0);
+-  g_string_free (file_list, TRUE);
+ 
+   /* We are searching for the path the gimp-remote executable lives in */
+ 
+@@ -194,15 +190,19 @@ start_new_gimp (gchar   *argv0,
+    * usable in it try argv[0], then fall back to search the path.
+    */
+ 
+-  gimp = NULL;
++  gimp  = NULL;
+   spath = NULL;
+ 
+-  for (i=0; i < 2; i++)
++  for (i = 0; i < 2; i++)
+     {
+       if (i == 0)
+-        spath = g_getenv ("_");
++        {
++          spath = g_getenv ("_");
++        }
+       else if (i == 1)
+-        spath = argv0;
++        {
++          spath = argv0;
++        }
+ 
+       if (spath)
+         {
+@@ -210,22 +210,20 @@ start_new_gimp (gchar   *argv0,
+ 
+           if (!strncmp (name, "gimp-remote", 11))
+             {
++              path = g_path_get_dirname (spath);
++
+               if (g_path_is_absolute (spath))
+                 {
+-                  path = g_path_get_dirname (spath);
+-                  gimp = g_strconcat (path, G_DIR_SEPARATOR_S,
+-                                      "gimp-1.3", NULL);
+-                  g_free (path);
++                  gimp = g_build_filename (path, GIMP_BINARY, NULL);
+                 }
+               else
+                 {
+                   pwd = g_get_current_dir ();
+-                  path = g_path_get_dirname (spath);
+-                  gimp = g_strconcat (pwd, G_DIR_SEPARATOR_S, path,
+-                                      G_DIR_SEPARATOR_S, "gimp-1.3", NULL);
+-                  g_free (path);
++                  gimp = g_build_filename (pwd, path, GIMP_BINARY, NULL);
+                   g_free (pwd);
+                 }
++
++              g_free (path);
+             }
+ 
+           g_free (name);
+@@ -235,19 +233,13 @@ start_new_gimp (gchar   *argv0,
+         break;
+     }
+ 
+-  for (i = 1; argv[i]; i++)
+-    {
+-      if (g_ascii_strncasecmp ("file:", argv[i], 5) == 0)
+-	argv[i] += 5;
+-    }
+-
+   execv (gimp, argv);
+-  execvp ("gimp-1.3", argv);
++  execvp (GIMP_BINARY, argv);
+ 
+   /*  if execv and execvp return, there was an arror  */
+-  g_printerr ("Couldn't start gimp-1.3 for the following reason: %s\n",
+-              g_strerror (errno));
+-  exit (-1);
++  g_printerr ("Couldn't start %s for the following reason: %s\n",
++              GIMP_BINARY, g_strerror (errno));
++  exit (EXIT_FAILURE);
+ }
+ 
+ static void
+@@ -258,7 +250,7 @@ parse_option (const gchar *progname,
+       strcmp (arg, "--version") == 0)
+     {
+       g_print ("gimp-remote version %s\n", GIMP_VERSION);
+-      exit (0);
++      exit (EXIT_SUCCESS);
+     }
+   else if (strcmp (arg, "-h") == 0 ||
+ 	   strcmp (arg, "-?") == 0 ||
+@@ -266,18 +258,20 @@ parse_option (const gchar *progname,
+ 	   strcmp (arg, "--usage") == 0)
+     {
+       usage (progname);
+-      exit (0);
++      exit (EXIT_SUCCESS);
+     }
+   else if (strcmp (arg, "-n") == 0 ||
+ 	   strcmp (arg, "--new") == 0)
+     {
+-      start_new = TRUE;
++      /*  accepted for backward compatibility; this is now the default  */
+     }
+   else
+     {
+-      g_print ("Unknown option %s\n", arg);
+-      g_print ("Try gimp-remote --help to get detailed usage instructions.\n");
+-      exit (0);
++      g_printerr ("Unknown option %s\n", arg);
++      g_printerr ("Try %s --help to get detailed usage instructions.\n",
++                  progname);
++
++      exit (EXIT_FAILURE);
+     }
+ }
+ 
+@@ -285,28 +279,19 @@ gint
+ main (gint    argc,
+       gchar **argv)
+ {
+-  GtkWidget  *source;
+   GdkDisplay *display;
+   GdkWindow  *gimp_window;
+-
+-  GdkDragContext  *context;
+-  GdkDragProtocol  protocol;
+-
+-  GdkAtom   sel_type;
+-  GdkAtom   sel_id;
+-  GList    *targetlist;
+-  guint     timeout;
+-  gboolean  options = TRUE;
+-
+-  GString  *file_list = g_string_new (NULL);
+-  gchar    *cwd       = g_get_current_dir ();
+-  gchar    *file_uri  = "";
+-  guint    i;
++  GString    *file_list = g_string_new (NULL);
++  gchar      *cwd       = g_get_current_dir ();
++  gint        i;
+ 
+   gtk_init (&argc, &argv);
+ 
+   for (i = 1; i < argc; i++)
+     {
++      gchar    *file_uri  = NULL;
++      gboolean  options   = TRUE;
++
+       if (strlen (argv[i]) == 0)
+         continue;
+ 
+@@ -332,9 +317,17 @@ main (gint    argc,
+           g_ascii_strncasecmp ("https:", argv[i], 6))
+         {
+           if (g_path_is_absolute (argv[i]))
+-            file_uri = g_strconcat ("file:", argv[i], NULL);
++            {
++              file_uri = g_filename_to_uri (argv[i], NULL, NULL);
++            }
+           else
+-            file_uri = g_strconcat ("file:", cwd, "/", argv[i], NULL);
++            {
++              gchar *abs = g_build_filename (cwd, argv[i], NULL);
++
++              file_uri = g_strconcat (abs, NULL, NULL);
++
++              g_free (abs);
++            }
+         }
+       else
+         {
+@@ -348,74 +341,82 @@ main (gint    argc,
+       g_free (file_uri);
+     }
+ 
+-  if (file_list->len == 0)
+-    {
+-      usage (argv[0]);
+-      return EXIT_SUCCESS;
+-    }
+-
+   /*  locate Gimp window */
+ 
+   display = gdk_display_get_default ();
+ 
+   gimp_window = gimp_remote_find_window (display, gdk_screen_get_default ());
+ 
+-  if (!gimp_window)
++  if (! gimp_window)
+     {
+-      if (start_new)
+-        start_new_gimp (argv[0], file_list);
++      start_new_gimp (argv[0], file_list);
+ 
+       g_printerr ("No gimp window found on display %s\n", gdk_get_display ());
+       return EXIT_FAILURE;
+     }
+ 
+-  gdk_drag_get_protocol_for_display (display, GDK_WINDOW_XID (gimp_window),
+-                                     &protocol);
+-  if (protocol != GDK_DRAG_PROTO_XDND)
++  if (file_list->len > 0)
+     {
+-      g_printerr ("Gimp Window doesnt use Xdnd-Protocol - huh?\n");
+-      return EXIT_FAILURE;
+-    }
++      GdkDragContext  *context;
++      GdkDragProtocol  protocol;
++      GtkWidget       *source;
++      GdkAtom          sel_type;
++      GdkAtom          sel_id;
++      GList           *targetlist;
++      guint            timeout;
++
++      gdk_drag_get_protocol_for_display (display,
++                                         GDK_WINDOW_XID (gimp_window),
++                                         &protocol);
++      if (protocol != GDK_DRAG_PROTO_XDND)
++        {
++          g_printerr ("Gimp Window doesnt use Xdnd-Protocol - huh?\n");
++          return EXIT_FAILURE;
++        }
+ 
+-  /*  Problem: If the Toolbox is hidden via Tab (gtk_widget_hide)
+-   *  it does not accept DnD-Operations and gtk_main() will not be
+-   *  terminated. If the Toolbox is simply unmapped (by the Windowmanager)
+-   *  DnD works. But in both cases gdk_window_is_visible () == 0.... :-(
+-   *  To work around this add a timeout and abort after 1.5 seconds.
+-   */
++      /*  Problem: If the Toolbox is hidden via Tab (gtk_widget_hide)
++       *  it does not accept DnD-Operations and gtk_main() will not be
++       *  terminated. If the Toolbox is simply unmapped (by the WM)
++       *  DnD works. But in both cases gdk_window_is_visible() returns
++       *  FALSE. To work around this we add a timeout and abort after
++       *  1.5 seconds.
++       */
+ 
+-  timeout = g_timeout_add (1500, toolbox_hidden, NULL);
++      timeout = g_timeout_add (1500, toolbox_hidden, NULL);
+ 
+-  /*  set up an DND-source  */
+-  source = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+-  g_signal_connect (source, "selection_get",
+-                    G_CALLBACK (source_selection_get), file_list->str);
+-  gtk_widget_realize (source);
++      /*  set up an DND-source  */
++      source = gtk_window_new (GTK_WINDOW_TOPLEVEL);
++      g_signal_connect (source, "selection_get",
++                        G_CALLBACK (source_selection_get),
++                        file_list->str);
++      gtk_widget_realize (source);
+ 
+ 
+-  /*  specify the id and the content-type of the selection used to
+-   *  pass the URIs to Gimp.
+-   */
+-  sel_id   = gdk_atom_intern ("XdndSelection", FALSE);
+-  sel_type = gdk_atom_intern ("text/uri-list", FALSE);
+-  targetlist = g_list_prepend (NULL, GUINT_TO_POINTER (sel_type));
++      /*  specify the id and the content-type of the selection used to
++       *  pass the URIs to Gimp.
++       */
++      sel_id   = gdk_atom_intern ("XdndSelection", FALSE);
++      sel_type = gdk_atom_intern ("text/uri-list", FALSE);
++      targetlist = g_list_prepend (NULL, GUINT_TO_POINTER (sel_type));
+ 
+-  /*  assign the selection to our DnD-source  */
+-  gtk_selection_owner_set (source, sel_id, GDK_CURRENT_TIME);
+-  gtk_selection_add_target (source, sel_id, sel_type, 0);
++      /*  assign the selection to our DnD-source  */
++      gtk_selection_owner_set (source, sel_id, GDK_CURRENT_TIME);
++      gtk_selection_add_target (source, sel_id, sel_type, 0);
+ 
+-  /*  drag_begin/motion/drop  */
+-  context = gdk_drag_begin (source->window, targetlist);
++      /*  drag_begin/motion/drop  */
++      context = gdk_drag_begin (source->window, targetlist);
+ 
+-  gdk_drag_motion (context, gimp_window, protocol, 0, 0,
+-                   GDK_ACTION_COPY, GDK_ACTION_COPY, GDK_CURRENT_TIME);
++      gdk_drag_motion (context, gimp_window, protocol, 0, 0,
++                       GDK_ACTION_COPY, GDK_ACTION_COPY, GDK_CURRENT_TIME);
+ 
+-  gdk_drag_drop (context, GDK_CURRENT_TIME);
++      gdk_drag_drop (context, GDK_CURRENT_TIME);
+ 
+-  /*  finally enter the mainloop to handle the events  */
+-  gtk_main ();
++      /*  finally enter the mainloop to handle the events  */
++      gtk_main ();
++
++      g_source_remove (timeout);
++    }
+ 
+-  g_source_remove (timeout);
+   g_string_free (file_list, TRUE);
+ 
+   return EXIT_SUCCESS;
diff --git a/media-gfx/gimp/gimp-1.3.23.ebuild b/media-gfx/gimp/gimp-2.0_pre2.ebuild
index 240c8fa0a337..beda506a98e7 100644
--- a/media-gfx/gimp/gimp-1.3.23.ebuild
+++ b/media-gfx/gimp/gimp-2.0_pre2.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.3.23.ebuild,v 1.1 2003/11/26 22:39:10 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0_pre2.ebuild,v 1.1 2004/01/21 13:53:13 foser Exp $
 
 inherit debug flag-o-matic libtool
 
-SV="`echo ${PV} | cut -d'.' -f1,2`"
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="GNU Image Manipulation Program - Development series"
-SRC_URI="mirror://gimp/v${SV}/v${PV}/${P}.tar.bz2"
+SRC_URI="mirror://gimp/v2.0/testing/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.gimp.org/"
 
 SLOT="2"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~hppa ~sparc"
-IUSE="doc python aalib png jpeg tiff gtkhtml mmx sse X altivec"
-
-# protect against over optimisation (related to #21787)
-#replace-flags -Os -O2
-#MAKEOPTS="${MAKEOPTS} -j1"
+IUSE="doc python aalib png jpeg tiff wmf gimpprint gtkhtml mmx sse X altivec"
 
 # FIXME : some more things can be (local) USE flagged
+
 RDEPEND=">=dev-libs/glib-2.2
 	>=x11-libs/gtk+-2.2.2
 	>=x11-libs/pango-1.2.2
@@ -27,6 +26,8 @@ RDEPEND=">=dev-libs/glib-2.2
 	>=media-libs/libart_lgpl-2.3.8-r1
 	sys-libs/zlib
 
+	gimpprint? ( =media-gfx/gimp-print-4.2* )
+
 	gtkhtml? ( =gnome-extra/libgtkhtml-2* )
 
 	png? ( >=media-libs/libpng-1.2.1 )
@@ -34,6 +35,8 @@ RDEPEND=">=dev-libs/glib-2.2
 		media-libs/libexif )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+
 	aalib?	( media-libs/aalib )
 	python?	( >=dev-lang/python-2.2
 		>=dev-python/pygtk-1.99.13 )
@@ -52,13 +55,8 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	# Fix linking to older version of gimp if installed - this should
-	# void liquidx's hack, so it is removed.
-	epatch ${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch
-
-	# note: this make elibtoolize do some weird things, so disabling - liquidx
-	# replace ltmain.sh from libtool 1.5a with libtool 1.4.x
-	#cd ${S}; aclocal; automake; libtoolize --force; autoconf
+	# fix gimp-remote behavior
+	epatch ${FILESDIR}/${P}-remote_new_behaviour.patch
 
 }
 
@@ -81,14 +79,14 @@ src_compile() {
 		`use_enable altivec` \
 		`use_enable doc gtk-doc` \
 		`use_enable python` \
+		`use_enable gimpprint print` \
 		`use_with X x` \
 		`use_with png libpng` \
 		`use_with jpeg libjpeg` \
 		`use_with jpeg libexif` \
 		`use_with tiff libtiff` \
 		`use_with aalib aa` \
-		--enable-debug \
-		--disable-print || die
+		--enable-debug || die
 
 	emake || die
 
@@ -103,7 +101,7 @@ src_install() {
 
 	# Install desktop file in the right place
 	insinto /usr/share/applications
-	newins ${S}/data/misc/gimp.desktop gimp-${SV}.desktop
+	newins ${S}/data/misc/gimp.desktop gimp-${PV}.desktop
 
 	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
 		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
@@ -112,10 +110,10 @@ src_install() {
 
 pkg_postinst() {
 
-	ewarn "The ${SV} Gimp series have been reslotted to SLOT 2."
-	ewarn "To clean up old ${SV} version remove all ${SV} series and recompile."
+	ewarn "The development Gimp series have been reslotted to SLOT 2"
+	ewarn "To clean up old 1.3 versions use 'emerge -C =gimp-1.3* -vp'"
 	echo ""
-	ewarn "If you are upgrading from an earlier 1.3 release, please note that"
+	ewarn "If you are upgrading from an earlier 1.3/2.0_pre release, please note that"
 	ewarn "the gimprc and sessionrc file formats changed. We suggest you remove"
 	ewarn "your personal ~/.gimp-1.3 directory and do a fresh user installation."