Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.32/

This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.

This release features commits by avl, marcus, mezz and myself.

The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:

Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX
Bapt <baptiste.daroussin@gmail.com>
jsa@
miwi@
Sergio de Almeida Lenzi <lenzi.sergio@gmail.com>
Maxim Samsonov <xors@mne.ru>
Kris Moore

And pav@ for 2 exp-runs

PR:		ports/152255
		ports/143260
		ports/141033
		ports/149629
		ports/150350
		ports/151523
With hat:	gnome@

4 files changed, 360 insertions, 50 deletions

diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 23a78523a2fd..30868bae3fa3 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/databases/libgda4/Makefile,v 1.4 2010/06/23 21:29:32 kwm Exp $
+#   $MCom: ports/databases/libgda4/Makefile,v 1.14 2010/11/14 20:57:58 kwm Exp $
 #
 
 PORTNAME=	libgda4
-PORTVERSION?=	4.0.9
+PORTVERSION?=	4.2.1
 PORTREVISION?=	0
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
@@ -25,6 +25,7 @@ LIBGDA4_SLAVE?=	no
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
+		gcrypt.17:${PORTSDIR}/security/libgcrypt \
     		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
 RUN_DEPENDS=	${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
@@ -36,11 +37,19 @@ USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ARGS=	--without-sybase \
-		--enable-introspection
+CONFIGURE_ARGS=	--without-oracle \
+		--enable-introspection=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 
+.if ${LIBGDA4_SLAVE}=="no"
+OPTIONS=	UI "Build UI tools" on
+.endif
+
+.if defined(WITH_UI)
+INSTALLS_ICONS=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 #VERSION=	${PORTVERSION:R}
@@ -48,6 +57,16 @@ VERSION=	4.0
 PLIST_SUB=	VERSION=${VERSION}
 
 .if ${LIBGDA4_SLAVE}=="no"
+.if defined(WITH_UI)
+CONFIGURE_ARGS+=--with-ui
+BUILD_DEPENDS+=	xml2po:${PORTSDIR}/textproc/gnome-doc-utils
+USE_GNOME+=	gtk20
+PLIST_SUB+=	UI=""
+.else
+CONFIGURE_ARGS+=--without-ui
+PLIST_SUB+=	UI="@comment "
+.endif
+
 MAN1=		gda-sql.1 gda-sql-4.0.1
 .else
 USE_GNOME+=	libgda4
@@ -74,13 +93,6 @@ CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-postgres
 .endif
 
-.if ${LIBGDA4_SLAVE}=="ldap"
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
 .if ${LIBGDA4_SLAVE}=="firebird"
 LIB_DEPENDS+=		gds.2:${PORTSDIR}/databases/firebird2-client
 CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
@@ -88,13 +100,6 @@ CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-firebird
 .endif
 
-.if ${LIBGDA4_SLAVE}=="freetds"
-LIB_DEPENDS+=		tds.5:${PORTSDIR}/databases/freetds
-CONFIGURE_ARGS+=	--with-tds=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-tds
-.endif
-
 # MDB (MS Access)
 .if ${LIBGDA4_SLAVE}=="mdb"
 LIB_DEPENDS+=		mdbsql.0:${PORTSDIR}/databases/mdbtools
@@ -103,13 +108,6 @@ CONFIGURE_ARGS+=	--with-mdb=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-mdb
 .endif
 
-.if ${LIBGDA4_SLAVE}=="odbc"
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-odbc
-.endif
-
 .if ${LIBGDA4_SLAVE}=="jdbc"
 USE_JAVA=		yes
 JAVA_VENDOR=		bsdjava openjdk
@@ -135,12 +133,21 @@ post-patch:
 		${WRKSRC}/providers/bdb/gda-bdb-test.c
 .if ${LIBGDA4_SLAVE}!="no"
 #. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
-. for d in bdb jdbc mdb mysql postgres
+. for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql
 	@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \
 		${WRKSRC}/providers/${d}/Makefile.in
 . endfor
 .endif
 
+pre-build:
+.if ${LIBGDA4_SLAVE}=="postgresql"
+	cd ${WRKSRC}/providers/reuseable/postgres && ${GMAKE} libgda-postgres.la
+.endif
+
+.if ${LIBGDA4_SLAVE}=="mysql"
+	cd ${WRKSRC}/providers/reuseable/mysql && ${GMAKE} libgda-mysql.la
+.endif
+
 .if ${LIBGDA4_SLAVE}=="no"
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/config \
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index 5ba3eb25adc8..faa37761636c 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/libgda-4.0.9.tar.bz2) = de14cf681c0bcfb3a4076a3ddc1508a2
-SHA256 (gnome2/libgda-4.0.9.tar.bz2) = c3e2958cd711177ec4be0a69cd453ab728526fa38592c5539e7d89d3778e9e56
-SIZE (gnome2/libgda-4.0.9.tar.bz2) = 8227552
+SHA256 (gnome2/libgda-4.2.1.tar.bz2) = d485d24fb19bd95faad196c8ed22b2cb8f9e9275d907f880a3f8f079f6bf40f7
+SIZE (gnome2/libgda-4.2.1.tar.bz2) = 14048095
diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure
index 6e42fcfab8ff..cf6a34b0c4ae 100644
--- a/databases/libgda4/files/patch-configure
+++ b/databases/libgda4/files/patch-configure
@@ -1,14 +1,48 @@
---- configure.orig	2010-06-23 23:07:54.000000000 +0200
-+++ configure	2010-06-23 23:09:57.000000000 +0200
-@@ -18629,9 +18629,9 @@
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
-+       INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\${datadir}|"`
-        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
--       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
-+       INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\${libdir}|"`
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+--- configure.orig	2010-11-14 17:29:29.000000000 +0100
++++ configure	2010-11-14 17:33:39.000000000 +0100
+@@ -19487,9 +19487,9 @@
+             INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+             INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+             INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-            INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++            INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\$(datadir)|"`
+             INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+-            INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++            INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\$(libdir)|"`
+             INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+             INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+             INTROSPECTION_MAKEFILE=$introspection_makefile
+@@ -19586,7 +19586,7 @@
+ 	echo "$LIBCRYPTO_PKG_ERRORS" >&5
+ 
+ 	if test "$enable_crypto" = "yes"; then
+-		as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
++#		as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
+ 	fi
+ 	have_crypto=no
+ 
+@@ -19594,7 +19594,7 @@
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	if test "$enable_crypto" = "yes"; then
+-		as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
++#		as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
+ 	fi
+ 	have_crypto=no
+ 
+@@ -21772,6 +21772,15 @@
+ 	    fi
+ 	    CFLAGS="$save_CFLAGS"
+ 	fi
++    else
++         if false; then
++  MDB_TRUE=
++  MDB_FALSE='#'
++else
++  MDB_TRUE='#'
++  MDB_FALSE=
++fi
++
+     fi
+ 
+      if test "$mdbtools_found" = "yes"; then
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index 90fa9176857d..63dbcf3467d4 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -1,9 +1,11 @@
 bin/gda-list-config-%%VERSION%%
+%%UI%%bin/gda-browser-%%VERSION%%
+%%UI%%bin/gda-control-center-%%VERSION%%
 bin/gda-list-config
-bin/gda-list-server-op-%%VERSION%%
 bin/gda-list-server-op
-bin/gda-sql-%%VERSION%%
+bin/gda-list-server-op-%%VERSION%%
 bin/gda-sql
+bin/gda-sql-%%VERSION%%
 bin/gda-test-connection-%%VERSION%%
 bin/gda_trml2html/__init__.py
 bin/gda_trml2html/trml2html.py
@@ -12,6 +14,7 @@ bin/gda_trml2pdf/__init__.py
 bin/gda_trml2pdf/color.py
 bin/gda_trml2pdf/trml2pdf.py
 bin/gda_trml2pdf/utils.py
+%%UI%%bin/gdaui-demo-%%VERSION%%
 @unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi
 etc/libgda-%%VERSION%%/config.default
 @exec [ -f %B/config ] || cp %B/%f %B/config
@@ -21,6 +24,30 @@ include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-engine.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-rml-document.h
 include/libgda-%%VERSION%%/libgda-report/libgda-report.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-basic-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-cloud.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-combo.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-cell-renderer-util.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-entry.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-filter.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy-info.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-selector.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-store.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-decl.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-easy.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enum-types.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enums.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-grid.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-login.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-plugin.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-provider-selector.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-form.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-grid.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-server-operation.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-tree-store.h
+%%UI%%include/libgda-%%VERSION%%/libgda-ui/libgda-ui.h
 include/libgda-%%VERSION%%/libgda-xslt/libgda-xslt.h
 include/libgda-%%VERSION%%/libgda/gda-attributes-manager.h
 include/libgda-%%VERSION%%/libgda/gda-batch.h
@@ -57,14 +84,24 @@ include/libgda-%%VERSION%%/libgda/gda-meta-store.h
 include/libgda-%%VERSION%%/libgda/gda-meta-struct.h
 include/libgda-%%VERSION%%/libgda/gda-mutex.h
 include/libgda-%%VERSION%%/libgda/gda-quark-list.h
+include/libgda-%%VERSION%%/libgda/gda-repetitive-statement.h
 include/libgda-%%VERSION%%/libgda/gda-row.h
 include/libgda-%%VERSION%%/libgda/gda-server-operation.h
 include/libgda-%%VERSION%%/libgda/gda-server-provider-extra.h
 include/libgda-%%VERSION%%/libgda/gda-server-provider-private.h
 include/libgda-%%VERSION%%/libgda/gda-server-provider.h
 include/libgda-%%VERSION%%/libgda/gda-set.h
+include/libgda-%%VERSION%%/libgda/gda-sql-builder.h
 include/libgda-%%VERSION%%/libgda/gda-statement-extra.h
 include/libgda-%%VERSION%%/libgda/gda-statement.h
+include/libgda-%%VERSION%%/libgda/gda-tree-manager.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-columns.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-label.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-schemas.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-select.h
+include/libgda-%%VERSION%%/libgda/gda-tree-mgr-tables.h
+include/libgda-%%VERSION%%/libgda/gda-tree-node.h
+include/libgda-%%VERSION%%/libgda/gda-tree.h
 include/libgda-%%VERSION%%/libgda/gda-transaction-status-private.h
 include/libgda-%%VERSION%%/libgda/gda-transaction-status.h
 include/libgda-%%VERSION%%/libgda/gda-util.h
@@ -96,6 +133,7 @@ include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-update.h
 include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-util.h
 include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct.h
 include/libgda-%%VERSION%%/libgda/sqlite/gda-sqlite-provider.h
+include/libgda-%%VERSION%%/libgda/thread-wrapper/gda-thread-wrapper.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vconnection-data-model.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vconnection-hub.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-connection.h
@@ -103,31 +141,224 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
 include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
-lib/girepository-1.0/Gda-4.0.typelib
 lib/libgda-%%VERSION%%.a
 lib/libgda-%%VERSION%%.la
 lib/libgda-%%VERSION%%.so
-lib/libgda-%%VERSION%%.so.4
+lib/libgda-%%VERSION%%.so.5
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
+%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
+lib/libgda-%%VERSION%%/providers/libgda-web.a
+lib/libgda-%%VERSION%%/providers/libgda-web.la
+lib/libgda-%%VERSION%%/providers/libgda-web.so
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
 lib/libgda-report-%%VERSION%%.a
 lib/libgda-report-%%VERSION%%.la
 lib/libgda-report-%%VERSION%%.so
-lib/libgda-report-%%VERSION%%.so.4
+lib/libgda-report-%%VERSION%%.so.5
+%%UI%%lib/libgda-ui-%%VERSION%%.a
+%%UI%%lib/libgda-ui-%%VERSION%%.la
+%%UI%%lib/libgda-ui-%%VERSION%%.so
+%%UI%%lib/libgda-ui-%%VERSION%%.so.5
 lib/libgda-xslt-%%VERSION%%.a
 lib/libgda-xslt-%%VERSION%%.la
 lib/libgda-xslt-%%VERSION%%.so
-lib/libgda-xslt-%%VERSION%%.so.4
+lib/libgda-xslt-%%VERSION%%.so.5
 libdata/pkgconfig/libgda-%%VERSION%%.pc
 libdata/pkgconfig/libgda-report-%%VERSION%%.pc
 libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
+%%UI%%libdata/pkgconfig/libgda-ui-%%VERSION%%.pc
+libdata/pkgconfig/libgda-web-%%VERSION%%.pc
 libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
-share/gir-1.0/Gda-4.0.gir
+%%UI%%share/applications/gda-browser-%%VERSION%%.desktop
+%%UI%%share/applications/gda-control-center-%%VERSION%%.desktop
+%%UI%%share/gnome/help/gda-browser/C/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/C/diagram.page
+%%UI%%share/gnome/help/gda-browser/C/features.page
+%%UI%%share/gnome/help/gda-browser/C/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/C/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/C/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/C/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/C/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/C/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/C/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/C/general-ui.page
+%%UI%%share/gnome/help/gda-browser/C/index.page
+%%UI%%share/gnome/help/gda-browser/C/legal.xml
+%%UI%%share/gnome/help/gda-browser/C/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/C/transactions.page
+%%UI%%share/gnome/help/gda-browser/C/variables.page
+%%UI%%share/gnome/help/gda-browser/de/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/de/diagram.page
+%%UI%%share/gnome/help/gda-browser/de/features.page
+%%UI%%share/gnome/help/gda-browser/de/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/de/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/de/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/de/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/de/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/de/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/de/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/de/general-ui.page
+%%UI%%share/gnome/help/gda-browser/de/index.page
+%%UI%%share/gnome/help/gda-browser/de/legal.xml
+%%UI%%share/gnome/help/gda-browser/de/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/de/transactions.page
+%%UI%%share/gnome/help/gda-browser/de/variables.page
+%%UI%%share/gnome/help/gda-browser/es/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/es/diagram.page
+%%UI%%share/gnome/help/gda-browser/es/features.page
+%%UI%%share/gnome/help/gda-browser/es/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/es/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/es/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/es/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/es/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/es/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/es/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/es/general-ui.page
+%%UI%%share/gnome/help/gda-browser/es/index.page
+%%UI%%share/gnome/help/gda-browser/es/legal.xml
+%%UI%%share/gnome/help/gda-browser/es/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/es/transactions.page
+%%UI%%share/gnome/help/gda-browser/es/variables.page
+%%UI%%share/gnome/help/gda-browser/sl/data-manager-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/data-manager-xml-syntax.page
+%%UI%%share/gnome/help/gda-browser/sl/diagram.page
+%%UI%%share/gnome/help/gda-browser/sl/features.page
+%%UI%%share/gnome/help/gda-browser/sl/figures/cnc_open.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-mode.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-persp.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-xmlcompose.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/diagram.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/mainwin.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/query-exec-persp.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/table-insert-data.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-begin.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-commit.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/trans-rollback.png
+%%UI%%share/gnome/help/gda-browser/sl/general-ui.page
+%%UI%%share/gnome/help/gda-browser/sl/index.page
+%%UI%%share/gnome/help/gda-browser/sl/legal.xml
+%%UI%%share/gnome/help/gda-browser/sl/query-execution-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/schema-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/table-insert-data.page
+%%UI%%share/gnome/help/gda-browser/sl/transactions.page
+%%UI%%share/gnome/help/gda-browser/sl/variables.page
+%%UI%%share/icons/hicolor/16x16/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/22x22/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/24x24/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/256x256/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/32x32/apps/gda-control-center.png
+%%UI%%share/icons/hicolor/48x48/apps/gda-control-center.png
+%%UI%%share/libgda-%%VERSION%%/demo/basic_form.c
+%%UI%%share/libgda-%%VERSION%%/demo/cloud.c
+%%UI%%share/libgda-%%VERSION%%/demo/combo.c
+%%UI%%share/libgda-%%VERSION%%/demo/custom_layout.xml
+%%UI%%share/libgda-%%VERSION%%/demo/data_model_dir.c
+%%UI%%share/libgda-%%VERSION%%/demo/ddl_queries.c
+%%UI%%share/libgda-%%VERSION%%/demo/demo_db.db
+%%UI%%share/libgda-%%VERSION%%/demo/form.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_data_layout.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_pict.c
+%%UI%%share/libgda-%%VERSION%%/demo/form_rw.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_data_layout.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_pict.c
+%%UI%%share/libgda-%%VERSION%%/demo/grid_rw.c
+%%UI%%share/libgda-%%VERSION%%/demo/linked_grid_form.c
+%%UI%%share/libgda-%%VERSION%%/demo/linked_model_param.c
+%%UI%%share/libgda-%%VERSION%%/demo/login.c
+%%UI%%share/libgda-%%VERSION%%/demo/provider_sel.c
+%%UI%%share/libgda-%%VERSION%%/demo/tree.c
+%%UI%%share/libgda-%%VERSION%%/dtd/gdaui-layout.dtd
 share/libgda-%%VERSION%%/dtd/libgda-array.dtd
 share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd
 share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-begin.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-commit.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-rollback.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg
+%%UI%%share/libgda-%%VERSION%%/import_encodings.xml
 share/libgda-%%VERSION%%/information_schema.xml
+%%UI%%share/libgda-%%VERSION%%/language-specs/gda-sql.lang
+share/libgda-%%VERSION%%/php/README
+share/libgda-%%VERSION%%/php/gda-clean.php
+share/libgda-%%VERSION%%/php/gda-config.php
+share/libgda-%%VERSION%%/php/gda-exception.php
+share/libgda-%%VERSION%%/php/gda-front.php
+share/libgda-%%VERSION%%/php/gda-meta.php
+share/libgda-%%VERSION%%/php/gda-setup.php
+share/libgda-%%VERSION%%/php/gda-tester.php
+share/libgda-%%VERSION%%/php/gda-utils.php
+share/libgda-%%VERSION%%/php/gda-worker.php
+%%UI%%share/libgda-%%VERSION%%/pixmaps/bin-attachment-16x16.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-bookmark.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fk.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fknn.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-nn.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-pk.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-diagram.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-form.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-grid.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-menu-ind.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected-big.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-query.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-reference.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-schema.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-table.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-control-center-newcnc.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-control-center.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gdaui-generic.png
+%%UI%%share/libgda-%%VERSION%%/server_operation.glade
 share/libgda-%%VERSION%%/sqlite_specs_add_column.xml
 share/libgda-%%VERSION%%/sqlite_specs_create_db.xml
 share/libgda-%%VERSION%%/sqlite_specs_create_index.xml
@@ -139,6 +370,10 @@ share/libgda-%%VERSION%%/sqlite_specs_drop_table.xml
 share/libgda-%%VERSION%%/sqlite_specs_drop_view.xml
 share/libgda-%%VERSION%%/sqlite_specs_dsn.xml
 share/libgda-%%VERSION%%/sqlite_specs_rename_table.xml
+%%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-number.xml
+%%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-string.xml
+share/libgda-%%VERSION%%/web_specs_auth.xml
+share/libgda-%%VERSION%%/web_specs_dsn.xml
 share/libgda-%%VERSION%%/web/cnc.js
 share/libgda-%%VERSION%%/web/gda-print.css
 share/libgda-%%VERSION%%/web/gda.css
@@ -151,6 +386,7 @@ share/libgda-%%VERSION%%/web/mouseirb_2.js
 share/locale/ar/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ca@valencia/LC_MESSAGES/libgda-4.0.mo
 share/locale/cs/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/libgda-%%VERSION%%.mo
@@ -167,6 +403,7 @@ share/locale/ga/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/gl/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/hr/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/libgda-%%VERSION%%.mo
@@ -196,17 +433,48 @@ share/locale/vi/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/libgda-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
+%%UI%%share/pixmaps/gda-browser-%%VERSION%%.png
 @dirrm share/libgda-%%VERSION%%/web
+%%UI%%@dirrm share/libgda-%%VERSION%%/ui
+%%UI%%@dirrm share/libgda-%%VERSION%%/pixmaps
+@dirrm share/libgda-%%VERSION%%/php
+%%UI%%@dirrm share/libgda-%%VERSION%%/language-specs
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16/actions
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor
+%%UI%%@dirrm share/libgda-%%VERSION%%/icons
+%%UI%%@dirrm share/gnome/help/gda-browser/sl/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/sl
+%%UI%%@dirrm share/gnome/help/gda-browser/es/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/es
+%%UI%%@dirrm share/gnome/help/gda-browser/de/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/de
+%%UI%%@dirrm share/gnome/help/gda-browser/C/figures
+%%UI%%@dirrm share/gnome/help/gda-browser/C
+%%UI%%@dirrm share/gnome/help/gda-browser
 @dirrm share/libgda-%%VERSION%%/dtd
+%%UI%%@dirrm share/libgda-%%VERSION%%/demo
 @dirrm share/libgda-%%VERSION%%/
+%%UI%%@dirrmtry share/applications
 @dirrm lib/libgda-%%VERSION%%/providers
+%%UI%%@dirrm lib/libgda-%%VERSION%%/plugins
 @dirrm lib/libgda-%%VERSION%%
 @dirrm include/libgda-%%VERSION%%/libgda/virtual
+@dirrm include/libgda-%%VERSION%%/libgda/thread-wrapper
 @dirrm include/libgda-%%VERSION%%/libgda/sqlite
 @dirrm include/libgda-%%VERSION%%/libgda/sql-parser
 @dirrm include/libgda-%%VERSION%%/libgda/providers-support
 @dirrm include/libgda-%%VERSION%%/libgda/handlers
 @dirrm include/libgda-%%VERSION%%/libgda-xslt
+%%UI%%@dirrm include/libgda-%%VERSION%%/libgda-ui
 @dirrm include/libgda-%%VERSION%%/libgda-report
 @dirrm include/libgda-%%VERSION%%/libgda
 @dirrm include/libgda-%%VERSION%%
@@ -221,3 +489,5 @@ share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia