head	1.6;
access;
symbols
	PRE_XORG_7:1.5
	RELEASE_4_EOL:1.5
	RELEASE_6_2_0:1.5
	RELEASE_6_1_0:1.5
	RELEASE_5_5_0:1.5
	RELEASE_6_0_0:1.5
	RELEASE_5_4_0:1.5
	RELEASE_4_11_0:1.5
	RELEASE_5_3_0:1.5
	RELEASE_4_10_0:1.5
	RELEASE_5_2_1:1.5
	RELEASE_5_2_0:1.5
	RELEASE_4_9_0:1.5
	RELEASE_5_1_0:1.5
	RELEASE_4_8_0:1.5
	RELEASE_5_0_0:1.5
	RELEASE_4_7_0:1.4
	RELEASE_4_6_2:1.4
	RELEASE_4_6_1:1.4
	RELEASE_4_6_0:1.4
	RELEASE_5_0_DP1:1.4
	RELEASE_4_5_0:1.4
	RELEASE_4_4_0:1.4
	RELEASE_4_3_0:1.4
	RELEASE_4_2_0:1.4
	RELEASE_4_1_1:1.3;
locks; strict;
comment	@# @;


1.6
date	2007.10.24.23.36.48;	author marcus;	state dead;
branches;
next	1.5;

1.5
date	2002.11.11.19.43.16;	author marcus;	state Exp;
branches;
next	1.4;

1.4
date	2000.10.20.16.25.56;	author ade;	state Exp;
branches;
next	1.3;

1.3
date	2000.08.17.16.41.52;	author ade;	state Exp;
branches;
next	1.2;

1.2
date	2000.08.04.11.59.33;	author sobomax;	state Exp;
branches;
next	1.1;

1.1
date	2000.08.04.01.34.34;	author ade;	state Exp;
branches;
next	;


desc
@@


1.6
log
@Presenting GNOME 2.20.1 and all related works for FreeBSD.  The official
GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338
@
text
@--- src/gtkhtml.c.orig	Wed Sep  4 20:00:35 2002
+++ src/gtkhtml.c	Wed Sep 18 21:40:55 2002
@@@@ -4353,7 +4353,7 @@@@
 {
 	gchar *rcfile;
 
-	rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
+	rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/" : gnome_util_user_home ()),
 			      (from_share ? "" : "/.gnome/"), name, NULL);
 
 	if (g_file_test (rcfile, G_FILE_TEST_ISFILE))
@


1.5
log
@Update to 1.1.6.
@
text
@@


1.4
log
@Update to 0.7
@
text
@d1 5
a5 3
--- src/gtkhtml.c.orig	Thu Oct 19 04:04:22 2000
+++ src/gtkhtml.c	Fri Oct 20 10:40:47 2000
@@@@ -2625,3 +2625,3 @@@@
d7 2
a8 2
-	rcfile = g_strconcat ((from_share ? PREFIX "/share/gtkhtml/" : gnome_util_user_home ()),
+	rcfile = g_strconcat ((from_share ? PREFIX "/share/gnome/gtkhtml/" : gnome_util_user_home ()),
d10 2
@


1.3
log
@Update to 0.6.1
@
text
@d1 3
a3 3
--- src/gtkhtml.c.orig	Thu Aug 10 14:54:13 2000
+++ src/gtkhtml.c	Mon Aug 14 12:52:42 2000
@@@@ -2331,7 +2331,7 @@@@
d5 3
a7 7
 	if (strcmp (klass->properties->keybindings_theme, "custom")) {
 		base = g_strconcat ("keybindingsrc.", klass->properties->keybindings_theme, NULL);
-		rcfile = g_concat_dir_and_file (PREFIX "/share/gtkhtml", base);
+		rcfile = g_concat_dir_and_file (PREFIX "/share/gnome/gtkhtml", base);
 		g_free (base);
 	} else {
 		rcfile = g_strconcat (gnome_util_user_home (), "/.gnome/gtkhtml-bindings-custom", NULL);
@


1.2
log
@Fix a keybinding search path (PREFIX/share/gtkhtml --> PREFIX/share/gnome/gtkhtml).
@
text
@d1 3
a3 12
--- src/gtkhtml.c.orig	Tue Jul 11 01:52:30 2000
+++ src/gtkhtml.c	Fri Aug  4 14:35:57 2000
@@@@ -1128,7 +1128,7 @@@@
 	klass->properties = gtk_html_class_properties_new ();
 #ifdef GTKHTML_HAVE_GCONF
 	if (gconf_is_initialized ()) {
-		gconf_client = gconf_client_new ();
+		gconf_client = gconf_client_get_default ();
 		if (!gconf_client)
 			g_error ("cannot create gconf_client\n");
 		gconf_client_add_dir (gconf_client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_ONELEVEL, &gconf_error);
@@@@ -2259,7 +2259,7 @@@@
@


1.1
log
@Extensive patchfile cleanups using sobomax's wonderful
post-extract rule
@
text
@d1 5
a5 3
--- src/gtkhtml.c.orig	Mon Jul 10 17:52:30 2000
+++ src/gtkhtml.c	Wed Aug  2 15:38:46 2000
@@@@ -1130,3 +1130,3 @@@@
d10 3
a12 3
--- capplet/main.c.orig	Mon Jun 19 16:33:41 2000
+++ capplet/main.c	Wed Aug  2 15:40:19 2000
@@@@ -197,3 +197,3 @@@@
d14 7
a20 3
-	client = gconf_client_new ();
+	client = gconf_client_get_default ();
 	gconf_client_add_dir(client, GTK_HTML_GCONF_DIR, GCONF_CLIENT_PRELOAD_NONE, NULL);
@

