Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

15 files changed, 364 insertions, 117 deletions

diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 83797f1daf3c..fed889a3479d 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	mergeant
-PORTVERSION=	0.12.1
-PORTREVISION=	3
+PORTVERSION=	0.52
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.12
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.52
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -18,11 +18,12 @@ COMMENT=	Provide uniform access to data sources for the GNOME 2 environment
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomedb libgnomeprintui
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomedb libgnomeprintui
 USE_PERL5=	yes
-USE_LIBTOOL_VER=	15
+USE_LIBTOOL_VER=15
+INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index dfe2c3e931bd..9289ea8c7364 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/mergeant-0.12.1.tar.bz2) = 42a2f6778b81409db6cd1baa49663dca
-SIZE (gnome2/mergeant-0.12.1.tar.bz2) = 1204581
+MD5 (gnome2/mergeant-0.52.tar.bz2) = e9f96b824e452e9b9406b4c11f005b95
+SIZE (gnome2/mergeant-0.52.tar.bz2) = 2058623
diff --git a/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in
new file mode 100644
index 000000000000..52e62979ef48
--- /dev/null
+++ b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/libmergeant/C/Makefile.in.orig	Sat Aug 14 04:12:49 2004
++++ doc/libmergeant/C/Makefile.in	Sat Aug 14 04:13:07 2004
+@@ -214,7 +214,7 @@
+ 
+ # The name of the module.
+ DOC_MODULE = libmergeant
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ 
+ # The top-level SGML file.
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/databases/mergeant/files/patch-lib_Makefile.in b/databases/mergeant/files/patch-lib_Makefile.in
deleted file mode 100644
index f65cecae49d6..000000000000
--- a/databases/mergeant/files/patch-lib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig	Sat Sep 14 18:40:05 2002
-+++ lib/Makefile.in	Sat Sep 14 18:40:22 2002
-@@ -120,7 +120,7 @@
- 
- noinst_LTLIBRARIES = libgdbshared.la
- 
--INCLUDES =  	$(MERGEANT_CFLAGS) 	-DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" 	-DGNOMEDB_DATADIR=\""$(datadir)"\" 	-DGNOMEDB_LOCALEDIR=\""$(prefix)/share/locale"\"
-+INCLUDES =  	$(MERGEANT_CFLAGS) 	-DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" 	-DGNOMEDB_DATADIR=\""$(datadir)"\" 	-DGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\"
- 
- 
- libgdbshared_headers =  	gnome-db-shortcut.h
diff --git a/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c
new file mode 100644
index 000000000000..15005003ecdb
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c
@@ -0,0 +1,17 @@
+--- libmergeant/graph/mg-canvas-field.c.orig	Sat Aug 14 04:04:07 2004
++++ libmergeant/graph/mg-canvas-field.c	Sat Aug 14 04:04:40 2004
+@@ -146,13 +146,13 @@
+ 	gpointer ptr;
+ 	GString *string;
+ 	MgServerDataType *dtype;
++	MgEntity *ent;
+ 
+ 	cf = MG_CANVAS_FIELD (object);
+ 
+ 	switch (param_id) {
+ 	case PROP_FIELD:
+ 		ptr = g_value_get_pointer (value);
+-		MgEntity *ent;
+ 		g_return_if_fail (IS_MG_FIELD (ptr));
+ 
+ 		/* signals management */
diff --git a/databases/mergeant/files/patch-libmergeant_mg-form.c b/databases/mergeant/files/patch-libmergeant_mg-form.c
new file mode 100644
index 000000000000..168e15c413d3
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-form.c
@@ -0,0 +1,19 @@
+--- libmergeant/mg-form.c.orig	Thu Aug 12 22:24:32 2004
++++ libmergeant/mg-form.c	Thu Aug 12 22:24:48 2004
+@@ -586,6 +586,7 @@
+ {
+ 	PangoAttrList *attrs = NULL;
+ 	PangoAttribute *att;
++	GSList *list;
+ 
+ 	if (show_mark) {
+ 		attrs = pango_attr_list_new ();
+@@ -595,7 +596,7 @@
+ 		pango_attr_list_insert (attrs, att);
+ 	}
+ 
+-	GSList *list = form->priv->not_null_labels;
++	list = form->priv->not_null_labels;
+ 	while (list) {
+ 		gtk_label_set_attributes (GTK_LABEL (list->data), attrs);
+ 		list = g_slist_next (list);
diff --git a/databases/mergeant/files/patch-libmergeant_mg-parameter.c b/databases/mergeant/files/patch-libmergeant_mg-parameter.c
new file mode 100644
index 000000000000..60bfe9b4205c
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-parameter.c
@@ -0,0 +1,13 @@
+--- libmergeant/mg-parameter.c.orig	Thu Aug 12 22:25:38 2004
++++ libmergeant/mg-parameter.c	Thu Aug 12 22:25:53 2004
+@@ -608,9 +608,9 @@
+ mg_parameter_set_value (MgParameter *param, const GdaValue *value)
+ {
+ 	gboolean changed = TRUE;
++	const GdaValue *current_val;
+ 	g_return_if_fail (param && IS_MG_PARAMETER (param));
+ 	g_return_if_fail (param->priv);
+-	const GdaValue *current_val;
+ 
+ 	param->priv->invalid_forced = FALSE;
+ 
diff --git a/databases/mergeant/files/patch-libmergeant_mg-query.c b/databases/mergeant/files/patch-libmergeant_mg-query.c
new file mode 100644
index 000000000000..41bf5bf1a138
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-query.c
@@ -0,0 +1,25 @@
+--- libmergeant/mg-query.c.orig	Sun Aug  8 11:20:06 2004
++++ libmergeant/mg-query.c	Wed Jan  5 02:07:47 2005
+@@ -44,7 +44,7 @@
+ #include "mg-server-aggregate.h"
+ #include "mg-data-handler.h"
+ 
+-#include <libgda/sql/sql_parser.h>
++#include <libgda-1.2/sql/sql_parser.h>
+ #include "mg-qf-func.h"
+ 
+ /* 
+@@ -5117,9 +5117,11 @@
+ 				if (!cond)
+ 					has_error = TRUE;
+ 				else {
++					MgQfield *field_left;
++					MgQfield *field_right;
+ 					g_assert (mg_condition_get_cond_type (cond) == MG_CONDITION_LEAF_EQUAL);
+-					MgQfield *field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT);
+-					MgQfield *field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT);
++					field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT);
++					field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT);
+ 
+ 					if (IS_MG_QF_FIELD (field_left)) {
+ 						g_object_set (G_OBJECT (field_left), "value_provider", field_right, NULL);
diff --git a/databases/mergeant/files/patch-libmergeant_mg-work-grid.c b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c
new file mode 100644
index 000000000000..b9a36b2e18d2
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c
@@ -0,0 +1,14 @@
+--- libmergeant/mg-work-grid.c.orig	Sat Aug 14 03:59:47 2004
++++ libmergeant/mg-work-grid.c	Sat Aug 14 04:00:02 2004
+@@ -2299,10 +2299,10 @@
+ 			      GtkTreeModel *tree_model, GtkTreeIter *iter,
+ 			      MgWorkCore *core, MgDataEntryAttribute requested_status)
+ {
+-	g_return_if_fail (user_modif);
+ 	guint attrs;
+ 	GtkTreePath *path;
+ 	gint row;
++	g_return_if_fail (user_modif);
+ 
+ 	switch (requested_status) {
+ 	case MG_DATA_ENTRY_IS_NULL:
diff --git a/databases/mergeant/files/patch-src_Makefile.in b/databases/mergeant/files/patch-src_Makefile.in
deleted file mode 100644
index 1e4f74872a9b..000000000000
--- a/databases/mergeant/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig	Thu Jul 29 09:01:30 2004
-+++ src/Makefile.in	Thu Jul 29 09:01:40 2004
-@@ -141,7 +141,7 @@
- mergeant_LDADD =  	$(MERGEANT_LIBS) 	$(top_builddir)/lib/libmergeant.la 	query-fields/libqueryfields.a
- 
- 
--mergeant_LDFLAGS = -export-dynamic -dlopen
-+mergeant_LDFLAGS = -export-dynamic
- mergeant_DEPENDENCIES = query-fields/libqueryfields.a
- 
- DTD_FILES = mergeant.dtd
diff --git a/databases/mergeant/files/patch-src_interface_cb.c b/databases/mergeant/files/patch-src_interface_cb.c
deleted file mode 100644
index 6cbd2d2b3f63..000000000000
--- a/databases/mergeant/files/patch-src_interface_cb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/interface_cb.c.orig	Mon Aug  2 13:38:56 2004
-+++ src/interface_cb.c	Mon Aug  2 13:39:10 2004
-@@ -2209,6 +2209,6 @@
- 		gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (conf->error_dlg),
- 						   gda_connection_get_errors (cnc));
- 		break;
--	default :
-+	default :;
- 	}
- }
diff --git a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in b/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in
deleted file mode 100644
index 65ae9e7248d0..000000000000
--- a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/netaddr/Makefile.in.orig	Sat Sep 14 18:56:12 2002
-+++ src/plugins/netaddr/Makefile.in	Sat Sep 14 18:57:13 2002
-@@ -125,7 +125,7 @@
- lib_LTLIBRARIES_PLUGIN = libPnetaddr.la
- libPnetaddr_la_SOURCES = netaddr.c baseplugin.h
- libPnetaddr_la_LIBADD = 
--libPnetaddr_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPnetaddr_la_LDFLAGS = -module -avoid-version -export-dynamic
- 
- # Build a libtool library, for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) 
diff --git a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in b/databases/mergeant/files/patch-src_plugins_picts_Makefile.in
deleted file mode 100644
index 3c54fdcd0135..000000000000
--- a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/picts/Makefile.in.orig	Sat Sep 14 18:57:58 2002
-+++ src/plugins/picts/Makefile.in	Sat Sep 14 18:58:15 2002
-@@ -127,7 +127,7 @@
- libPpicts_la_SOURCES = picts_plugin.c baseplugin.h
- libPpicts_la_LIBADD = 
- 
--libPpicts_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPpicts_la_LDFLAGS = -module -export-dynamic -avoid-version
- 
- # Build a libtool library, libggnomedb.la for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) 
diff --git a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in b/databases/mergeant/files/patch-src_plugins_sample_Makefile.in
deleted file mode 100644
index ae8b1158cd68..000000000000
--- a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/sample/Makefile.in.orig	Sat Sep 14 18:58:54 2002
-+++ src/plugins/sample/Makefile.in	Sat Sep 14 18:59:04 2002
-@@ -127,7 +127,7 @@
- libPsample_la_SOURCES = sample_plugin.c baseplugin.h
- libPsample_la_LIBADD = 
- 
--libPsample_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPsample_la_LDFLAGS = -module -export-dynamic -avoid-version
- 
- # Build a libtool library, libggnomedb.la for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) 
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index d4ade5f9bc46..75d763c41237 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -1,52 +1,252 @@
 bin/mergeant
-lib/mergeant/plugins/libPnetaddr.so
-lib/mergeant/plugins/libPpicts.so
-lib/mergeant/plugins/libPsample.so
+bin/mg-db-browser
+bin/mg-test-dyn
+bin/mg-test-graph
+bin/mg-test-grapher
+bin/mg-test-handlers
+bin/mg-test-selector
+bin/mg-test-sqlquery
+bin/mg-test1
+bin/mg-test2
+bin/mg-test3
+bin/mg-verify-file
+include/libmergeant/graph/mg-canvas-cursor.h
+include/libmergeant/graph/mg-canvas-db-relations.h
+include/libmergeant/graph/mg-canvas-entity.h
+include/libmergeant/graph/mg-canvas-field.h
+include/libmergeant/graph/mg-canvas-fkconstraint.h
+include/libmergeant/graph/mg-canvas-item.h
+include/libmergeant/graph/mg-canvas-text.h
+include/libmergeant/graph/mg-canvas-tip.h
+include/libmergeant/graph/mg-canvas.h
+include/libmergeant/graph/mg-graph-item.h
+include/libmergeant/graph/mg-graph.h
+include/libmergeant/handlers/mg-data-cell-renderer-boolean.h
+include/libmergeant/handlers/mg-data-cell-renderer-combo.h
+include/libmergeant/handlers/mg-data-cell-renderer-info.h
+include/libmergeant/handlers/mg-data-cell-renderer-textual.h
+include/libmergeant/handlers/mg-entry-boolean.h
+include/libmergeant/handlers/mg-entry-combo.h
+include/libmergeant/handlers/mg-entry-none.h
+include/libmergeant/handlers/mg-entry-shell.h
+include/libmergeant/handlers/mg-entry-string.h
+include/libmergeant/handlers/mg-entry-time.h
+include/libmergeant/handlers/mg-entry-wrapper.h
+include/libmergeant/handlers/mg-handler-boolean.h
+include/libmergeant/handlers/mg-handler-none.h
+include/libmergeant/handlers/mg-handler-numerical.h
+include/libmergeant/handlers/mg-handler-string.h
+include/libmergeant/handlers/mg-handler-time.h
+include/libmergeant/libmergeant.h
+include/libmergeant/marshal.h
+include/libmergeant/mg-base.h
+include/libmergeant/mg-condition.h
+include/libmergeant/mg-conf.h
+include/libmergeant/mg-context.h
+include/libmergeant/mg-custom-layout.h
+include/libmergeant/mg-data-entry.h
+include/libmergeant/mg-data-handler.h
+include/libmergeant/mg-database.h
+include/libmergeant/mg-db-constraint.h
+include/libmergeant/mg-db-field.h
+include/libmergeant/mg-db-table.h
+include/libmergeant/mg-dbms-update-viewer.h
+include/libmergeant/mg-defs.h
+include/libmergeant/mg-entity.h
+include/libmergeant/mg-enums.h
+include/libmergeant/mg-field.h
+include/libmergeant/mg-form.h
+include/libmergeant/mg-graphviz.h
+include/libmergeant/mg-join.h
+include/libmergeant/mg-parameter.h
+include/libmergeant/mg-qf-all.h
+include/libmergeant/mg-qf-field.h
+include/libmergeant/mg-qf-func.h
+include/libmergeant/mg-qf-value.h
+include/libmergeant/mg-qfield.h
+include/libmergeant/mg-query.h
+include/libmergeant/mg-ref-base.h
+include/libmergeant/mg-referer.h
+include/libmergeant/mg-renderer.h
+include/libmergeant/mg-result-set.h
+include/libmergeant/mg-selector-private.h
+include/libmergeant/mg-selector.h
+include/libmergeant/mg-server-aggregate.h
+include/libmergeant/mg-server-data-type.h
+include/libmergeant/mg-server-function.h
+include/libmergeant/mg-server.h
+include/libmergeant/mg-target.h
+include/libmergeant/mg-util.h
+include/libmergeant/mg-work-core.h
+include/libmergeant/mg-work-form.h
+include/libmergeant/mg-work-grid.h
+include/libmergeant/mg-work-layout.h
+include/libmergeant/mg-work-matrix.h
+include/libmergeant/mg-work-widget.h
+include/libmergeant/mg-xml-storage.h
+include/libmergeant/missing.h
+include/libmergeant/sel-aggregates.h
+include/libmergeant/sel-data-types.h
+include/libmergeant/sel-forms.h
+include/libmergeant/sel-functions.h
+include/libmergeant/sel-graphs.h
+include/libmergeant/sel-onequery.h
+include/libmergeant/sel-onetable.h
+include/libmergeant/sel-onetarget.h
+include/libmergeant/sel-queries.h
+include/libmergeant/sel-tables.h
+include/libmergeant/utility.h
+lib/libmergeant-2.a
+lib/libmergeant-2.so
+lib/libmergeant-2.so.1
+lib/libmergeant_graph-2.a
+lib/libmergeant_graph-2.so
+lib/libmergeant_graph-2.so.1
+lib/libmergeant_handlers-2.a
+lib/libmergeant_handlers-2.so
+lib/libmergeant_handlers-2.so.1
+libdata/bonobo/servers/GNOME_Mergeant.server
+libdata/pkgconfig/libmergeant.pc
+share/doc/libmergeant/MgBase.html
+share/doc/libmergeant/MgCanvas.html
+share/doc/libmergeant/MgCanvasCursor.html
+share/doc/libmergeant/MgCanvasDbRelations.html
+share/doc/libmergeant/MgCanvasEntity.html
+share/doc/libmergeant/MgCanvasField.html
+share/doc/libmergeant/MgCanvasItem.html
+share/doc/libmergeant/MgCanvasText.html
+share/doc/libmergeant/MgCanvasTip.html
+share/doc/libmergeant/MgCondition.html
+share/doc/libmergeant/MgConf.html
+share/doc/libmergeant/MgContext.html
+share/doc/libmergeant/MgCustomLayout.html
+share/doc/libmergeant/MgDataCellRendererBoolean.html
+share/doc/libmergeant/MgDataCellRendererInfo.html
+share/doc/libmergeant/MgDataCellRendererTextual.html
+share/doc/libmergeant/MgDataEntry.html
+share/doc/libmergeant/MgDataHandler.html
+share/doc/libmergeant/MgDatabase.html
+share/doc/libmergeant/MgDbConstraint.html
+share/doc/libmergeant/MgDbField.html
+share/doc/libmergeant/MgDbTable.html
+share/doc/libmergeant/MgDbmsUpdateViewer.html
+share/doc/libmergeant/MgEntity.html
+share/doc/libmergeant/MgEntryBoolean.html
+share/doc/libmergeant/MgEntryCidr.html
+share/doc/libmergeant/MgEntryCombo.html
+share/doc/libmergeant/MgEntryNone.html
+share/doc/libmergeant/MgEntryPassmd5.html
+share/doc/libmergeant/MgEntryShell.html
+share/doc/libmergeant/MgEntryString.html
+share/doc/libmergeant/MgEntryTime.html
+share/doc/libmergeant/MgEntryWrapper.html
+share/doc/libmergeant/MgField.html
+share/doc/libmergeant/MgForm.html
+share/doc/libmergeant/MgGraph.html
+share/doc/libmergeant/MgGraphItem.html
+share/doc/libmergeant/MgGraphviz.html
+share/doc/libmergeant/MgHandlerBoolean.html
+share/doc/libmergeant/MgHandlerCidr.html
+share/doc/libmergeant/MgHandlerNone.html
+share/doc/libmergeant/MgHandlerNumerical.html
+share/doc/libmergeant/MgHandlerPassmd5.html
+share/doc/libmergeant/MgHandlerString.html
+share/doc/libmergeant/MgHandlerText.html
+share/doc/libmergeant/MgHandlerTime.html
+share/doc/libmergeant/MgJoin.html
+share/doc/libmergeant/MgParameter.html
+share/doc/libmergeant/MgQfAll.html
+share/doc/libmergeant/MgQfField.html
+share/doc/libmergeant/MgQfFunc.html
+share/doc/libmergeant/MgQfValue.html
+share/doc/libmergeant/MgQfield.html
+share/doc/libmergeant/MgQuery.html
+share/doc/libmergeant/MgRefBase.html
+share/doc/libmergeant/MgReferer.html
+share/doc/libmergeant/MgRenderer.html
+share/doc/libmergeant/MgResultSet.html
+share/doc/libmergeant/MgSelector.html
+share/doc/libmergeant/MgServer.html
+share/doc/libmergeant/MgServerAggregate.html
+share/doc/libmergeant/MgServerDataType.html
+share/doc/libmergeant/MgServerFunction.html
+share/doc/libmergeant/MgTarget.html
+share/doc/libmergeant/MgWorkCore.html
+share/doc/libmergeant/MgWorkForm.html
+share/doc/libmergeant/MgWorkGrid.html
+share/doc/libmergeant/MgWorkLayout.html
+share/doc/libmergeant/MgWorkMatrix.html
+share/doc/libmergeant/MgWorkWidget.html
+share/doc/libmergeant/MgXmlStorage.html
+share/doc/libmergeant/ch01.html
+share/doc/libmergeant/ch02.html
+share/doc/libmergeant/ch03.html
+share/doc/libmergeant/ch04.html
+share/doc/libmergeant/ch04s02.html
+share/doc/libmergeant/ch05.html
+share/doc/libmergeant/ch06.html
+share/doc/libmergeant/ch07.html
+share/doc/libmergeant/ch08.html
+share/doc/libmergeant/ch08s02.html
+share/doc/libmergeant/ch09.html
+share/doc/libmergeant/ch09s02.html
+share/doc/libmergeant/ch09s03.html
+share/doc/libmergeant/ch10.html
+share/doc/libmergeant/ch11.html
+share/doc/libmergeant/ch12.html
+share/doc/libmergeant/example_bad.png
+share/doc/libmergeant/example_result.png
+share/doc/libmergeant/home.png
+share/doc/libmergeant/index.html
+share/doc/libmergeant/index.sgml
+share/doc/libmergeant/left.png
+share/doc/libmergeant/libmergeant.devhelp
+share/doc/libmergeant/query01.png
+share/doc/libmergeant/right.png
+share/doc/libmergeant/up.png
 share/gnome/application-registry/mergeant.applications
 share/gnome/applications/mergeant.desktop
-share/gnome/help/mergeant/C/c137.html
-share/gnome/help/mergeant/C/c220.html
-share/gnome/help/mergeant/C/c25.html
-share/gnome/help/mergeant/C/c254.html
-share/gnome/help/mergeant/C/c342.html
-share/gnome/help/mergeant/C/c372.html
-share/gnome/help/mergeant/C/c375.html
-share/gnome/help/mergeant/C/f20.html
-share/gnome/help/mergeant/C/images/env_form.jpg
-share/gnome/help/mergeant/C/images/env_grid.jpg
-share/gnome/help/mergeant/C/images/env_prop.jpg
-share/gnome/help/mergeant/C/images/framework.eps
-share/gnome/help/mergeant/C/images/framework.fig
-share/gnome/help/mergeant/C/images/framework.jpg
-share/gnome/help/mergeant/C/images/gas.gif
-share/gnome/help/mergeant/C/images/main.jpg
-share/gnome/help/mergeant/C/images/plugins_dt.jpg
-share/gnome/help/mergeant/C/images/plugins_objects.jpg
-share/gnome/help/mergeant/C/images/plugins_sum.jpg
-share/gnome/help/mergeant/C/images/properties.jpg
-share/gnome/help/mergeant/C/images/queryprop.jpg
-share/gnome/help/mergeant/C/images/queryprop_cond.jpg
-share/gnome/help/mergeant/C/images/queryprop_joins.jpg
-share/gnome/help/mergeant/C/images/queryprop_objects.jpg
-share/gnome/help/mergeant/C/images/queryprop_sql.jpg
-share/gnome/help/mergeant/C/images/rels.jpg
-share/gnome/help/mergeant/C/images/sysinfo.jpg
+share/gnome/help/mergeant/C/book1.html
+share/gnome/help/mergeant/C/c13.html
+share/gnome/help/mergeant/C/c47.html
+share/gnome/help/mergeant/C/c68.html
+share/gnome/help/mergeant/C/c76.html
+share/gnome/help/mergeant/C/c8.html
+share/gnome/help/mergeant/C/c84.html
+share/gnome/help/mergeant/C/c94.html
+share/gnome/help/mergeant/C/images/datasources.png
+share/gnome/help/mergeant/C/images/dba_properties.png
+share/gnome/help/mergeant/C/images/workspace-data-types.png
+share/gnome/help/mergeant/C/images/workspace-graphs.png
+share/gnome/help/mergeant/C/images/workspace-queries.png
+share/gnome/help/mergeant/C/images/workspace.png
 share/gnome/help/mergeant/C/index.html
+share/gnome/help/mergeant/C/stylesheet-images/caution.gif
+share/gnome/help/mergeant/C/stylesheet-images/home.gif
+share/gnome/help/mergeant/C/stylesheet-images/important.gif
+share/gnome/help/mergeant/C/stylesheet-images/next.gif
+share/gnome/help/mergeant/C/stylesheet-images/note.gif
+share/gnome/help/mergeant/C/stylesheet-images/prev.gif
+share/gnome/help/mergeant/C/stylesheet-images/tip.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-blank.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-minus.gif
+share/gnome/help/mergeant/C/stylesheet-images/toc-plus.gif
+share/gnome/help/mergeant/C/stylesheet-images/up.gif
+share/gnome/help/mergeant/C/stylesheet-images/warning.gif
 share/gnome/help/mergeant/C/topic.dat
-share/gnome/help/mergeant/C/x110.html
-share/gnome/help/mergeant/C/x168.html
-share/gnome/help/mergeant/C/x210.html
-share/gnome/help/mergeant/C/x236.html
-share/gnome/help/mergeant/C/x245.html
-share/gnome/help/mergeant/C/x313.html
-share/gnome/help/mergeant/C/x32.html
-share/gnome/help/mergeant/C/x350.html
-share/gnome/help/mergeant/C/x66.html
-share/gnome/help/mergeant/C/x80.html
-share/gnome/help/mergeant/C/x92.html
-share/gnome/mergeant/dtd/mergeant.dtd
+share/gnome/help/mergeant/C/x19.html
+share/gnome/help/mergeant/C/x40.html
+share/gnome/mergeant/dtd/libmergeant.dtd
+share/gnome/mergeant/plugins/libmergeant_handler_cidr.so
+share/gnome/mergeant/plugins/libmergeant_handler_cidr.so.1
+share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so
+share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so.1
+share/gnome/mergeant/plugins/libmergeant_handler_text.so
+share/gnome/mergeant/plugins/libmergeant_handler_text.so.1
+share/gnome/mergeant/ui/mergeant.xml
 share/gnome/mime-info/mergeant.keys
 share/gnome/mime-info/mergeant.mime
+share/gnome/omf/libmergeant/libmergeant-C.omf
 share/gnome/omf/mergeant/mergeant-C.omf
 share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png
 share/gnome/pixmaps/mergeant/mergeant.png
@@ -65,14 +265,20 @@ share/gnome/pixmaps/mergeant/query-view-query_16x16.png
 share/gnome/pixmaps/mergeant/query-view-table_16x16.png
 share/gnome/pixmaps/mergeant/query-view-view_16x16.png
 share/locale/am/LC_MESSAGES/mergeant.mo
+share/locale/az/LC_MESSAGES/mergeant.mo
 share/locale/ca/LC_MESSAGES/mergeant.mo
 share/locale/cs/LC_MESSAGES/mergeant.mo
 share/locale/da/LC_MESSAGES/mergeant.mo
 share/locale/de/LC_MESSAGES/mergeant.mo
+share/locale/el/LC_MESSAGES/mergeant.mo
+share/locale/en_CA/LC_MESSAGES/mergeant.mo
+share/locale/en_GB/LC_MESSAGES/mergeant.mo
 share/locale/es/LC_MESSAGES/mergeant.mo
 share/locale/fa/LC_MESSAGES/mergeant.mo
 share/locale/fr/LC_MESSAGES/mergeant.mo
+share/locale/hr/LC_MESSAGES/mergeant.mo
 share/locale/it/LC_MESSAGES/mergeant.mo
+share/locale/ml/LC_MESSAGES/mergeant.mo
 share/locale/ms/LC_MESSAGES/mergeant.mo
 share/locale/nl/LC_MESSAGES/mergeant.mo
 share/locale/no/LC_MESSAGES/mergeant.mo
@@ -87,13 +293,19 @@ share/locale/sv/LC_MESSAGES/mergeant.mo
 share/locale/tr/LC_MESSAGES/mergeant.mo
 share/locale/uk/LC_MESSAGES/mergeant.mo
 share/locale/vi/LC_MESSAGES/mergeant.mo
+share/locale/zh_CN/LC_MESSAGES/mergeant.mo
 @dirrm share/gnome/pixmaps/mergeant
 @dirrm share/gnome/omf/mergeant
+@dirrm share/gnome/omf/libmergeant
+@dirrm share/gnome/mergeant/ui
+@dirrm share/gnome/mergeant/plugins
 @dirrm share/gnome/mergeant/dtd
 @dirrm share/gnome/mergeant
 @dirrm share/gnome/help/mergeant/C/stylesheet-images
 @dirrm share/gnome/help/mergeant/C/images
 @dirrm share/gnome/help/mergeant/C
 @dirrm share/gnome/help/mergeant
-@dirrm lib/mergeant/plugins
-@dirrm lib/mergeant
+@dirrm share/doc/libmergeant
+@dirrm include/libmergeant/handlers
+@dirrm include/libmergeant/graph
+@dirrm include/libmergeant