6 files changed, 390 insertions, 164 deletions

diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index a1e951b53db3..342f2e6f0e1a 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -3,13 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/databases/libgnomedb/Makefile,v 1.25 2005/10/13 20:20:19 marcus Exp $
 #
 
 PORTNAME=	libgnomedb
-PORTVERSION=	1.2.2
+PORTVERSION=	1.9.100
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/libgnomedb/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \
 		intlhack
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -28,4 +29,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	libgnomedb.schemas
 
+PLIST_SUB=	VERSION=${PORTVERSION:R}
+
 .include <bsd.port.mk>
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index d79a6c0eadde..e89f4255f7c3 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomedb-1.2.2.tar.bz2) = cf8b1eb3aa3e7b18f46bc9bc9335dca7
-SIZE (gnome2/libgnomedb-1.2.2.tar.bz2) = 654823
+MD5 (gnome2/libgnomedb-1.9.100.tar.bz2) = a98ac52f084b1b0abad6b2c53ec034cc
+SIZE (gnome2/libgnomedb-1.9.100.tar.bz2) = 2192360
diff --git a/databases/libgnomedb/files/patch-Makefile.in b/databases/libgnomedb/files/patch-Makefile.in
index c23a0014f8f1..d0890cf04d75 100644
--- a/databases/libgnomedb/files/patch-Makefile.in
+++ b/databases/libgnomedb/files/patch-Makefile.in
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Thu Jul 22 10:56:33 2004
-+++ Makefile.in	Thu Jul 22 10:57:14 2004
-@@ -251,8 +251,7 @@
- @HAVE_LIBGLADE_TRUE@LIBGLADE_DIRECTORY = glade
+--- Makefile.in.orig	Thu Oct 13 15:59:10 2005
++++ Makefile.in	Thu Oct 13 16:00:04 2005
+@@ -290,15 +290,13 @@
+ @BUILD_GNOMEDB_SHARP_TRUE@GNOME_DIRECTORY = gnomedb-sharp
  @BUILD_WITH_GNOME_FALSE@GNOME_DIRECTORY = 
  @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center
 -@ENABLE_GTK_DOC_FALSE@DOC_DIRECTORY = 
@@ -10,3 +10,10 @@
  SUBDIRS = \
  	po \
  	libgnomedb \
+ 	$(LIBGLADE_DIRECTORY) \
+ 	$(GNOME_DIRECTORY) \
+ 	$(GNOMEDB_SHARP_DIRECTORY) \
+-	testing \
+ 	extra \
+ 	examples \
+ 	$(DOC_DIRECTORY) \
diff --git a/databases/libgnomedb/files/patch-doc_C_Makefile.in b/databases/libgnomedb/files/patch-doc_C_Makefile.in
new file mode 100644
index 000000000000..448aad65622a
--- /dev/null
+++ b/databases/libgnomedb/files/patch-doc_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/C/Makefile.in.orig	Tue Jun  7 16:57:58 2005
++++ doc/C/Makefile.in	Tue Jun  7 16:58:27 2005
+@@ -119,7 +119,7 @@
+ HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
+ HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
+ HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
deleted file mode 100644
index 27555ef8d7e3..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- libgnomedb/gnome-db-find-dialog.c.orig	Thu Jul 22 17:40:26 2004
-+++ libgnomedb/gnome-db-find-dialog.c	Thu Jul 22 17:41:02 2004
-@@ -216,11 +216,12 @@
- GtkWidget *
- gnome_db_find_dialog_new_with_model (const gchar *title, GdaDataModel *dm)
- {
-+	GnomeDbFindDialog *dialog;
- 	g_return_val_if_fail (GDA_IS_DATA_MODEL (dm), NULL);
- 	
- 	g_object_ref (dm);
- 	
--	GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title);
-+	dialog = gnome_db_find_dialog_new (title);
- 	gnome_db_find_dialog_add_fields_from_model (dialog, dm);
- 
- 	g_object_unref (dm);
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index 0f6a2c9ef98d..ae8277b86814 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -1,95 +1,308 @@
 bin/gnome-database-properties
-include/libgnomedb-1.2/libgnomedb/gnome-db-browser.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-combo.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-config.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-connection-properties.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-connection-selector.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-control-widget.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-control.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-data-source-selector.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config-druid.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-editor.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-error-dialog.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-error.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-find-dialog.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-form.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-gray-bar.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-grid.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-i18n.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-icon-list.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-list.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-login-dialog.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-login.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-model.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-provider-selector.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-query-builder.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-report-editor.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-stock.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-table-editor.h
-include/libgnomedb-1.2/libgnomedb/gnome-db-util.h
-include/libgnomedb-1.2/libgnomedb/libgnomedb.h
+bin/gnome-db-browser
+bin/gnome-db-test-parser
+bin/gnome-db-verify-file
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-base.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-basic-form.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-combo.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-condition.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-connection-properties.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-constraint.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-custom-layout.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-entry.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-handler.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-model.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-proxy.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-set.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-source-selector.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-widget.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-database.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dbms-update-viewer.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-decl.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dict.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-config-druid.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-config.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-spec.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-editor.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-entity.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-enums.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-error-dialog.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-error.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-field.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-find-dialog.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-form.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-graphviz.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-gray-bar.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-grid.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-join.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-layout.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-login-dialog.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-login.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-matrix.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-model-wrapper.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-parameter.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-provider-selector.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-qf-agg.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-qf-all.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-qf-field.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-qf-func.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-qf-value.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-qfield.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-query-parsing.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-query-private.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-query.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-ref-base.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-referer.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-renderer.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-report-editor.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-result-set.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-selector-private.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-selector.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-server-aggregate.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-server-data-type.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-server-function.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-server-info.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-server.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-sql-console.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-stock.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-table-editor.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-table-field.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-table.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-target.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-wrapper-field.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-xml-storage.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-cursor.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-db-relations.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-entity.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-field.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-fkconstraint.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-item.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-join.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-query-struct.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-text.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-tip.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-graph-item.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-graph-query.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-graph.h
+include/libgnomedb-%%VERSION%%/libgnomedb/graph/graph-utility.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-data-cell-renderer-boolean.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-data-cell-renderer-combo.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-data-cell-renderer-info.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-data-cell-renderer-textual.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-entry-boolean.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-entry-combo.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-entry-none.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-entry-shell.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-entry-string.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-entry-time.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-entry-wrapper.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-handler-boolean.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-handler-none.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-handler-numerical.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-handler-string.h
+include/libgnomedb-%%VERSION%%/libgnomedb/handlers/gnome-db-handler-time.h
+include/libgnomedb-%%VERSION%%/libgnomedb/libgnomedb.h
+include/libgnomedb-%%VERSION%%/libgnomedb/parser/gnome-db-sql-parser.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-aggregates.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-data-types.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-forms.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-functions.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-graphs.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-onequery.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-onetable.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-onetarget.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-queries.h
+include/libgnomedb-%%VERSION%%/libgnomedb/sel-tables.h
 lib/libglade/2.0/libgnomedb.so
-lib/libgnomedb-2.a
-lib/libgnomedb-2.so
-lib/libgnomedb-2.so.4
-libdata/pkgconfig/libgnomedb.pc
-share/gnome/control-center-2.0/capplets/database-properties.desktop
-share/gnome/gnome-db/ui/db-shell.xml
-share/gnome/gtk-doc/html/libgnomedb/fdl-section1.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section10.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section2.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section3.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section4.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section5.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section6.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section7.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section8.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-section9.html
-share/gnome/gtk-doc/html/libgnomedb/fdl-using.html
-share/gnome/gtk-doc/html/libgnomedb/fdl.html
-share/gnome/gtk-doc/html/libgnomedb/home.png
-share/gnome/gtk-doc/html/libgnomedb/index.html
-share/gnome/gtk-doc/html/libgnomedb/index.sgml
-share/gnome/gtk-doc/html/libgnomedb/left.png
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbBrowser.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbCombo.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionProperties.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionSelector.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControl.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControlWidget.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDataSourceSelector.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfig.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfigDruid.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbEditor.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbError.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbErrorDialog.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbFindDialog.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbForm.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrayBar.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrid.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbIconList.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbList.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLogin.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLoginDialog.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbProviderSelector.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbQueryBuilder.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbReportEditor.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbTableEditor.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbWindow.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-basic.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-bonobo.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-config.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-model.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-stock.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-util.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-introduction.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-libgnomedb.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb-widgets.html
-share/gnome/gtk-doc/html/libgnomedb/libgnomedb.devhelp
-share/gnome/gtk-doc/html/libgnomedb/right.png
-share/gnome/gtk-doc/html/libgnomedb/style.css
-share/gnome/gtk-doc/html/libgnomedb/up.png
+lib/libgnomedb-3.a
+lib/libgnomedb-3.so
+lib/libgnomedb-3.so.4
+lib/libgnomedb/plugins/libgnomedb_handler_cidr.so
+lib/libgnomedb/plugins/libgnomedb_handler_cidr.so.4
+lib/libgnomedb/plugins/libgnomedb_handler_filesel.so
+lib/libgnomedb/plugins/libgnomedb_handler_filesel.so.4
+lib/libgnomedb/plugins/libgnomedb_handler_passmd5.so
+lib/libgnomedb/plugins/libgnomedb_handler_passmd5.so.4
+lib/libgnomedb/plugins/libgnomedb_handler_text.so
+lib/libgnomedb/plugins/libgnomedb_handler_text.so.4
+lib/libgnomedb_graph-3.a
+lib/libgnomedb_graph-3.so
+lib/libgnomedb_graph-3.so.4
+lib/libgnomedb_handlers-3.a
+lib/libgnomedb_handlers-3.so
+lib/libgnomedb_handlers-3.so.4
+lib/libgnomedb_parser-3.a
+lib/libgnomedb_parser-3.so
+lib/libgnomedb_parser-3.so.4
+libdata/pkgconfig/libgnomedb-2.0.pc
+%%DOCSDIR%%/GnomeDbBase.html
+%%DOCSDIR%%/GnomeDbBasicForm.html
+%%DOCSDIR%%/GnomeDbCanvas.html
+%%DOCSDIR%%/GnomeDbCanvasCursor.html
+%%DOCSDIR%%/GnomeDbCanvasDbRelations.html
+%%DOCSDIR%%/GnomeDbCanvasEntity.html
+%%DOCSDIR%%/GnomeDbCanvasField.html
+%%DOCSDIR%%/GnomeDbCanvasItem.html
+%%DOCSDIR%%/GnomeDbCanvasJoin.html
+%%DOCSDIR%%/GnomeDbCanvasQueryStruct.html
+%%DOCSDIR%%/GnomeDbCanvasText.html
+%%DOCSDIR%%/GnomeDbCanvasTip.html
+%%DOCSDIR%%/GnomeDbCombo.html
+%%DOCSDIR%%/GnomeDbCondition.html
+%%DOCSDIR%%/GnomeDbConstraint.html
+%%DOCSDIR%%/GnomeDbDataCellRendererBoolean.html
+%%DOCSDIR%%/GnomeDbDataCellRendererCombo.html
+%%DOCSDIR%%/GnomeDbDataCellRendererInfo.html
+%%DOCSDIR%%/GnomeDbDataCellRendererTextual.html
+%%DOCSDIR%%/GnomeDbDataEntry.html
+%%DOCSDIR%%/GnomeDbDataHandler.html
+%%DOCSDIR%%/GnomeDbDataModel.html
+%%DOCSDIR%%/GnomeDbDataProxy.html
+%%DOCSDIR%%/GnomeDbDataSet.html
+%%DOCSDIR%%/GnomeDbDataWidget.html
+%%DOCSDIR%%/GnomeDbDatabase.html
+%%DOCSDIR%%/GnomeDbDict.html
+%%DOCSDIR%%/GnomeDbEntity.html
+%%DOCSDIR%%/GnomeDbEntryBoolean.html
+%%DOCSDIR%%/GnomeDbEntryCidr.html
+%%DOCSDIR%%/GnomeDbEntryCombo.html
+%%DOCSDIR%%/GnomeDbEntryNone.html
+%%DOCSDIR%%/GnomeDbEntryPassmd5.html
+%%DOCSDIR%%/GnomeDbEntryShell.html
+%%DOCSDIR%%/GnomeDbEntryString.html
+%%DOCSDIR%%/GnomeDbEntryTime.html
+%%DOCSDIR%%/GnomeDbEntryWrapper.html
+%%DOCSDIR%%/GnomeDbField.html
+%%DOCSDIR%%/GnomeDbForm.html
+%%DOCSDIR%%/GnomeDbGraph.html
+%%DOCSDIR%%/GnomeDbGraphItem.html
+%%DOCSDIR%%/GnomeDbGraphQuery.html
+%%DOCSDIR%%/GnomeDbGraphviz.html
+%%DOCSDIR%%/GnomeDbGrid.html
+%%DOCSDIR%%/GnomeDbHandlerBoolean.html
+%%DOCSDIR%%/GnomeDbHandlerCidr.html
+%%DOCSDIR%%/GnomeDbHandlerNone.html
+%%DOCSDIR%%/GnomeDbHandlerNumerical.html
+%%DOCSDIR%%/GnomeDbHandlerPassmd5.html
+%%DOCSDIR%%/GnomeDbHandlerString.html
+%%DOCSDIR%%/GnomeDbHandlerText.html
+%%DOCSDIR%%/GnomeDbHandlerTime.html
+%%DOCSDIR%%/GnomeDbJoin.html
+%%DOCSDIR%%/GnomeDbLayout.html
+%%DOCSDIR%%/GnomeDbMatrix.html
+%%DOCSDIR%%/GnomeDbModelWrapper.html
+%%DOCSDIR%%/GnomeDbParameter.html
+%%DOCSDIR%%/GnomeDbQfAgg.html
+%%DOCSDIR%%/GnomeDbQfAll.html
+%%DOCSDIR%%/GnomeDbQfField.html
+%%DOCSDIR%%/GnomeDbQfFunc.html
+%%DOCSDIR%%/GnomeDbQfValue.html
+%%DOCSDIR%%/GnomeDbQfield.html
+%%DOCSDIR%%/GnomeDbQuery.html
+%%DOCSDIR%%/GnomeDbRefBase.html
+%%DOCSDIR%%/GnomeDbReferer.html
+%%DOCSDIR%%/GnomeDbRenderer.html
+%%DOCSDIR%%/GnomeDbResultSet.html
+%%DOCSDIR%%/GnomeDbSelector.html
+%%DOCSDIR%%/GnomeDbServer.html
+%%DOCSDIR%%/GnomeDbServerAggregate.html
+%%DOCSDIR%%/GnomeDbServerDataType.html
+%%DOCSDIR%%/GnomeDbServerFunction.html
+%%DOCSDIR%%/GnomeDbSqlConsole.html
+%%DOCSDIR%%/GnomeDbTable.html
+%%DOCSDIR%%/GnomeDbTableField.html
+%%DOCSDIR%%/GnomeDbTarget.html
+%%DOCSDIR%%/GnomeDbWrapperField.html
+%%DOCSDIR%%/GnomeDbXmlStorage.html
+%%DOCSDIR%%/GnomeDbmsUpdateViewer.html
+%%DOCSDIR%%/advanced-widgets.html
+%%DOCSDIR%%/ch02.html
+%%DOCSDIR%%/ch04s02.html
+%%DOCSDIR%%/ch04s03.html
+%%DOCSDIR%%/ch05.html
+%%DOCSDIR%%/ch10.html
+%%DOCSDIR%%/ch11.html
+%%DOCSDIR%%/ch12.html
+%%DOCSDIR%%/ch13.html
+%%DOCSDIR%%/ch14.html
+%%DOCSDIR%%/ch15.html
+%%DOCSDIR%%/ch15s02.html
+%%DOCSDIR%%/ch16.html
+%%DOCSDIR%%/ch17.html
+%%DOCSDIR%%/ch21.html
+%%DOCSDIR%%/data-models.html
+%%DOCSDIR%%/databound-widgets.html
+%%DOCSDIR%%/dsn-widgets.html
+%%DOCSDIR%%/error-widgets.html
+%%DOCSDIR%%/example_bad.png
+%%DOCSDIR%%/example_result.png
+%%DOCSDIR%%/fdl-section1.html
+%%DOCSDIR%%/fdl-section10.html
+%%DOCSDIR%%/fdl-section2.html
+%%DOCSDIR%%/fdl-section3.html
+%%DOCSDIR%%/fdl-section4.html
+%%DOCSDIR%%/fdl-section5.html
+%%DOCSDIR%%/fdl-section6.html
+%%DOCSDIR%%/fdl-section7.html
+%%DOCSDIR%%/fdl-section8.html
+%%DOCSDIR%%/fdl-section9.html
+%%DOCSDIR%%/fdl-using.html
+%%DOCSDIR%%/fdl.html
+%%DOCSDIR%%/gnome-db-canvas-db-relations.png
+%%DOCSDIR%%/gnome-db-canvas-query-struct.png
+%%DOCSDIR%%/gnome-db-combo.png
+%%DOCSDIR%%/gnome-db-console.png
+%%DOCSDIR%%/gnome-db-editor.png
+%%DOCSDIR%%/gnome-db-form.png
+%%DOCSDIR%%/gnome-db-grid.png
+%%DOCSDIR%%/gnome-db-selector.png
+%%DOCSDIR%%/gnome-dbms-update-viewer.png
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/ix01.html
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgnomedb-GnomeDbConnectionProperties.html
+%%DOCSDIR%%/libgnomedb-GnomeDbCustomLayout.html
+%%DOCSDIR%%/libgnomedb-GnomeDbDataSourceSelector.html
+%%DOCSDIR%%/libgnomedb-GnomeDbDsnConfig.html
+%%DOCSDIR%%/libgnomedb-GnomeDbDsnConfigDruid.html
+%%DOCSDIR%%/libgnomedb-GnomeDbDsnSpec.html
+%%DOCSDIR%%/libgnomedb-GnomeDbEditor.html
+%%DOCSDIR%%/libgnomedb-GnomeDbError.html
+%%DOCSDIR%%/libgnomedb-GnomeDbErrorDialog.html
+%%DOCSDIR%%/libgnomedb-GnomeDbFindDialog.html
+%%DOCSDIR%%/libgnomedb-GnomeDbGrayBar.html
+%%DOCSDIR%%/libgnomedb-GnomeDbLogin.html
+%%DOCSDIR%%/libgnomedb-GnomeDbLoginDialog.html
+%%DOCSDIR%%/libgnomedb-GnomeDbProviderSelector.html
+%%DOCSDIR%%/libgnomedb-GnomeDbReportEditor.html
+%%DOCSDIR%%/libgnomedb-GnomeDbTableEditor.html
+%%DOCSDIR%%/libgnomedb-List-of-enumerated.html
+%%DOCSDIR%%/libgnomedb-basic.html
+%%DOCSDIR%%/libgnomedb-example.html
+%%DOCSDIR%%/libgnomedb-gnome-db-stock.html
+%%DOCSDIR%%/libgnomedb-introduction.html
+%%DOCSDIR%%/libgnomedb-libgnomedb.html
+%%DOCSDIR%%/libgnomedb.devhelp
+%%DOCSDIR%%/pt01.html
+%%DOCSDIR%%/pt02.html
+%%DOCSDIR%%/pt03.html
+%%DOCSDIR%%/pt04.html
+%%DOCSDIR%%/pt05.html
+%%DOCSDIR%%/query01.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/sampleapp1.png
+%%DOCSDIR%%/sampleapp2.png
+%%DOCSDIR%%/sampleapp3.png
+%%DOCSDIR%%/sampleapp4.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+%%DOCSDIR%%/various.html
+%%DOCSDIR%%/various_int.html
+share/gnome/applications/database-properties.desktop
+share/gnome/libgnomedb/dtd/libgnomedb-dict.dtd
 share/gnome/mime-info/libgnomedb.keys
 share/gnome/mime-info/libgnomedb.mime
 share/gnome/omf/libgnomedb/libgnomedb-C.omf
@@ -126,54 +339,62 @@ share/gnome/pixmaps/libgnomedb/gnome-db-types_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-views_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db.png
-share/locale/az/LC_MESSAGES/libgnomedb-2.mo
-share/locale/be/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ca/LC_MESSAGES/libgnomedb-2.mo
-share/locale/cs/LC_MESSAGES/libgnomedb-2.mo
-share/locale/da/LC_MESSAGES/libgnomedb-2.mo
-share/locale/de/LC_MESSAGES/libgnomedb-2.mo
-share/locale/el/LC_MESSAGES/libgnomedb-2.mo
-share/locale/en_CA/LC_MESSAGES/libgnomedb-2.mo
-share/locale/en_GB/LC_MESSAGES/libgnomedb-2.mo
-share/locale/es/LC_MESSAGES/libgnomedb-2.mo
-share/locale/fa/LC_MESSAGES/libgnomedb-2.mo
-share/locale/fi/LC_MESSAGES/libgnomedb-2.mo
-share/locale/fr/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ga/LC_MESSAGES/libgnomedb-2.mo
-share/locale/gl/LC_MESSAGES/libgnomedb-2.mo
-share/locale/hr/LC_MESSAGES/libgnomedb-2.mo
-share/locale/hu/LC_MESSAGES/libgnomedb-2.mo
-share/locale/it/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ja/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ka/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ko/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ml/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ms/LC_MESSAGES/libgnomedb-2.mo
-share/locale/nb/LC_MESSAGES/libgnomedb-2.mo
-share/locale/nl/LC_MESSAGES/libgnomedb-2.mo
-share/locale/no/LC_MESSAGES/libgnomedb-2.mo
-share/locale/pl/LC_MESSAGES/libgnomedb-2.mo
-share/locale/pt/LC_MESSAGES/libgnomedb-2.mo
-share/locale/pt_BR/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ru/LC_MESSAGES/libgnomedb-2.mo
-share/locale/sk/LC_MESSAGES/libgnomedb-2.mo
-share/locale/sl/LC_MESSAGES/libgnomedb-2.mo
-share/locale/sq/LC_MESSAGES/libgnomedb-2.mo
-share/locale/sr/LC_MESSAGES/libgnomedb-2.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomedb-2.mo
-share/locale/sv/LC_MESSAGES/libgnomedb-2.mo
-share/locale/ta/LC_MESSAGES/libgnomedb-2.mo
-share/locale/tr/LC_MESSAGES/libgnomedb-2.mo
-share/locale/uk/LC_MESSAGES/libgnomedb-2.mo
-share/locale/vi/LC_MESSAGES/libgnomedb-2.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomedb-2.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomedb-2.mo
+share/locale/az/LC_MESSAGES/libgnomedb-3.mo
+share/locale/be/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ca/LC_MESSAGES/libgnomedb-3.mo
+share/locale/cs/LC_MESSAGES/libgnomedb-3.mo
+share/locale/da/LC_MESSAGES/libgnomedb-3.mo
+share/locale/de/LC_MESSAGES/libgnomedb-3.mo
+share/locale/el/LC_MESSAGES/libgnomedb-3.mo
+share/locale/en_CA/LC_MESSAGES/libgnomedb-3.mo
+share/locale/en_GB/LC_MESSAGES/libgnomedb-3.mo
+share/locale/es/LC_MESSAGES/libgnomedb-3.mo
+share/locale/eu/LC_MESSAGES/libgnomedb-3.mo
+share/locale/fa/LC_MESSAGES/libgnomedb-3.mo
+share/locale/fi/LC_MESSAGES/libgnomedb-3.mo
+share/locale/fr/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ga/LC_MESSAGES/libgnomedb-3.mo
+share/locale/gl/LC_MESSAGES/libgnomedb-3.mo
+share/locale/hr/LC_MESSAGES/libgnomedb-3.mo
+share/locale/hu/LC_MESSAGES/libgnomedb-3.mo
+share/locale/it/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ja/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ka/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ko/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ml/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ms/LC_MESSAGES/libgnomedb-3.mo
+share/locale/nb/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ne/LC_MESSAGES/libgnomedb-3.mo
+share/locale/nl/LC_MESSAGES/libgnomedb-3.mo
+share/locale/no/LC_MESSAGES/libgnomedb-3.mo
+share/locale/pl/LC_MESSAGES/libgnomedb-3.mo
+share/locale/pt/LC_MESSAGES/libgnomedb-3.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ru/LC_MESSAGES/libgnomedb-3.mo
+share/locale/rw/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sk/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sl/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sq/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sr/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sr@Latn/LC_MESSAGES/libgnomedb-3.mo
+share/locale/sv/LC_MESSAGES/libgnomedb-3.mo
+share/locale/ta/LC_MESSAGES/libgnomedb-3.mo
+share/locale/tr/LC_MESSAGES/libgnomedb-3.mo
+share/locale/uk/LC_MESSAGES/libgnomedb-3.mo
+share/locale/vi/LC_MESSAGES/libgnomedb-3.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomedb-3.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @dirrm share/gnome/pixmaps/libgnomedb
 @dirrm share/gnome/omf/libgnomedb
-@dirrm share/gnome/gtk-doc/html/libgnomedb
-@unexec rmdir %D/share/gnome/gtk-doc/html 2> /dev/null || true
-@unexec rmdir %D/share/gnome/gtk-doc 2> /dev/null || true
-@dirrm share/gnome/gnome-db/ui
-@dirrm share/gnome/gnome-db
-@dirrm include/libgnomedb-1.2/libgnomedb
-@dirrm include/libgnomedb-1.2
+@dirrm share/gnome/libgnomedb/dtd
+@dirrm share/gnome/libgnomedb
+@dirrm %%DOCSDIR%%
+@dirrm lib/libgnomedb/plugins
+@dirrm lib/libgnomedb
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb/parser
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb/handlers
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb/graph
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb
+@dirrm include/libgnomedb-%%VERSION%%