9 files changed, 211 insertions, 319 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index cc70480130fd..af506fb31383 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -3,29 +3,31 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda2/Makefile,v 1.32 2005/10/29 04:20:53 mezz Exp $
 #
 
 PORTNAME=	libgda2
-PORTVERSION=	1.9.102
+PORTVERSION=	1.2.3
+PORTEPOCH=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/1.2
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Provides uniform access to different kinds of data sources
 
+BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
+RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack
+USE_GNOME=	gnomeprefix gnomehack glib20 libxslt
+INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--without-bdb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
@@ -37,6 +39,8 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/2$//}
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
+CONFLICTS=	libgda3-[0-9]*
+
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/testing//" \
 		${WRKSRC}/Makefile.in
@@ -71,7 +75,7 @@ WITH_MDB=	yes
 WITH_ODBC=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libsqlite.so.2)
+.if exists(${LOCALBASE}/lib/libsqlite3.so.8)
 WITH_SQLITE=	yes
 .endif
 
@@ -148,7 +152,7 @@ PLIST_SUB+=		ODBC:="@comment "
 .endif
 
 .if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE)
-LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
+LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
 PLIST_SUB+=		SQLITE:=""
 .else
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index cc6c915ac462..d1cf065dc122 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgda-1.9.102.tar.bz2) = 5a97f6a00fe1cbd369be14b70dbee261
-SHA256 (gnome2/libgda-1.9.102.tar.bz2) = 6c01444976afe7b37e9b146ea9311c1da7cc8965d2aa4182e7f452843ecaa702
-SIZE (gnome2/libgda-1.9.102.tar.bz2) = 1935950
+MD5 (gnome2/libgda-1.2.3.tar.bz2) = eb9c31c3102d542de728f5f55674d511
+SHA256 (gnome2/libgda-1.2.3.tar.bz2) = 17add29bb2d7b57da5874f8a28c1a0af4b6f965ad992fef25002b6c33318f303
+SIZE (gnome2/libgda-1.2.3.tar.bz2) = 1075643
diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa
index 283a9d65994a..3b1f992512cd 100644
--- a/databases/libgda2/files/patch-aa
+++ b/databases/libgda2/files/patch-aa
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Thu Oct 13 15:37:21 2005
-+++ Makefile.in	Thu Oct 13 15:37:38 2005
-@@ -345,7 +345,6 @@
+--- Makefile.in.orig	Fri Jan 16 23:06:50 2004
++++ Makefile.in	Fri Jan 16 23:07:18 2004
+@@ -276,7 +276,6 @@
+ 	providers \
  	report \
  	tools \
- 	gda-sharp \
 -	testing \
  	data \
  	doc
diff --git a/databases/libgda2/files/patch-doc::libgda-C.omf.in b/databases/libgda2/files/patch-doc::libgda-C.omf.in
new file mode 100644
index 000000000000..f98b540c5562
--- /dev/null
+++ b/databases/libgda2/files/patch-doc::libgda-C.omf.in
@@ -0,0 +1,11 @@
+--- doc/libgda-C.omf.in.orig	Mon Feb 28 05:30:59 2005
++++ doc/libgda-C.omf.in	Thu Mar  3 14:07:24 2005
+@@ -16,7 +16,7 @@
+     </description>
+     <type>user's guide</type>
+     <format mime="text/html"/>
+-    <identifier url="file:@prefix@/share/gtk-doc/html/libgda/index.html"/>
++    <identifier url="file:@prefix@/share/doc/libgda/index.html"/>
+     <language code="C"/>
+     <relation seriesid="ebe4f574-a94d-11d6-8bc3-bd1f202a92f8"/>
+     <rights type="GNU FDL" license.version="1.1"/>
diff --git a/databases/libgda2/files/patch-libgda-2.0.pc.in b/databases/libgda2/files/patch-libgda.pc.in
index 4e4c405698b4..f9bd3aaed056 100644
--- a/databases/libgda2/files/patch-libgda-2.0.pc.in
+++ b/databases/libgda2/files/patch-libgda.pc.in
@@ -1,5 +1,5 @@
---- libgda-2.0.pc.in.orig   Fri Oct 31 21:59:33 2003
-+++ libgda-2.0.pc.in        Fri Oct 31 22:00:52 2003
+--- libgda.pc.in.orig   Fri Oct 31 21:59:33 2003
++++ libgda.pc.in        Fri Oct 31 22:00:52 2003
 @@ -5,7 +5,7 @@
   
  Name: libgda
diff --git a/databases/libgda2/files/patch-libgda__gda-value.c b/databases/libgda2/files/patch-libgda__gda-value.c
deleted file mode 100644
index 5a57ca4c4bc4..000000000000
--- a/databases/libgda2/files/patch-libgda__gda-value.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgda/gda-value.c.orig	Fri Mar 17 11:08:32 2006
-+++ libgda/gda-value.c	Fri Mar 24 22:31:12 2006
-@@ -1281,8 +1281,8 @@ gda_value_is_null (GdaValue *value)
- gboolean
- gda_value_is_number (GdaValue *value)
- {
--	g_return_val_if_fail (value && G_IS_VALUE(value), FALSE);
- 	GdaValueType type;
-+	g_return_val_if_fail (value && G_IS_VALUE(value), FALSE);
- 	
- 	type = GDA_VALUE_TYPE(value);
- 	switch (type) {
diff --git a/databases/libgda2/files/patch-providers__mysql__gda-mysql-recordset.c b/databases/libgda2/files/patch-providers__mysql__gda-mysql-recordset.c
deleted file mode 100644
index 7d7611235aa0..000000000000
--- a/databases/libgda2/files/patch-providers__mysql__gda-mysql-recordset.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../../work-/libgda-1.9.100/providers/mysql/gda-mysql-recordset.c	Tue Nov  8 14:56:45 2005
-+++ providers/mysql/gda-mysql-recordset.c	Tue Nov  8 14:59:26 2005
-@@ -569,6 +569,7 @@
- 	     colnum != gda_data_model_get_n_columns (GDA_DATA_MODEL(model));
- 	     colnum++)
- 	{
-+		gchar *curval;
- 		attrs = gda_data_model_describe_column (GDA_DATA_MODEL(model), colnum);
- 
- 		mysql_field = mysql_fetch_field_direct (priv_data->mysql_res, colnum);
-@@ -577,7 +578,7 @@
- 		else
- 			column_name = gda_data_model_get_column_title (GDA_DATA_MODEL (model), colnum);
- 
--		gchar *curval = gda_mysql_provider_value_to_sql_string (
-+		curval = gda_mysql_provider_value_to_sql_string (
- 				NULL, 	 
- 				priv_data->cnc, 	 
- 				gda_row_get_value ((GdaRow *) row, colnum) 	 
diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
new file mode 100644
index 000000000000..f75b3284d3f2
--- /dev/null
+++ b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
@@ -0,0 +1,11 @@
+--- providers/mysql/gda-mysql-recordset.c.orig	Wed May 18 03:10:04 2005
++++ providers/mysql/gda-mysql-recordset.c	Tue Jun 14 23:12:25 2005
+@@ -71,7 +71,7 @@ fill_gda_value (GdaValue *gda_value, enu
+ 		if (is_unsigned) {
+ 			gda_value_set_biguint (gda_value, strtoull (value, NULL, 0));
+ 		} else {
+-			gda_value_set_bigint (gda_value, atoll (value));
++			gda_value_set_bigint (gda_value, strtoll (value, NULL, 10));
+ 		}
+ 		break;
+ 	case FIELD_TYPE_SHORT :
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index e3da862626b8..fec09973cd09 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -1,9 +1,7 @@
 bin/gda-config-tool
 bin/gda-report-test
 bin/gda-run
-bin/gda-test-delimiter
 etc/libgda/config
-etc/libgda/sales_test.db
 include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-item-detail.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-item-label.h
@@ -21,198 +19,105 @@ include/libgda-%%VERSION%%/libgda-report/gda-report-valid.h
 include/libgda-%%VERSION%%/libgda-report/gda-report.h
 include/libgda-%%VERSION%%/libgda/gda-blob.h
 include/libgda-%%VERSION%%/libgda/gda-client.h
-include/libgda-%%VERSION%%/libgda/gda-column-index.h
-include/libgda-%%VERSION%%/libgda/gda-column.h
 include/libgda-%%VERSION%%/libgda/gda-command.h
 include/libgda-%%VERSION%%/libgda/gda-config.h
-include/libgda-%%VERSION%%/libgda/gda-connection-event.h
 include/libgda-%%VERSION%%/libgda/gda-connection.h
-include/libgda-%%VERSION%%/libgda/gda-data-access-wrapper.h
-include/libgda-%%VERSION%%/libgda/gda-data-handler.h
 include/libgda-%%VERSION%%/libgda/gda-data-model-array.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-extra.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-filter-sql.h
 include/libgda-%%VERSION%%/libgda/gda-data-model-hash.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-import.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-index.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-iter.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-private.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-query.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-row.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-list.h
 include/libgda-%%VERSION%%/libgda/gda-data-model.h
-include/libgda-%%VERSION%%/libgda/gda-data-proxy.h
-include/libgda-%%VERSION%%/libgda/gda-decl.h
-include/libgda-%%VERSION%%/libgda/gda-dict-aggregate.h
-include/libgda-%%VERSION%%/libgda/gda-dict-constraint.h
-include/libgda-%%VERSION%%/libgda/gda-dict-database.h
-include/libgda-%%VERSION%%/libgda/gda-dict-field.h
-include/libgda-%%VERSION%%/libgda/gda-dict-function.h
-include/libgda-%%VERSION%%/libgda/gda-dict-table.h
-include/libgda-%%VERSION%%/libgda/gda-dict-type.h
-include/libgda-%%VERSION%%/libgda/gda-dict.h
-include/libgda-%%VERSION%%/libgda/gda-entity-field.h
-include/libgda-%%VERSION%%/libgda/gda-entity.h
 include/libgda-%%VERSION%%/libgda/gda-enum-types.h
-include/libgda-%%VERSION%%/libgda/gda-enums.h
-include/libgda-%%VERSION%%/libgda/gda-graphviz.h
+include/libgda-%%VERSION%%/libgda/gda-error.h
+include/libgda-%%VERSION%%/libgda/gda-field.h
 include/libgda-%%VERSION%%/libgda/gda-log.h
 include/libgda-%%VERSION%%/libgda/gda-marshal.h
-include/libgda-%%VERSION%%/libgda/gda-object-ref.h
-include/libgda-%%VERSION%%/libgda/gda-object.h
-include/libgda-%%VERSION%%/libgda/gda-parameter-list.h
 include/libgda-%%VERSION%%/libgda/gda-parameter.h
 include/libgda-%%VERSION%%/libgda/gda-quark-list.h
-include/libgda-%%VERSION%%/libgda/gda-query-condition.h
-include/libgda-%%VERSION%%/libgda/gda-query-field-agg.h
-include/libgda-%%VERSION%%/libgda/gda-query-field-all.h
-include/libgda-%%VERSION%%/libgda/gda-query-field-field.h
-include/libgda-%%VERSION%%/libgda/gda-query-field-func.h
-include/libgda-%%VERSION%%/libgda/gda-query-field-value.h
-include/libgda-%%VERSION%%/libgda/gda-query-field.h
-include/libgda-%%VERSION%%/libgda/gda-query-join.h
-include/libgda-%%VERSION%%/libgda/gda-query-object.h
-include/libgda-%%VERSION%%/libgda/gda-query-parsing.h
-include/libgda-%%VERSION%%/libgda/gda-query-private.h
-include/libgda-%%VERSION%%/libgda/gda-query-target.h
-include/libgda-%%VERSION%%/libgda/gda-query.h
-include/libgda-%%VERSION%%/libgda/gda-referer.h
-include/libgda-%%VERSION%%/libgda/gda-renderer.h
 include/libgda-%%VERSION%%/libgda/gda-row.h
-include/libgda-%%VERSION%%/libgda/gda-server-provider-extra.h
-include/libgda-%%VERSION%%/libgda/gda-server-provider-private.h
+include/libgda-%%VERSION%%/libgda/gda-select.h
 include/libgda-%%VERSION%%/libgda/gda-server-provider.h
-include/libgda-%%VERSION%%/libgda/gda-threader.h
+include/libgda-%%VERSION%%/libgda/gda-table.h
 include/libgda-%%VERSION%%/libgda/gda-transaction.h
 include/libgda-%%VERSION%%/libgda/gda-util.h
 include/libgda-%%VERSION%%/libgda/gda-value.h
-include/libgda-%%VERSION%%/libgda/gda-xml-storage.h
-include/libgda-%%VERSION%%/libgda/graph/gda-graph-item.h
-include/libgda-%%VERSION%%/libgda/graph/gda-graph-query.h
-include/libgda-%%VERSION%%/libgda/graph/gda-graph.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-bin.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-boolean.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-numerical.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-string.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-time.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-type.h
+include/libgda-%%VERSION%%/libgda/gda-xml-connection.h
+include/libgda-%%VERSION%%/libgda/gda-xml-database.h
+include/libgda-%%VERSION%%/libgda/gda-xml-document.h
+include/libgda-%%VERSION%%/libgda/gda-xql-atom.h
+include/libgda-%%VERSION%%/libgda/gda-xql-bin.h
+include/libgda-%%VERSION%%/libgda/gda-xql-column.h
+include/libgda-%%VERSION%%/libgda/gda-xql-const.h
+include/libgda-%%VERSION%%/libgda/gda-xql-delete.h
+include/libgda-%%VERSION%%/libgda/gda-xql-dml.h
+include/libgda-%%VERSION%%/libgda/gda-xql-dual.h
+include/libgda-%%VERSION%%/libgda/gda-xql-field.h
+include/libgda-%%VERSION%%/libgda/gda-xql-func.h
+include/libgda-%%VERSION%%/libgda/gda-xql-insert.h
+include/libgda-%%VERSION%%/libgda/gda-xql-item.h
+include/libgda-%%VERSION%%/libgda/gda-xql-join.h
+include/libgda-%%VERSION%%/libgda/gda-xql-list.h
+include/libgda-%%VERSION%%/libgda/gda-xql-query.h
+include/libgda-%%VERSION%%/libgda/gda-xql-select.h
+include/libgda-%%VERSION%%/libgda/gda-xql-stack.h
+include/libgda-%%VERSION%%/libgda/gda-xql-target.h
+include/libgda-%%VERSION%%/libgda/gda-xql-update.h
+include/libgda-%%VERSION%%/libgda/gda-xql-utils.h
+include/libgda-%%VERSION%%/libgda/gda-xql-value.h
+include/libgda-%%VERSION%%/libgda/gda-xql-valueref.h
 include/libgda-%%VERSION%%/libgda/libgda.h
-include/libgda-%%VERSION%%/libsql/sql_parser.h
-include/libgda-%%VERSION%%/sql-delimiter/gda-sql-delimiter.h
-lib/libgda-3.a
-lib/libgda-3.la
-lib/libgda-3.so
-lib/libgda-3.so.3
-lib/libgda-report-3.a
-lib/libgda-report-3.la
-lib/libgda-report-3.so
-lib/libgda-report-3.so.3
-lib/libgda_graph-3.a
-lib/libgda_graph-3.la
-lib/libgda_graph-3.so
-lib/libgda_graph-3.so.3
-lib/libgda_handlers-3.a
-lib/libgda_handlers-3.la
-lib/libgda_handlers-3.so
-lib/libgda_handlers-3.so.3
-lib/libgda_sql_delimiter-3.a
-lib/libgda_sql_delimiter-3.la
-lib/libgda_sql_delimiter-3.so
-lib/libgda_sql_delimiter-3.so.3
+include/libgda-%%VERSION%%/sql/sql_parser.h
+lib/libgda-2.a
+lib/libgda-2.la
+lib/libgda-2.so
+lib/libgda-2.so.3
+lib/libgda-report-2.a
+lib/libgda-report-2.la
+lib/libgda-report-2.so
+lib/libgda-report-2.so.3
 lib/libgdasql.a
 lib/libgdasql.la
 lib/libgdasql.so
 lib/libgdasql.so.3
-%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.a
-%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.la
-%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.so
-%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.a
-%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.la
-%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.so
-%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.a
-%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.la
-%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.so
-%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.a
-%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.la
-%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.so
-%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.a
-%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.la
-%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.so
-%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.a
-%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.la
-%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.so
-%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.a
-%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.la
-%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.so
-%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.a
-%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.la
-%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.so
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
-libdata/pkgconfig/libgda-2.0.pc
-%%DOCSDIR%%/GdaBlob.html
-%%DOCSDIR%%/GdaClient.html
-%%DOCSDIR%%/GdaColumn.html
-%%DOCSDIR%%/GdaColumnIndex.html
-%%DOCSDIR%%/GdaConnection.html
-%%DOCSDIR%%/GdaConnectionEvent.html
-%%DOCSDIR%%/GdaDataAccessWrapper.html
-%%DOCSDIR%%/GdaDataModel.html
-%%DOCSDIR%%/GdaDataModelArray.html
-%%DOCSDIR%%/GdaDataModelFilterSQL.html
-%%DOCSDIR%%/GdaDataModelHash.html
-%%DOCSDIR%%/GdaDataModelImport.html
-%%DOCSDIR%%/GdaDataModelIter.html
-%%DOCSDIR%%/GdaDataModelQuery.html
-%%DOCSDIR%%/GdaDataModelRow.html
-%%DOCSDIR%%/GdaDataProxy.html
-%%DOCSDIR%%/GdaDict.html
-%%DOCSDIR%%/GdaDictAggregate.html
-%%DOCSDIR%%/GdaDictConstraint.html
-%%DOCSDIR%%/GdaDictDatabase.html
-%%DOCSDIR%%/GdaDictField.html
-%%DOCSDIR%%/GdaDictFunction.html
-%%DOCSDIR%%/GdaDictTable.html
-%%DOCSDIR%%/GdaDictType.html
-%%DOCSDIR%%/GdaEntity.html
-%%DOCSDIR%%/GdaEntityField.html
-%%DOCSDIR%%/GdaGraphviz.html
-%%DOCSDIR%%/GdaObject.html
-%%DOCSDIR%%/GdaObjectRef.html
-%%DOCSDIR%%/GdaParameter.html
-%%DOCSDIR%%/GdaParameterList.html
-%%DOCSDIR%%/GdaQuery.html
-%%DOCSDIR%%/GdaQueryCondition.html
-%%DOCSDIR%%/GdaQueryField.html
-%%DOCSDIR%%/GdaQueryFieldAgg.html
-%%DOCSDIR%%/GdaQueryFieldAll.html
-%%DOCSDIR%%/GdaQueryFieldField.html
-%%DOCSDIR%%/GdaQueryFieldFunc.html
-%%DOCSDIR%%/GdaQueryFieldValue.html
-%%DOCSDIR%%/GdaQueryJoin.html
-%%DOCSDIR%%/GdaQueryObject.html
-%%DOCSDIR%%/GdaQueryTarget.html
-%%DOCSDIR%%/GdaReferer.html
-%%DOCSDIR%%/GdaRenderer.html
-%%DOCSDIR%%/GdaServerProvider.html
-%%DOCSDIR%%/GdaThreader.html
-%%DOCSDIR%%/GdaTransaction.html
-%%DOCSDIR%%/GdaXmlStorage.html
+%%FIREBIRD:%%lib/libgda/providers/libgda-firebird.a
+%%FIREBIRD:%%lib/libgda/providers/libgda-firebird.la
+%%FIREBIRD:%%lib/libgda/providers/libgda-firebird.so
+%%FREETDS:%%lib/libgda/providers/libgda-freetds.a
+%%FREETDS:%%lib/libgda/providers/libgda-freetds.la
+%%FREETDS:%%lib/libgda/providers/libgda-freetds.so
+%%LDAP:%%lib/libgda/providers/libgda-ldap.a
+%%LDAP:%%lib/libgda/providers/libgda-ldap.la
+%%LDAP:%%lib/libgda/providers/libgda-ldap.so
+%%MDB:%%lib/libgda/providers/libgda-mdb.a
+%%MDB:%%lib/libgda/providers/libgda-mdb.la
+%%MDB:%%lib/libgda/providers/libgda-mdb.so
+%%MYSQL:%%lib/libgda/providers/libgda-mysql.a
+%%MYSQL:%%lib/libgda/providers/libgda-mysql.la
+%%MYSQL:%%lib/libgda/providers/libgda-mysql.so
+%%ODBC:%%lib/libgda/providers/libgda-odbc.a
+%%ODBC:%%lib/libgda/providers/libgda-odbc.la
+%%ODBC:%%lib/libgda/providers/libgda-odbc.so
+%%POSTGRES:%%lib/libgda/providers/libgda-postgres.a
+%%POSTGRES:%%lib/libgda/providers/libgda-postgres.la
+%%POSTGRES:%%lib/libgda/providers/libgda-postgres.so
+%%SYBASE:%%lib/libgda/providers/libgda-sybase.a
+%%SYBASE:%%lib/libgda/providers/libgda-sybase.la
+%%SYBASE:%%lib/libgda/providers/libgda-sybase.so
+%%SQLITE:%%lib/libgda/providers/libgda-sqlite.a
+%%SQLITE:%%lib/libgda/providers/libgda-sqlite.la
+%%SQLITE:%%lib/libgda/providers/libgda-sqlite.so
+lib/libgda/providers/libgda-xml.a
+lib/libgda/providers/libgda-xml.la
+lib/libgda/providers/libgda-xml.so
+libdata/pkgconfig/libgda.pc
 %%DOCSDIR%%/architecture.html
-%%DOCSDIR%%/ch04s03.html
-%%DOCSDIR%%/ch05s04.html
-%%DOCSDIR%%/ch05s05.html
-%%DOCSDIR%%/ch05s06.html
 %%DOCSDIR%%/ch06.html
-%%DOCSDIR%%/ch10.html
-%%DOCSDIR%%/ch11.html
-%%DOCSDIR%%/ch13.html
-%%DOCSDIR%%/ch14.html
+%%DOCSDIR%%/ch09s04.html
+%%DOCSDIR%%/ch09s05.html
+%%DOCSDIR%%/ch09s06.html
 %%DOCSDIR%%/compiling.html
-%%DOCSDIR%%/connection.html
+%%DOCSDIR%%/connecting.html
 %%DOCSDIR%%/connections.html
 %%DOCSDIR%%/data-model.html
-%%DOCSDIR%%/data_models.html
 %%DOCSDIR%%/fdl-section1.html
 %%DOCSDIR%%/fdl-section10.html
 %%DOCSDIR%%/fdl-section2.html
@@ -225,23 +130,23 @@ libdata/pkgconfig/libgda-2.0.pc
 %%DOCSDIR%%/fdl-section9.html
 %%DOCSDIR%%/fdl-using.html
 %%DOCSDIR%%/fdl.html
-%%DOCSDIR%%/getting_started.html
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/init_config.html
 %%DOCSDIR%%/installation-configuring.html
 %%DOCSDIR%%/installation-installing.html
 %%DOCSDIR%%/installation.html
 %%DOCSDIR%%/introduction.html
-%%DOCSDIR%%/ix01.html
 %%DOCSDIR%%/left.png
-%%DOCSDIR%%/libgda-Configuration.html
-%%DOCSDIR%%/libgda-GdaCommand.html
-%%DOCSDIR%%/libgda-GdaDataModelIndex.html
-%%DOCSDIR%%/libgda-GdaGraph.html
-%%DOCSDIR%%/libgda-GdaGraphItem.html
-%%DOCSDIR%%/libgda-GdaGraphQuery.html
+%%DOCSDIR%%/libgda.devhelp
+%%DOCSDIR%%/libgda-GdaClient.html
+%%DOCSDIR%%/libgda-GdaConnection.html
+%%DOCSDIR%%/libgda-GdaDataModel.html
+%%DOCSDIR%%/libgda-GdaDataModelArray.html
+%%DOCSDIR%%/libgda-GdaDataModelHash.html
+%%DOCSDIR%%/libgda-GdaDataModelList.html
+%%DOCSDIR%%/libgda-GdaError.html
+%%DOCSDIR%%/libgda-GdaExport.html
 %%DOCSDIR%%/libgda-GdaReportDocument.html
 %%DOCSDIR%%/libgda-GdaReportItem.html
 %%DOCSDIR%%/libgda-GdaReportItemDetail.html
@@ -255,122 +160,114 @@ libdata/pkgconfig/libgda-2.0.pc
 %%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html
 %%DOCSDIR%%/libgda-GdaReportResult.html
 %%DOCSDIR%%/libgda-GdaReportValid.html
-%%DOCSDIR%%/libgda-GdaValue.html
-%%DOCSDIR%%/libgda-Libgda-Initialization.html
-%%DOCSDIR%%/libgda-Logging.html
-%%DOCSDIR%%/libgda-Quark-lists.html
-%%DOCSDIR%%/libgda-Utility-functions.html
+%%DOCSDIR%%/libgda-GdaSelect.html
+%%DOCSDIR%%/libgda-GdaServerProvider.html
+%%DOCSDIR%%/libgda-GdaTable.html
+%%DOCSDIR%%/libgda-GdaTransaction.html
+%%DOCSDIR%%/libgda-GdaXmlConnection.html
+%%DOCSDIR%%/libgda-GdaXmlDatabase.html
+%%DOCSDIR%%/libgda-GdaXmlDocument.html
+%%DOCSDIR%%/libgda-GdaXqlAtom.html
+%%DOCSDIR%%/libgda-GdaXqlBin.html
+%%DOCSDIR%%/libgda-GdaXqlColumn.html
+%%DOCSDIR%%/libgda-GdaXqlConst.html
+%%DOCSDIR%%/libgda-GdaXqlDelete.html
+%%DOCSDIR%%/libgda-GdaXqlDml.html
+%%DOCSDIR%%/libgda-GdaXqlDual.html
+%%DOCSDIR%%/libgda-GdaXqlField.html
+%%DOCSDIR%%/libgda-GdaXqlFunc.html
+%%DOCSDIR%%/libgda-GdaXqlInsert.html
+%%DOCSDIR%%/libgda-GdaXqlItem.html
+%%DOCSDIR%%/libgda-GdaXqlJoin.html
+%%DOCSDIR%%/libgda-GdaXqlList.html
+%%DOCSDIR%%/libgda-GdaXqlQuery.html
+%%DOCSDIR%%/libgda-GdaXqlSelect.html
+%%DOCSDIR%%/libgda-GdaXqlStack.html
+%%DOCSDIR%%/libgda-GdaXqlTarget.html
+%%DOCSDIR%%/libgda-GdaXqlUpdate.html
+%%DOCSDIR%%/libgda-GdaXqlValue.html
+%%DOCSDIR%%/libgda-GdaXqlValueRef.html
+%%DOCSDIR%%/libgda-api.html
+%%DOCSDIR%%/libgda-gda-blob.html
+%%DOCSDIR%%/libgda-gda-command.html
+%%DOCSDIR%%/libgda-gda-config.html
+%%DOCSDIR%%/libgda-gda-field.html
+%%DOCSDIR%%/libgda-gda-log.html
+%%DOCSDIR%%/libgda-gda-parameter.html
+%%DOCSDIR%%/libgda-gda-quark-list.html
 %%DOCSDIR%%/libgda-gda-report-types.html
-%%DOCSDIR%%/libgda-provider-begin-transaction.html
-%%DOCSDIR%%/libgda-provider-change-database.html
+%%DOCSDIR%%/libgda-gda-row.html
+%%DOCSDIR%%/libgda-gda-util.html
+%%DOCSDIR%%/libgda-gda-value.html
+%%DOCSDIR%%/libgda-gda-xql-utils.html
+%%DOCSDIR%%/libgda-libgda.html
 %%DOCSDIR%%/libgda-provider-class.html
-%%DOCSDIR%%/libgda-provider-close-connection.html
-%%DOCSDIR%%/libgda-provider-commit-transaction.html
-%%DOCSDIR%%/libgda-provider-create-database-cnc.html
-%%DOCSDIR%%/libgda-provider-drop-database-cnc.html
-%%DOCSDIR%%/libgda-provider-execute-command.html
-%%DOCSDIR%%/libgda-provider-get-database.html
-%%DOCSDIR%%/libgda-provider-get-schema.html
-%%DOCSDIR%%/libgda-provider-get-specs.html
-%%DOCSDIR%%/libgda-provider-introduction.html
-%%DOCSDIR%%/libgda-provider-perform-action-params.html
 %%DOCSDIR%%/libgda-provider-recordset.html
-%%DOCSDIR%%/libgda-provider-rollback-transaction.html
-%%DOCSDIR%%/libgda-provider-supports.html
-%%DOCSDIR%%/libgda-reports-introduction.html
+%%DOCSDIR%%/libgda-providers.html
 %%DOCSDIR%%/libgda-reports.html
-%%DOCSDIR%%/libgda-tools-author-dict.html
-%%DOCSDIR%%/libgda-tools-diagnose.html
-%%DOCSDIR%%/libgda-tools-inspect-dict.html
-%%DOCSDIR%%/libgda-tools-introduction.html
-%%DOCSDIR%%/libgda-tools-list-config.html
-%%DOCSDIR%%/libgda.devhelp
+%%DOCSDIR%%/libgda-server-provider-details.html
+%%DOCSDIR%%/libgda-xql.html
 %%DOCSDIR%%/main_example.html
 %%DOCSDIR%%/manage-gdavalue.html
 %%DOCSDIR%%/managing-errors.html
 %%DOCSDIR%%/migration-configuration.html
 %%DOCSDIR%%/migration-executing-commands.html
 %%DOCSDIR%%/migration.html
-%%DOCSDIR%%/misc.html
-%%DOCSDIR%%/part_begin.html
-%%DOCSDIR%%/part_libgda-reports.html
-%%DOCSDIR%%/part_libgda_api.html
-%%DOCSDIR%%/part_providers.html
-%%DOCSDIR%%/part_tools.html
+%%DOCSDIR%%/processing-queries.html
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
-%%DOCSDIR%%/transactions.html
 %%DOCSDIR%%/up.png
-share/gnome/libgda/dtd/libgda-array.dtd
-share/gnome/libgda/dtd/libgda-dict.dtd
-%%MYSQL:%%share/gnome/libgda/mysql_specs_create_db.xml
-%%MYSQL:%%share/gnome/libgda/mysql_specs_dsn.xml
-%%POSTGRES:%%share/gnome/libgda/postgres_specs_create_db.xml
-%%POSTGRES:%%share/gnome/libgda/postgres_specs_dsn.xml
-share/gnome/libgda/sqlite_specs_create_db.xml
-share/gnome/libgda/sqlite_specs_dsn.xml
 share/gnome/libgda/xml/gda-report.dtd
 share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd
 share/gnome/libgda/xml/gda-xml-query.xsl
-share/locale/az/LC_MESSAGES/libgda-3.mo
-share/locale/ca/LC_MESSAGES/libgda-3.mo
-share/locale/cs/LC_MESSAGES/libgda-3.mo
-share/locale/da/LC_MESSAGES/libgda-3.mo
-share/locale/de/LC_MESSAGES/libgda-3.mo
-share/locale/el/LC_MESSAGES/libgda-3.mo
-share/locale/en_CA/LC_MESSAGES/libgda-3.mo
-share/locale/en_GB/LC_MESSAGES/libgda-3.mo
-share/locale/es/LC_MESSAGES/libgda-3.mo
-share/locale/eu/LC_MESSAGES/libgda-3.mo
-share/locale/fa/LC_MESSAGES/libgda-3.mo
-share/locale/fi/LC_MESSAGES/libgda-3.mo
-share/locale/fr/LC_MESSAGES/libgda-3.mo
-share/locale/ga/LC_MESSAGES/libgda-3.mo
-share/locale/gl/LC_MESSAGES/libgda-3.mo
-share/locale/hr/LC_MESSAGES/libgda-3.mo
-share/locale/hu/LC_MESSAGES/libgda-3.mo
-share/locale/it/LC_MESSAGES/libgda-3.mo
-share/locale/ja/LC_MESSAGES/libgda-3.mo
-share/locale/ko/LC_MESSAGES/libgda-3.mo
-share/locale/ml/LC_MESSAGES/libgda-3.mo
-share/locale/ms/LC_MESSAGES/libgda-3.mo
-share/locale/nb/LC_MESSAGES/libgda-3.mo
-share/locale/ne/LC_MESSAGES/libgda-3.mo
-share/locale/nl/LC_MESSAGES/libgda-3.mo
-share/locale/no/LC_MESSAGES/libgda-3.mo
-share/locale/pl/LC_MESSAGES/libgda-3.mo
-share/locale/pt/LC_MESSAGES/libgda-3.mo
-share/locale/pt_BR/LC_MESSAGES/libgda-3.mo
-share/locale/ru/LC_MESSAGES/libgda-3.mo
-share/locale/rw/LC_MESSAGES/libgda-3.mo
-share/locale/sk/LC_MESSAGES/libgda-3.mo
-share/locale/sl/LC_MESSAGES/libgda-3.mo
-share/locale/sq/LC_MESSAGES/libgda-3.mo
-share/locale/sr/LC_MESSAGES/libgda-3.mo
-share/locale/sr@Latn/LC_MESSAGES/libgda-3.mo
-share/locale/sv/LC_MESSAGES/libgda-3.mo
-share/locale/tr/LC_MESSAGES/libgda-3.mo
-share/locale/uk/LC_MESSAGES/libgda-3.mo
-share/locale/vi/LC_MESSAGES/libgda-3.mo
-share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
-share/locale/zh_HK/LC_MESSAGES/libgda-3.mo
-share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
+share/gnome/omf/libgda/libgda-C.omf
+share/locale/az/LC_MESSAGES/libgda-2.mo
+share/locale/ca/LC_MESSAGES/libgda-2.mo
+share/locale/cs/LC_MESSAGES/libgda-2.mo
+share/locale/da/LC_MESSAGES/libgda-2.mo
+share/locale/de/LC_MESSAGES/libgda-2.mo
+share/locale/el/LC_MESSAGES/libgda-2.mo
+share/locale/en_CA/LC_MESSAGES/libgda-2.mo
+share/locale/en_GB/LC_MESSAGES/libgda-2.mo
+share/locale/es/LC_MESSAGES/libgda-2.mo
+share/locale/fa/LC_MESSAGES/libgda-2.mo
+share/locale/fi/LC_MESSAGES/libgda-2.mo
+share/locale/fr/LC_MESSAGES/libgda-2.mo
+share/locale/ga/LC_MESSAGES/libgda-2.mo
+share/locale/gl/LC_MESSAGES/libgda-2.mo
+share/locale/hr/LC_MESSAGES/libgda-2.mo
+share/locale/hu/LC_MESSAGES/libgda-2.mo
+share/locale/it/LC_MESSAGES/libgda-2.mo
+share/locale/ja/LC_MESSAGES/libgda-2.mo
+share/locale/ko/LC_MESSAGES/libgda-2.mo
+share/locale/ml/LC_MESSAGES/libgda-2.mo
+share/locale/ms/LC_MESSAGES/libgda-2.mo
+share/locale/nb/LC_MESSAGES/libgda-2.mo
+share/locale/nl/LC_MESSAGES/libgda-2.mo
+share/locale/no/LC_MESSAGES/libgda-2.mo
+share/locale/pl/LC_MESSAGES/libgda-2.mo
+share/locale/pt/LC_MESSAGES/libgda-2.mo
+share/locale/pt_BR/LC_MESSAGES/libgda-2.mo
+share/locale/ru/LC_MESSAGES/libgda-2.mo
+share/locale/sk/LC_MESSAGES/libgda-2.mo
+share/locale/sl/LC_MESSAGES/libgda-2.mo
+share/locale/sq/LC_MESSAGES/libgda-2.mo
+share/locale/sr/LC_MESSAGES/libgda-2.mo
+share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo
+share/locale/sv/LC_MESSAGES/libgda-2.mo
+share/locale/tr/LC_MESSAGES/libgda-2.mo
+share/locale/uk/LC_MESSAGES/libgda-2.mo
+share/locale/vi/LC_MESSAGES/libgda-2.mo
+share/locale/zh_CN/LC_MESSAGES/libgda-2.mo
+share/locale/zh_TW/LC_MESSAGES/libgda-2.mo
+@dirrm share/gnome/omf/libgda
 @dirrm share/gnome/libgda/xml
-@dirrm share/gnome/libgda/dtd
 @dirrm share/gnome/libgda
-@dirrm lib/libgda-%%VERSION%%/providers
-@dirrm lib/libgda-%%VERSION%%
+@dirrm lib/libgda/providers
 @dirrm lib/libgda
-@dirrm include/libgda-%%VERSION%%/sql-delimiter
-@dirrm include/libgda-%%VERSION%%/libsql
+@dirrm include/libgda-%%VERSION%%/sql
 @dirrm include/libgda-%%VERSION%%/libgda-report
-@dirrm include/libgda-%%VERSION%%/libgda/handlers
-@dirrm include/libgda-%%VERSION%%/libgda/graph
 @dirrm include/libgda-%%VERSION%%/libgda
 @dirrm include/libgda-%%VERSION%%
 @dirrm etc/libgda