Add glade2 and GNOME DB 2 to the tree. These are still beta versions of the

software, but it gives GNOME 2 testers some more stuff to play with.

11 files changed, 227 insertions, 306 deletions

diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 0fb8c4353fd..31cd76e74c0 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -1,41 +1,65 @@
-# New ports collection makefile for:	libgda
-# Date created:				8th March 2001
-# Whom:					Ade Lovett <ade@FreeBSD.org>
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libgda
-PORTVERSION=	0.2.96
-PORTREVISION=	1
+PORTNAME=	libgda2
+PORTVERSION=	0.8.191
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/${PORTNAME}
-DIST_SUBDIR=	gnome
+MASTER_SITE_SUBDIR=	pre-gnome2/sources/libgda
+DISTNAME=	libgda-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
-		bonobo.2:${PORTSDIR}/devel/bonobo
+LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
+		xslt.1:${PORTSDIR}/textproc/libxslt
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOMECTRL=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome \
+		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl -lgdbm"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
-PLIST_SUB=	VERSION=${PORTVERSION}
+
+.if defined(WITH_MYSQL)
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
+PLIST_SUB=	MYSQL=""
+.else
+PLIST_SUB=	MYSQL="@comment "
+.endif
+
+.if defined(WITH_POSTGRES)
+LIB_DEPENDS+=	pq.2:${PORTSDIR}/databases/postgres7
+CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
+PLIST_SUB+=	POSTGRES=""
+.else
+PLIST_SUB+=	POSTGRES="@comment "
+.endif
+
+pre-extract:
+.if !defined(WITH_MYSQL)
+	@${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
+.endif
+.if !defined(WITH_POSTGRES)
+	@${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES."
+.endif
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|share/idl|share/gnome/idl|g ; \
+		 s|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo
index 6859d9c1a83..bddbb8f393a 100644
--- a/databases/libgda3/distinfo
+++ b/databases/libgda3/distinfo
@@ -1 +1 @@
-MD5 (gnome/libgda-0.2.96.tar.bz2) = f9975f05dfb2144e5470b792f2319987
+MD5 (gnome2/libgda-0.8.191.tar.bz2) = fc8d35ef19fe7c8b7a4261d5a20800b8
diff --git a/databases/libgda3/files/patch-aa b/databases/libgda3/files/patch-aa
index 8f9cc8fb43a..6892fe3f329 100644
--- a/databases/libgda3/files/patch-aa
+++ b/databases/libgda3/files/patch-aa
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- Makefile.in.orig	Wed Nov 21 10:29:52 2001
-+++ Makefile.in	Wed Nov 21 10:30:19 2001
-@@ -158,7 +158,7 @@
- YACC = @YACC@
- l = @l@
+--- Makefile.in.orig	Sun Jun  2 22:13:42 2002
++++ Makefile.in	Sun Jun  2 22:13:50 2002
+@@ -149,7 +149,7 @@
+ WARN_CFLAGS = @WARN_CFLAGS@
+ cxxflags_set = @cxxflags_set@
  
--SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	testing 	doc
-+SUBDIRS =  	po 	intl 	macros 	idl 	lib 	bindings 	providers 	tools 	doc
+-SUBDIRS =  	po 	idl 	libgda 	providers 	report 	tools 	testing 	data 	doc
++SUBDIRS =  	po 	idl 	libgda 	providers 	report 	tools 	data 	doc
  
  
- EXTRA_DIST =  	COPYING 	libgda.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in
+ EXTRA_DIST =  	COPYING 	libgda.spec.in 	libgda.pc.in 	intltool-extract.in 	intltool-merge.in 	intltool-update.in
diff --git a/databases/libgda3/files/patch-configure b/databases/libgda3/files/patch-configure
index 948849e8922..d744b24f81e 100644
--- a/databases/libgda3/files/patch-configure
+++ b/databases/libgda3/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure	2002/05/01 08:18:05	1.1
-+++ configure	2002/05/01 08:19:03
-@@ -5785,6 +5785,7 @@
+--- configure.orig	Sun Jun  2 22:12:29 2002
++++ configure	Sun Jun  2 22:13:06 2002
+@@ -8429,6 +8429,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
diff --git a/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in b/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in
deleted file mode 100644
index 463f043f902..00000000000
--- a/databases/libgda3/files/patch-doc::C::reference::libgda-client::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/libgda-client/Makefile.in	2002/05/01 08:16:31	1.1
-+++ doc/C/reference/libgda-client/Makefile.in	2002/05/01 08:17:40
-@@ -171,7 +171,7 @@
- LDFLAGS = " 	$(GDA_CLIENT_LIBS) 	$(top_builddir)/lib/gda-common/.libs/libgda-common.so 	$(top_builddir)/lib/gda-client/.libs/libgda-client.a 	"
- 
- 
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/libgda
- 
- DOC_DIR_INSTALL_FILES =  	 libgda-client.args 	 libgda-client.hierarchy 	 libgda-client.signals		 libgda-client.types 	 libgda-client-decl.txt			 libgda-client-sections.txt
- 
diff --git a/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in b/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in
deleted file mode 100644
index 25b6b1ddc2e..00000000000
--- a/databases/libgda3/files/patch-doc::C::reference::libgda-common::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- doc/C/reference/libgda-common/Makefile.in	2002/05/01 08:16:31	1.1
-+++ doc/C/reference/libgda-common/Makefile.in	2002/05/01 08:17:35
-@@ -171,7 +171,7 @@
- LDFLAGS = " 	$(GDA_CLIENT_LIBS) 	$(top_builddir)/lib/gda-common/.libs/libgda-common.a 	"
- 
- 
--DOC_DIR = $(datadir)/html
-+DOC_DIR = $(prefix)/share/doc/libgda
- 
- DOC_DIR_INSTALL_FILES =  	 libgda-common.args 	 libgda-common.hierarchy 	 libgda-common.signals		 libgda-common.types 	 libgda-common-decl.txt			 libgda-common-sections.txt
- 
diff --git a/databases/libgda3/files/patch-doc_C_Makefile.in b/databases/libgda3/files/patch-doc_C_Makefile.in
new file mode 100644
index 00000000000..718a4a1ebe6
--- /dev/null
+++ b/databases/libgda3/files/patch-doc_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/C/Makefile.in.orig	Sun Jun  2 22:17:05 2002
++++ doc/C/Makefile.in	Sun Jun  2 22:17:27 2002
+@@ -152,7 +152,7 @@
+ cxxflags_set = @cxxflags_set@
+ 
+ DOC_MODULE = libgda
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+ 
+ # The top-level SGML file. Change it if you want.
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/databases/libgda3/files/patch-po::Makefile.in.in b/databases/libgda3/files/patch-po::Makefile.in.in
deleted file mode 100644
index 3f425ffda3a..00000000000
--- a/databases/libgda3/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- po/Makefile.in.in.orig	Wed Jun 13 15:55:50 2001
-+++ po/Makefile.in.in	Tue Jun 19 01:14:13 2001
-@@ -25,3 +25,3 @@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/share/locale
- gettextsrcdir = $(datadir)/gettext/po
diff --git a/databases/libgda3/files/patch-tools::gda-buildserver.in b/databases/libgda3/files/patch-tools::gda-buildserver.in
deleted file mode 100644
index fa75e2dcc31..00000000000
--- a/databases/libgda3/files/patch-tools::gda-buildserver.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/gda-buildserver.in	2001/08/06 08:16:41	1.1
-+++ tools/gda-buildserver.in	2001/08/06 08:16:54
-@@ -7,7 +7,7 @@
- CC=@CC@
- shell=@shell@
- 
--TEMPLATES_DIR="${prefix}/share/gda/templates"
-+TEMPLATES_DIR="${prefix}/share/gnome/gda/templates"
- TMPL_C_FILES="gda-srv-command.c gda-srv-connection.c gda-srv-recordset.c main-srv.c"
- TMPL_H_FILES="gda-srv.h"
- 
diff --git a/databases/libgda3/files/patch-tools::templates::Makefile.in b/databases/libgda3/files/patch-tools::templates::Makefile.in
deleted file mode 100644
index 2ca62bfb551..00000000000
--- a/databases/libgda3/files/patch-tools::templates::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/templates/Makefile.in	2001/08/06 08:15:18	1.1
-+++ tools/templates/Makefile.in	2001/08/06 08:15:53
-@@ -148,7 +148,7 @@
- 
- EXTRA_DIST = $(TEMPLATE_FILES)
- 
--gdatemplatesdir = $(prefix)/share/gda/templates
-+gdatemplatesdir = $(prefix)/share/gnome/gda/templates
- gdatemplates_DATA = $(TEMPLATE_FILES)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 60028e4563a..6d25a2f2df1 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -1,212 +1,167 @@
-bin/gda-buildclient
-bin/gda-buildserver
-bin/gda-config
-bin/gda-default-srv
 bin/gda-run
-include/libgda-%%VERSION%%/gda++/gdaBatch.h
-include/libgda-%%VERSION%%/gda++/gdaCommand.h
-include/libgda-%%VERSION%%/gda++/gdaConnection.h
-include/libgda-%%VERSION%%/gda++/gdaError.h
-include/libgda-%%VERSION%%/gda++/gdaErrorList.h
-include/libgda-%%VERSION%%/gda++/gdaField.h
-include/libgda-%%VERSION%%/gda++/gdaHelpers.h
-include/libgda-%%VERSION%%/gda++/gdaIncludes.h
-include/libgda-%%VERSION%%/gda++/gdaRecordset.h
-include/libgda-%%VERSION%%/gda++/gdaValue.h
-include/libgda-%%VERSION%%/gda/GDA.h
-include/libgda-%%VERSION%%/gda/gda-batch.h
-include/libgda-%%VERSION%%/gda/gda-client.h
-include/libgda-%%VERSION%%/gda/gda-command.h
-include/libgda-%%VERSION%%/gda/gda-common-defs.h
-include/libgda-%%VERSION%%/gda/gda-common.h
-include/libgda-%%VERSION%%/gda/gda-config.h
-include/libgda-%%VERSION%%/gda/gda-connection-pool.h
-include/libgda-%%VERSION%%/gda/gda-connection.h
-include/libgda-%%VERSION%%/gda/gda-corba.h
-include/libgda-%%VERSION%%/gda/gda-error.h
-include/libgda-%%VERSION%%/gda/gda-export.h
-include/libgda-%%VERSION%%/gda/gda-field.h
-include/libgda-%%VERSION%%/gda/gda-listener.h
-include/libgda-%%VERSION%%/gda/gda-log.h
-include/libgda-%%VERSION%%/gda/gda-quark-list.h
-include/libgda-%%VERSION%%/gda/gda-recordset.h
-include/libgda-%%VERSION%%/gda/gda-server-command.h
-include/libgda-%%VERSION%%/gda/gda-server-connection.h
-include/libgda-%%VERSION%%/gda/gda-server-error.h
-include/libgda-%%VERSION%%/gda/gda-server-field.h
-include/libgda-%%VERSION%%/gda/gda-server-recordset.h
-include/libgda-%%VERSION%%/gda/gda-server.h
-include/libgda-%%VERSION%%/gda/gda-thread.h
-include/libgda-%%VERSION%%/gda/gda-util.h
-include/libgda-%%VERSION%%/gda/gda-value.h
-include/libgda-%%VERSION%%/gda/gda-xml-atom-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-bin-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-database.h
-include/libgda-%%VERSION%%/gda/gda-xml-document.h
-include/libgda-%%VERSION%%/gda/gda-xml-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-list-item.h
-include/libgda-%%VERSION%%/gda/gda-xml-util.h
-lib/libgda-client.a
-lib/libgda-client.so
-lib/libgda-client.so.0
-lib/libgda-clientcpp.a
-lib/libgda-clientcpp.so
-lib/libgda-clientcpp.so.0
-lib/libgda-common.a
-lib/libgda-common.so
-lib/libgda-common.so.0
-lib/libgda-server.a
-lib/libgda-server.so
-lib/libgda-server.so.0
-share/doc/libgda/libgda-client-decl.txt
-share/doc/libgda/libgda-client-sections.txt
-share/doc/libgda/libgda-client.args
-share/doc/libgda/libgda-client.hierarchy
-share/doc/libgda/libgda-client.signals
-share/doc/libgda/libgda-client.types
-share/doc/libgda/libgda-common-decl.txt
-share/doc/libgda/libgda-common-sections.txt
-share/doc/libgda/libgda-common.args
-share/doc/libgda/libgda-common.hierarchy
-share/doc/libgda/libgda-common.signals
-share/doc/libgda/libgda-common.types
-share/gnome/gda/templates/gda-srv-command.c.tmpl
-share/gnome/gda/templates/gda-srv-connection.c.tmpl
-share/gnome/gda/templates/gda-srv-recordset.c.tmpl
-share/gnome/gda/templates/gda-srv.h.tmpl
-share/gnome/gda/templates/main-srv.c.tmpl
-share/gnome/help/libgda/C/architecture.html
-share/gnome/help/libgda/C/clients-building-corba.html
-share/gnome/help/libgda/C/clients-building.html
-share/gnome/help/libgda/C/clients.html
-share/gnome/help/libgda/C/fdl-section1.html
-share/gnome/help/libgda/C/fdl-section10.html
-share/gnome/help/libgda/C/fdl-section2.html
-share/gnome/help/libgda/C/fdl-section3.html
-share/gnome/help/libgda/C/fdl-section4.html
-share/gnome/help/libgda/C/fdl-section5.html
-share/gnome/help/libgda/C/fdl-section6.html
-share/gnome/help/libgda/C/fdl-section7.html
-share/gnome/help/libgda/C/fdl-section8.html
-share/gnome/help/libgda/C/fdl-section9.html
-share/gnome/help/libgda/C/fdl-using.html
-share/gnome/help/libgda/C/fdl.html
-share/gnome/help/libgda/C/gda-client-batch.html
-share/gnome/help/libgda/C/gda-client-meta.html
-share/gnome/help/libgda/C/gda-client-objects.html
-share/gnome/help/libgda/C/gda-client-types.html
-share/gnome/help/libgda/C/gda-client.html
-share/gnome/help/libgda/C/gda-common-logs.html
-share/gnome/help/libgda/C/gda-common-xml-databases.html
-share/gnome/help/libgda/C/gda-common-xml-queries.html
-share/gnome/help/libgda/C/gda-common.html
-share/gnome/help/libgda/C/index.html
-share/gnome/help/libgda/C/installation-configuring.html
-share/gnome/help/libgda/C/installation-installing.html
-share/gnome/help/libgda/C/installation.html
-share/gnome/help/libgda/C/introduction.html
-share/gnome/help/libgda/C/libgda.html
-share/gnome/help/libgda/C/providers-actual-implementation.html
-share/gnome/help/libgda/C/providers-examples.html
-share/gnome/help/libgda/C/providers-implementation.html
-share/gnome/help/libgda/C/providers.html
-share/gnome/help/libgda/C/reports.html
-share/gnome/help/libgda/C/topic.dat
-share/gnome/help/libgda/es/architecture.html
-share/gnome/help/libgda/es/clients-building-corba.html
-share/gnome/help/libgda/es/clients-building.html
-share/gnome/help/libgda/es/clients.html
-share/gnome/help/libgda/es/gda-client-batch.html
-share/gnome/help/libgda/es/gda-client-meta.html
-share/gnome/help/libgda/es/gda-client-objects.html
-share/gnome/help/libgda/es/gda-client-types.html
-share/gnome/help/libgda/es/gda-client.html
-share/gnome/help/libgda/es/gda-common-logs.html
-share/gnome/help/libgda/es/gda-common-xml-databases.html
-share/gnome/help/libgda/es/gda-common-xml-queries.html
-share/gnome/help/libgda/es/gda-common.html
-share/gnome/help/libgda/es/index.html
-share/gnome/help/libgda/es/installation-configuring.html
-share/gnome/help/libgda/es/installation-installing.html
-share/gnome/help/libgda/es/installation.html
-share/gnome/help/libgda/es/introduction.html
-share/gnome/help/libgda/es/libgda.html
-share/gnome/help/libgda/es/providers-actual-implementation.html
-share/gnome/help/libgda/es/providers-examples.html
-share/gnome/help/libgda/es/providers-implementation.html
-share/gnome/help/libgda/es/providers.html
-share/gnome/help/libgda/es/reports.html
-share/gnome/help/libgda/es/topic.dat
-share/gnome/help/libgda/pt_BR/architecture.html
-share/gnome/help/libgda/pt_BR/c162.html
-share/gnome/help/libgda/pt_BR/c182.html
-share/gnome/help/libgda/pt_BR/c323.html
-share/gnome/help/libgda/pt_BR/c350.html
-share/gnome/help/libgda/pt_BR/clients-building-corba.html
-share/gnome/help/libgda/pt_BR/clients-building.html
-share/gnome/help/libgda/pt_BR/gda-client-batch.html
-share/gnome/help/libgda/pt_BR/gda-client-meta.html
-share/gnome/help/libgda/pt_BR/gda-client-objects.html
-share/gnome/help/libgda/pt_BR/gda-client-types.html
-share/gnome/help/libgda/pt_BR/gda-common-logs.html
-share/gnome/help/libgda/pt_BR/gda-common-xml-databases.html
-share/gnome/help/libgda/pt_BR/gda-common-xml-queries.html
-share/gnome/help/libgda/pt_BR/index.html
-share/gnome/help/libgda/pt_BR/installation-configuring.html
-share/gnome/help/libgda/pt_BR/installation-installing.html
-share/gnome/help/libgda/pt_BR/installation.html
-share/gnome/help/libgda/pt_BR/introduction.html
-share/gnome/help/libgda/pt_BR/libgda.html
-share/gnome/help/libgda/pt_BR/providers-actual-implementation.html
-share/gnome/help/libgda/pt_BR/providers-examples.html
-share/gnome/help/libgda/pt_BR/providers-implementation.html
-share/gnome/help/libgda/pt_BR/topic.dat
-share/gnome/idl/GDA.idl
-share/gnome/idl/GDA_Command.idl
-share/gnome/idl/GDA_Connection.idl
-share/gnome/idl/GDA_Error.idl
-share/gnome/idl/GDA_Field.idl
-share/gnome/idl/GDA_Listener.idl
-share/gnome/idl/GDA_Parameter.idl
-share/gnome/idl/GDA_Recordset.idl
-share/gnome/oaf/GNOME_GDA_Provider_Default.oaf
-share/gnome/omf/libgda/libgda-C.omf
-share/gnome/omf/libgda/libgda-es.omf
-share/gnome/omf/libgda/libgda-pt_BR.omf
-share/locale/ca/LC_MESSAGES/libgda.mo
-share/locale/da/LC_MESSAGES/libgda.mo
-share/locale/de/LC_MESSAGES/libgda.mo
-share/locale/el/LC_MESSAGES/libgda.mo
-share/locale/es/LC_MESSAGES/libgda.mo
-share/locale/fi/LC_MESSAGES/libgda.mo
-share/locale/fr/LC_MESSAGES/libgda.mo
-share/locale/ga/LC_MESSAGES/libgda.mo
-share/locale/gl/LC_MESSAGES/libgda.mo
-share/locale/hu/LC_MESSAGES/libgda.mo
-share/locale/it/LC_MESSAGES/libgda.mo
-share/locale/ja/LC_MESSAGES/libgda.mo
-share/locale/nl/LC_MESSAGES/libgda.mo
-share/locale/nn/LC_MESSAGES/libgda.mo
-share/locale/no/LC_MESSAGES/libgda.mo
-share/locale/pl/LC_MESSAGES/libgda.mo
-share/locale/pt/LC_MESSAGES/libgda.mo
-share/locale/pt_BR/LC_MESSAGES/libgda.mo
-share/locale/ru/LC_MESSAGES/libgda.mo
-share/locale/sk/LC_MESSAGES/libgda.mo
-share/locale/sl/LC_MESSAGES/libgda.mo
-share/locale/sv/LC_MESSAGES/libgda.mo
-share/locale/uk/LC_MESSAGES/libgda.mo
-@dirrm share/gnome/omf/libgda
-@dirrm share/gnome/help/libgda/pt_BR/images
-@dirrm share/gnome/help/libgda/pt_BR
-@dirrm share/gnome/help/libgda/es/images
-@dirrm share/gnome/help/libgda/es
-@dirrm share/gnome/help/libgda/C/images
-@dirrm share/gnome/help/libgda/C
-@dirrm share/gnome/help/libgda
-@dirrm share/gnome/gda/templates
-@dirrm share/gnome/gda
+etc/libgda/config
+include/libgda-report/gda-report-document.h
+include/libgda-report/gda-report.h
+include/libgda/gda-client.h
+include/libgda/gda-command.h
+include/libgda/gda-config.h
+include/libgda/gda-connection.h
+include/libgda/gda-data-model-array.h
+include/libgda/gda-data-model-hash.h
+include/libgda/gda-data-model-list.h
+include/libgda/gda-data-model.h
+include/libgda/gda-error.h
+include/libgda/gda-export.h
+include/libgda/gda-field.h
+include/libgda/gda-log.h
+include/libgda/gda-marshal.h
+include/libgda/gda-parameter.h
+include/libgda/gda-quark-list.h
+include/libgda/gda-row.h
+include/libgda/gda-select.h
+include/libgda/gda-server-provider.h
+include/libgda/gda-table.h
+include/libgda/gda-util.h
+include/libgda/gda-value.h
+include/libgda/gda-xml-connection.h
+include/libgda/gda-xml-database.h
+include/libgda/gda-xml-document.h
+include/libgda/gda-xql-atom.h
+include/libgda/gda-xql-bin.h
+include/libgda/gda-xql-column.h
+include/libgda/gda-xql-const.h
+include/libgda/gda-xql-delete.h
+include/libgda/gda-xql-dml.h
+include/libgda/gda-xql-dual.h
+include/libgda/gda-xql-field.h
+include/libgda/gda-xql-func.h
+include/libgda/gda-xql-insert.h
+include/libgda/gda-xql-item.h
+include/libgda/gda-xql-join.h
+include/libgda/gda-xql-list.h
+include/libgda/gda-xql-query.h
+include/libgda/gda-xql-select.h
+include/libgda/gda-xql-stack.h
+include/libgda/gda-xql-target.h
+include/libgda/gda-xql-update.h
+include/libgda/gda-xql-utils.h
+include/libgda/gda-xql-value.h
+include/libgda/gda-xql-valueref.h
+include/libgda/libgda.h
+lib/libgda-2.a
+lib/libgda-2.so
+lib/libgda-2.so.1
+lib/libgda-report-2.a
+lib/libgda-report-2.so
+lib/libgda-report-2.so.1
+lib/libgda/providers/libgda-default.so
+%%MYSQL%%lib/libgda/providers/libgda-mysql.so
+%%POSTGRES%%lib/libgda/providers/libgda-postgres.so
+libdata/pkgconfig/libgda.pc
+share/doc/libgda/architecture.html
+share/doc/libgda/fdl-section1.html
+share/doc/libgda/fdl-section10.html
+share/doc/libgda/fdl-section2.html
+share/doc/libgda/fdl-section3.html
+share/doc/libgda/fdl-section4.html
+share/doc/libgda/fdl-section5.html
+share/doc/libgda/fdl-section6.html
+share/doc/libgda/fdl-section7.html
+share/doc/libgda/fdl-section8.html
+share/doc/libgda/fdl-section9.html
+share/doc/libgda/fdl-using.html
+share/doc/libgda/fdl.html
+share/doc/libgda/index.html
+share/doc/libgda/index.sgml
+share/doc/libgda/installation-configuring.html
+share/doc/libgda/installation-installing.html
+share/doc/libgda/installation.html
+share/doc/libgda/introduction.html
+share/doc/libgda/libgda-api.html
+share/doc/libgda/libgda-gda-command.html
+share/doc/libgda/libgda-gda-config.html
+share/doc/libgda/libgda-gda-field.html
+share/doc/libgda/libgda-gda-log.html
+share/doc/libgda/libgda-gda-parameter.html
+share/doc/libgda/libgda-gda-quark-list.html
+share/doc/libgda/libgda-gda-row.html
+share/doc/libgda/libgda-gda-util.html
+share/doc/libgda/libgda-gda-value.html
+share/doc/libgda/libgda-gda-xql-utils.html
+share/doc/libgda/libgda-gdabatch.html
+share/doc/libgda/libgda-gdaclient.html
+share/doc/libgda/libgda-gdaconnection.html
+share/doc/libgda/libgda-gdadatamodel.html
+share/doc/libgda/libgda-gdadatamodelarray.html
+share/doc/libgda/libgda-gdadatamodelhash.html
+share/doc/libgda/libgda-gdadatamodellist.html
+share/doc/libgda/libgda-gdaerror.html
+share/doc/libgda/libgda-gdaexport.html
+share/doc/libgda/libgda-gdareportdocument.html
+share/doc/libgda/libgda-gdaselect.html
+share/doc/libgda/libgda-gdaserverprovider.html
+share/doc/libgda/libgda-gdatable.html
+share/doc/libgda/libgda-gdaxmlconnection.html
+share/doc/libgda/libgda-gdaxmldatabase.html
+share/doc/libgda/libgda-gdaxmldocument.html
+share/doc/libgda/libgda-gdaxqlatom.html
+share/doc/libgda/libgda-gdaxqlbin.html
+share/doc/libgda/libgda-gdaxqlcolumn.html
+share/doc/libgda/libgda-gdaxqlconst.html
+share/doc/libgda/libgda-gdaxqldelete.html
+share/doc/libgda/libgda-gdaxqldml.html
+share/doc/libgda/libgda-gdaxqldual.html
+share/doc/libgda/libgda-gdaxqlfield.html
+share/doc/libgda/libgda-gdaxqlfunc.html
+share/doc/libgda/libgda-gdaxqlinsert.html
+share/doc/libgda/libgda-gdaxqlitem.html
+share/doc/libgda/libgda-gdaxqljoin.html
+share/doc/libgda/libgda-gdaxqllist.html
+share/doc/libgda/libgda-gdaxqlquery.html
+share/doc/libgda/libgda-gdaxqlselect.html
+share/doc/libgda/libgda-gdaxqlstack.html
+share/doc/libgda/libgda-gdaxqltarget.html
+share/doc/libgda/libgda-gdaxqlupdate.html
+share/doc/libgda/libgda-gdaxqlvalue.html
+share/doc/libgda/libgda-gdaxqlvalueref.html
+share/doc/libgda/libgda-libgda.html
+share/doc/libgda/libgda-providers.html
+share/doc/libgda/libgda-reports.html
+share/doc/libgda/libgda-xql.html
+share/gnome/idl/libgda/GNOME_Database.idl
+share/gnome/libgda/dtd/gda-report.dtd
+share/locale/az/LC_MESSAGES/libgda-2.mo
+share/locale/ca/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/es/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/hu/LC_MESSAGES/libgda-2.mo
+share/locale/it/LC_MESSAGES/libgda-2.mo
+share/locale/ja/LC_MESSAGES/libgda-2.mo
+share/locale/ms/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/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
+@dirrm share/gnome/libgda/dtd
+@dirrm share/gnome/libgda
 @dirrm share/doc/libgda
-@dirrm include/libgda-%%VERSION%%/gda++
-@dirrm include/libgda-%%VERSION%%/gda
-@dirrm include/libgda-%%VERSION%%
+@dirrm lib/libgda/providers
+@dirrm lib/libgda
+@dirrm include/libgda
+@dirrm include/libgda-report
+@dirrm etc/libgda