Update to 1.9.100.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4947 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 74 insertions, 231 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 76554fa23..ec4859f34 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda2/Makefile,v 1.29 2005/08/08 06:54:49 marcus Exp $
+#   $MCom: ports/databases/libgda2/Makefile,v 1.30 2005/08/10 19:22:13 marcus Exp $
 #
 
 PORTNAME=	libgda2
-PORTVERSION=	1.3.91
+PORTVERSION=	1.9.100
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
@@ -17,15 +17,12 @@ 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
-INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
@@ -38,6 +35,8 @@ MAN5=		gda-config.5
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/2$//}
 
+PLIST_SUB=	VERSION=${PORTVERSION:R}
+
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/testing//" \
 		${WRKSRC}/Makefile.in
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index 1084110b5..996ce4c69 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgda-1.3.91.tar.bz2) = 6e397127c9a3d8f229fb0c1a0c0572f2
-SIZE (gnome2/libgda-1.3.91.tar.bz2) = 1460073
+MD5 (gnome2/libgda-1.9.100.tar.bz2) = c943610dc4c9c286bb14d6ce3c6e549b
+SIZE (gnome2/libgda-1.9.100.tar.bz2) = 1464595
diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa
index 3b1f99251..283a9d659 100644
--- a/databases/libgda2/files/patch-aa
+++ b/databases/libgda2/files/patch-aa
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Fri Jan 16 23:06:50 2004
-+++ Makefile.in	Fri Jan 16 23:07:18 2004
-@@ -276,7 +276,6 @@
- 	providers \
+--- Makefile.in.orig	Thu Oct 13 15:37:21 2005
++++ Makefile.in	Thu Oct 13 15:37:38 2005
+@@ -345,7 +345,6 @@
  	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
deleted file mode 100644
index f98b540c5..000000000
--- a/databases/libgda2/files/patch-doc::libgda-C.omf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_gda-value.c b/databases/libgda2/files/patch-libgda_gda-value.c
deleted file mode 100644
index ed8d35cc0..000000000
--- a/databases/libgda2/files/patch-libgda_gda-value.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- libgda/gda-value.c.orig	Sun Aug  7 16:57:51 2005
-+++ libgda/gda-value.c	Sun Aug  7 16:58:40 2005
-@@ -549,10 +549,11 @@ gpointer 
- gda_geometricpoint_copy (gpointer boxed)
- {
- 	GdaGeometricPoint *val = (GdaGeometricPoint*) boxed;
-+	GdaGeometricPoint *copy;
- 	
- 	g_return_val_if_fail( val, NULL);
- 		
--	GdaGeometricPoint *copy = g_new0(GdaGeometricPoint, 1);
-+	copy = g_new0(GdaGeometricPoint, 1);
- 	copy->x = val->x;
- 	copy->y = val->y;
- 
-@@ -1260,8 +1261,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) {
-@@ -1406,9 +1407,9 @@ gda_value_get_binary (GdaValue *value, g
- void
- gda_value_set_binary (GdaValue *value, gconstpointer val, glong size)
- {
-+	GdaBinary *binary;
- 	g_return_if_fail (value);
- 	
--	GdaBinary *binary;
- 	
- 	binary = g_new0 (GdaBinary, 1);
- 
-@@ -1443,10 +1444,10 @@ gda_value_get_blob (GdaValue *value)
- void
- gda_value_set_blob (GdaValue *value, const GdaBlob *val)
- {
-+	GdaBlob *blob;
- 	g_return_if_fail (value);
- 	g_return_if_fail (GDA_VALUE_IS_BLOB(val));
- 	
--	GdaBlob *blob;
- 	l_g_value_unset (value);
- 	g_value_init (value, G_VALUE_TYPE_BLOB);
- 	
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 3f0d58148..000000000
--- a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- providers/mysql/gda-mysql-recordset.c.orig	Tue Jun  7 16:23:21 2005
-+++ providers/mysql/gda-mysql-recordset.c	Tue Jun  7 16:24:00 2005
-@@ -615,6 +615,7 @@ gda_mysql_recordset_remove_row (GdaDataM
- 	     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);
-@@ -623,7 +624,7 @@ gda_mysql_recordset_remove_row (GdaDataM
- 		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) 	 
-@@ -900,11 +901,11 @@ gda_mysql_recordset_new (GdaConnection *
- 		gda_data_model_array_set_n_columns (GDA_DATA_MODEL_ARRAY (model),
- 					    model->priv->ncolumns);
- 		for (i = 0; i < model->priv->ncolumns; i++) {
-+			gboolean multi_table = FALSE;
- 			gda_data_model_set_column_title (GDA_DATA_MODEL (model),
- 							 i, mysql_fields[i].name);
- 
- 			/* determine table name */
--			gboolean multi_table = FALSE;
- 			if (strcmp(mysql_fields[i].table, mysql_fields[0].table) != 0)
- 				multi_table = TRUE;
- 
diff --git a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c b/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c
deleted file mode 100644
index f226df162..000000000
--- a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- providers/sqlite/gda-sqlite-provider.c.orig	Tue Jun  7 16:22:30 2005
-+++ providers/sqlite/gda-sqlite-provider.c	Tue Jun  7 16:21:28 2005
-@@ -1087,8 +1087,8 @@ get_types (GdaConnection *cnc, GdaParame
- 					Column *column = &(table->aCol[j]);
- 					
- 					if (column->zType && !g_hash_table_lookup (names, column->zType)) {
--						g_hash_table_insert (names, g_strdup (column->zType), GINT_TO_POINTER (1));
- 						GdaValueType type;
-+						g_hash_table_insert (names, g_strdup (column->zType), GINT_TO_POINTER (1));
- 						switch (column->affinity) {
- 						case SQLITE_AFF_INTEGER:
- 							type = GDA_VALUE_TYPE_INTEGER;
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index ea6b0cb4c..c992b3b6a 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -3,75 +3,50 @@ bin/gda-report-test
 bin/gda-run
 etc/libgda/config
 etc/libgda/sales_test.db
-include/libgda-1.3/libgda-report/gda-report-document.h
-include/libgda-1.3/libgda-report/gda-report-item-detail.h
-include/libgda-1.3/libgda-report/gda-report-item-label.h
-include/libgda-1.3/libgda-report/gda-report-item-pagefooter.h
-include/libgda-1.3/libgda-report/gda-report-item-pageheader.h
-include/libgda-1.3/libgda-report/gda-report-item-repfield.h
-include/libgda-1.3/libgda-report/gda-report-item-report.h
-include/libgda-1.3/libgda-report/gda-report-item-reportfooter.h
-include/libgda-1.3/libgda-report/gda-report-item-reportheader.h
-include/libgda-1.3/libgda-report/gda-report-item-sqlquery.h
-include/libgda-1.3/libgda-report/gda-report-item.h
-include/libgda-1.3/libgda-report/gda-report-result.h
-include/libgda-1.3/libgda-report/gda-report-types.h
-include/libgda-1.3/libgda-report/gda-report-valid.h
-include/libgda-1.3/libgda-report/gda-report.h
-include/libgda-1.3/libgda/gda-blob.h
-include/libgda-1.3/libgda/gda-client.h
-include/libgda-1.3/libgda/gda-column-index.h
-include/libgda-1.3/libgda/gda-column.h
-include/libgda-1.3/libgda/gda-command.h
-include/libgda-1.3/libgda/gda-config.h
-include/libgda-1.3/libgda/gda-connection-event.h
-include/libgda-1.3/libgda/gda-connection.h
-include/libgda-1.3/libgda/gda-data-model-array.h
-include/libgda-1.3/libgda/gda-data-model-base.h
-include/libgda-1.3/libgda/gda-data-model-hash.h
-include/libgda-1.3/libgda/gda-data-model-index.h
-include/libgda-1.3/libgda/gda-data-model-list.h
-include/libgda-1.3/libgda/gda-data-model.h
-include/libgda-1.3/libgda/gda-enum-types.h
-include/libgda-1.3/libgda/gda-log.h
-include/libgda-1.3/libgda/gda-marshal.h
-include/libgda-1.3/libgda/gda-parameter.h
-include/libgda-1.3/libgda/gda-quark-list.h
-include/libgda-1.3/libgda/gda-row.h
-include/libgda-1.3/libgda/gda-select.h
-include/libgda-1.3/libgda/gda-server-provider.h
-include/libgda-1.3/libgda/gda-table.h
-include/libgda-1.3/libgda/gda-threader.h
-include/libgda-1.3/libgda/gda-transaction.h
-include/libgda-1.3/libgda/gda-util.h
-include/libgda-1.3/libgda/gda-value.h
-include/libgda-1.3/libgda/gda-xml-connection.h
-include/libgda-1.3/libgda/gda-xml-database.h
-include/libgda-1.3/libgda/gda-xml-document.h
-include/libgda-1.3/libgda/gda-xql-atom.h
-include/libgda-1.3/libgda/gda-xql-bin.h
-include/libgda-1.3/libgda/gda-xql-column.h
-include/libgda-1.3/libgda/gda-xql-const.h
-include/libgda-1.3/libgda/gda-xql-delete.h
-include/libgda-1.3/libgda/gda-xql-dml.h
-include/libgda-1.3/libgda/gda-xql-dual.h
-include/libgda-1.3/libgda/gda-xql-field.h
-include/libgda-1.3/libgda/gda-xql-func.h
-include/libgda-1.3/libgda/gda-xql-insert.h
-include/libgda-1.3/libgda/gda-xql-item.h
-include/libgda-1.3/libgda/gda-xql-join.h
-include/libgda-1.3/libgda/gda-xql-list.h
-include/libgda-1.3/libgda/gda-xql-query.h
-include/libgda-1.3/libgda/gda-xql-select.h
-include/libgda-1.3/libgda/gda-xql-stack.h
-include/libgda-1.3/libgda/gda-xql-target.h
-include/libgda-1.3/libgda/gda-xql-update.h
-include/libgda-1.3/libgda/gda-xql-utils.h
-include/libgda-1.3/libgda/gda-xql-value.h
-include/libgda-1.3/libgda/gda-xql-valueref.h
-include/libgda-1.3/libgda/global-decl.h
-include/libgda-1.3/libgda/libgda.h
-include/libgda-1.3/sql/sql_parser.h
+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
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-pagefooter.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-pageheader.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-repfield.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-report.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-reportfooter.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-reportheader.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item-sqlquery.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-item.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-result.h
+include/libgda-%%VERSION%%/libgda-report/gda-report-types.h
+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-model-array.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-base.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-hash.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-index.h
+include/libgda-%%VERSION%%/libgda/gda-data-model-list.h
+include/libgda-%%VERSION%%/libgda/gda-data-model.h
+include/libgda-%%VERSION%%/libgda/gda-enum-types.h
+include/libgda-%%VERSION%%/libgda/gda-log.h
+include/libgda-%%VERSION%%/libgda/gda-marshal.h
+include/libgda-%%VERSION%%/libgda/gda-parameter.h
+include/libgda-%%VERSION%%/libgda/gda-quark-list.h
+include/libgda-%%VERSION%%/libgda/gda-row.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-transaction.h
+include/libgda-%%VERSION%%/libgda/gda-util.h
+include/libgda-%%VERSION%%/libgda/gda-value.h
+include/libgda-%%VERSION%%/libgda/global-decl.h
+include/libgda-%%VERSION%%/libgda/libgda.h
+include/libgda-%%VERSION%%/sql/sql_parser.h
 lib/libgda-3.a
 lib/libgda-3.so
 lib/libgda-3.so.3
@@ -81,16 +56,15 @@ lib/libgda-report-3.so.3
 lib/libgdasql.a
 lib/libgdasql.so
 lib/libgdasql.so.3
-%%FIREBIRD:%%lib/libgda-1.3/providers/libgda-firebird.so
-%%FREETDS:%%lib/libgda-1.3/providers/libgda-freetds.so
-%%LDAP:%%lib/libgda-1.3/providers/libgda-ldap.so
-%%MDB:%%lib/libgda-1.3/providers/libgda-mdb.so
-%%MYSQL:%%lib/libgda-1.3/providers/libgda-mysql.so
-%%ODBC:%%lib/libgda-1.3/providers/libgda-odbc.so
-%%POSTGRES:%%lib/libgda-1.3/providers/libgda-postgres.so
-%%SYBASE:%%lib/libgda-1.3/providers/libgda-sybase.so
-lib/libgda-1.3/providers/libgda-sqlite.so
-lib/libgda-1.3/providers/libgda-xml.so
+%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.so
+%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.so
+%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.so
+%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.so
+%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.so
+%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.so
+%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.so
+%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.so
+lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
 libdata/pkgconfig/libgda-2.0.pc
 %%DOCSDIR%%/GdaClient.html
 %%DOCSDIR%%/GdaColumn.html
@@ -99,9 +73,9 @@ libdata/pkgconfig/libgda-2.0.pc
 %%DOCSDIR%%/GdaDataModelArray.html
 %%DOCSDIR%%/GdaDataModelHash.html
 %%DOCSDIR%%/GdaDataModelList.html
+%%DOCSDIR%%/GdaRow.html
 %%DOCSDIR%%/GdaSelect.html
 %%DOCSDIR%%/GdaServerProvider.html
-%%DOCSDIR%%/GdaTable.html
 %%DOCSDIR%%/GdaTransaction.html
 %%DOCSDIR%%/architecture.html
 %%DOCSDIR%%/ch06.html
@@ -131,13 +105,13 @@ libdata/pkgconfig/libgda-2.0.pc
 %%DOCSDIR%%/installation-installing.html
 %%DOCSDIR%%/installation.html
 %%DOCSDIR%%/introduction.html
+%%DOCSDIR%%/ix01.html
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/libgda-BLOBs.html
 %%DOCSDIR%%/libgda-Commands.html
 %%DOCSDIR%%/libgda-GdaConnection.html
+%%DOCSDIR%%/libgda-GdaConnectionEvent.html
 %%DOCSDIR%%/libgda-GdaDataModelIndex.html
-%%DOCSDIR%%/libgda-GdaError.html
-%%DOCSDIR%%/libgda-GdaExport.html
 %%DOCSDIR%%/libgda-GdaParameter.html
 %%DOCSDIR%%/libgda-GdaReportDocument.html
 %%DOCSDIR%%/libgda-GdaReportItem.html
@@ -152,31 +126,7 @@ libdata/pkgconfig/libgda-2.0.pc
 %%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html
 %%DOCSDIR%%/libgda-GdaReportResult.html
 %%DOCSDIR%%/libgda-GdaReportValid.html
-%%DOCSDIR%%/libgda-GdaRow.html
 %%DOCSDIR%%/libgda-GdaValue.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-Libgda-Initialization.html
 %%DOCSDIR%%/libgda-Logging.html
 %%DOCSDIR%%/libgda-Quark-lists.html
@@ -185,13 +135,10 @@ libdata/pkgconfig/libgda-2.0.pc
 %%DOCSDIR%%/libgda-gda-config.html
 %%DOCSDIR%%/libgda-gda-data-model-base.html
 %%DOCSDIR%%/libgda-gda-report-types.html
-%%DOCSDIR%%/libgda-gda-xql-utils.html
 %%DOCSDIR%%/libgda-provider-class.html
 %%DOCSDIR%%/libgda-provider-recordset.html
 %%DOCSDIR%%/libgda-providers.html
 %%DOCSDIR%%/libgda-reports.html
-%%DOCSDIR%%/libgda-server-provider-details.html
-%%DOCSDIR%%/libgda-xql.html
 %%DOCSDIR%%/libgda.devhelp
 %%DOCSDIR%%/main_example.html
 %%DOCSDIR%%/manage-gdavalue.html
@@ -213,7 +160,6 @@ 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/gnome/omf/libgda/libgda-C.omf
 share/locale/az/LC_MESSAGES/libgda-3.mo
 share/locale/ca/LC_MESSAGES/libgda-3.mo
 share/locale/cs/LC_MESSAGES/libgda-3.mo
@@ -223,6 +169,7 @@ 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
@@ -236,6 +183,7 @@ 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
@@ -256,13 +204,12 @@ share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
 share/locale/zh_TW/LC_MESSAGES/libgda-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/omf/libgda
 @dirrm share/gnome/libgda/xml
 @dirrm share/gnome/libgda
-@dirrm lib/libgda-1.3/providers
-@dirrm lib/libgda-1.3
-@dirrm include/libgda-1.3/sql
-@dirrm include/libgda-1.3/libgda-report
-@dirrm include/libgda-1.3/libgda
-@dirrm include/libgda-1.3
+@dirrm lib/libgda-%%VERSION%%/providers
+@dirrm lib/libgda-%%VERSION%%
+@dirrm include/libgda-%%VERSION%%/sql
+@dirrm include/libgda-%%VERSION%%/libgda-report
+@dirrm include/libgda-%%VERSION%%/libgda
+@dirrm include/libgda-%%VERSION%%
 @dirrm etc/libgda