13 files changed, 325 insertions, 308 deletions

diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 7ddff0cd2436..55189220c189 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -3,31 +3,29 @@
 # Whom:                 Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgdamm/Makefile,v 1.5 2006/07/25 18:12:02 mezz Exp $
+#   $MCom: ports/databases/libgdamm/Makefile,v 1.9 2008/03/17 19:53:24 kwm Exp $
 #
 
 PORTNAME=	libgdamm
-PORTVERSION=	1.3.7
-PORTREVISION=	2
+PORTVERSION=	3.0.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
-COMMENT=	C++ wrapper for libgda2 library
+COMMENT=	C++ wrapper for libgda3 library
 
 LIB_DEPENDS=	glibmm-2.4:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GCC=	3.4+
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack libgda2
+USE_GNOME=	gnomehack libgda3
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
 post-patch:
diff --git a/databases/libgdamm/distinfo b/databases/libgdamm/distinfo
index 8bc4770edf31..d38323559509 100644
--- a/databases/libgdamm/distinfo
+++ b/databases/libgdamm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgdamm-1.3.7.tar.bz2) = 1aa0e35753ec87ec55822b2e59005892
-SHA256 (gnome2/libgdamm-1.3.7.tar.bz2) = ca1f08523a8f376dbbd94d3faa3ad19ebf413c7b1714e90e32481cd2d87121d9
-SIZE (gnome2/libgdamm-1.3.7.tar.bz2) = 283205
+MD5 (gnome2/libgdamm-3.0.0.tar.bz2) = f1ab9b9fad1ab02eb3e580911ce5e702
+SHA256 (gnome2/libgdamm-3.0.0.tar.bz2) = 32896ebbe9c98714c0e2fdbc6a6a4e6567f065319e4c726cedfc8ef7acd769f5
+SIZE (gnome2/libgdamm-3.0.0.tar.bz2) = 2500553
diff --git a/databases/libgdamm/pkg-descr b/databases/libgdamm/pkg-descr
index ad001fe746d8..07ef04f5bef5 100644
--- a/databases/libgdamm/pkg-descr
+++ b/databases/libgdamm/pkg-descr
@@ -1,3 +1,3 @@
-This is a set of thin C++ wrappers for libgda v2 library.
+This is a set of thin C++ wrappers for libgda v3 library.
 
 WWW: http://www.gtkmm.org/
diff --git a/databases/libgdamm/pkg-plist b/databases/libgdamm/pkg-plist
index b3c11cd45a9a..e2fbd839b7eb 100644
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@@ -1,47 +1,136 @@
-include/libgdamm-2.0/libgdamm.h
-include/libgdamm-2.0/libgdamm/client.h
-include/libgdamm-2.0/libgdamm/command.h
-include/libgdamm-2.0/libgdamm/config.h
-include/libgdamm-2.0/libgdamm/connection.h
-include/libgdamm-2.0/libgdamm/datamodel.h
-include/libgdamm-2.0/libgdamm/datasourceinfo.h
-include/libgdamm-2.0/libgdamm/error.h
-include/libgdamm-2.0/libgdamm/fieldattributes.h
-include/libgdamm-2.0/libgdamm/init.h
-include/libgdamm-2.0/libgdamm/parameter.h
-include/libgdamm-2.0/libgdamm/parameterlist.h
-include/libgdamm-2.0/libgdamm/private/client_p.h
-include/libgdamm-2.0/libgdamm/private/command_p.h
-include/libgdamm-2.0/libgdamm/private/connection_p.h
-include/libgdamm-2.0/libgdamm/private/datamodel_p.h
-include/libgdamm-2.0/libgdamm/private/datasourceinfo_p.h
-include/libgdamm-2.0/libgdamm/private/error_p.h
-include/libgdamm-2.0/libgdamm/private/fieldattributes_p.h
-include/libgdamm-2.0/libgdamm/private/parameter_p.h
-include/libgdamm-2.0/libgdamm/private/parameterlist_p.h
-include/libgdamm-2.0/libgdamm/private/providerinfo_p.h
-include/libgdamm-2.0/libgdamm/private/row_p.h
-include/libgdamm-2.0/libgdamm/private/serverprovider_p.h
-include/libgdamm-2.0/libgdamm/private/transaction_p.h
-include/libgdamm-2.0/libgdamm/private/value_p.h
-include/libgdamm-2.0/libgdamm/providerinfo.h
-include/libgdamm-2.0/libgdamm/row.h
-include/libgdamm-2.0/libgdamm/serverprovider.h
-include/libgdamm-2.0/libgdamm/transaction.h
-include/libgdamm-2.0/libgdamm/value.h
-include/libgdamm-2.0/libgdamm/wrap_init.h
-lib/libgdamm-1.3.a
-lib/libgdamm-1.3.la
-lib/libgdamm-1.3.so
-lib/libgdamm-1.3.so.8
-lib/libgdamm-2.0/include/libgdammconfig.h
-lib/libgdamm-2.0/proc/m4/convert.m4
-lib/libgdamm-2.0/proc/m4/convert_libgdamm.m4
-libdata/pkgconfig/libgdamm-2.0.pc
-@dirrm lib/libgdamm-2.0/include
-@dirrm lib/libgdamm-2.0/proc/m4
-@dirrm lib/libgdamm-2.0/proc
-@dirrm lib/libgdamm-2.0
-@dirrm include/libgdamm-2.0/libgdamm/private
-@dirrm include/libgdamm-2.0/libgdamm
-@dirrm include/libgdamm-2.0
+include/libgdamm-3.0/libgdamm.h
+include/libgdamm-3.0/libgdamm/blob.h
+include/libgdamm-3.0/libgdamm/blobop.h
+include/libgdamm-3.0/libgdamm/client.h
+include/libgdamm-3.0/libgdamm/column.h
+include/libgdamm-3.0/libgdamm/columnindex.h
+include/libgdamm-3.0/libgdamm/command.h
+include/libgdamm-3.0/libgdamm/config.h
+include/libgdamm-3.0/libgdamm/connection.h
+include/libgdamm-3.0/libgdamm/connectionevent.h
+include/libgdamm-3.0/libgdamm/datahandler.h
+include/libgdamm-3.0/libgdamm/datamodel.h
+include/libgdamm-3.0/libgdamm/datamodelarray.h
+include/libgdamm-3.0/libgdamm/datamodelfiltersql.h
+include/libgdamm-3.0/libgdamm/datamodelhash.h
+include/libgdamm-3.0/libgdamm/datamodelimport.h
+include/libgdamm-3.0/libgdamm/datamodelindex.h
+include/libgdamm-3.0/libgdamm/datamodeliter.h
+include/libgdamm-3.0/libgdamm/datamodelquery.h
+include/libgdamm-3.0/libgdamm/datamodelrow.h
+include/libgdamm-3.0/libgdamm/dataproxy.h
+include/libgdamm-3.0/libgdamm/datasourceinfo.h
+include/libgdamm-3.0/libgdamm/dict.h
+include/libgdamm-3.0/libgdamm/dictaggregate.h
+include/libgdamm-3.0/libgdamm/dictconstraint.h
+include/libgdamm-3.0/libgdamm/dictdatabase.h
+include/libgdamm-3.0/libgdamm/dictfield.h
+include/libgdamm-3.0/libgdamm/dictfunction.h
+include/libgdamm-3.0/libgdamm/dicttable.h
+include/libgdamm-3.0/libgdamm/dicttype.h
+include/libgdamm-3.0/libgdamm/entity.h
+include/libgdamm-3.0/libgdamm/entityfield.h
+include/libgdamm-3.0/libgdamm/handlerbin.h
+include/libgdamm-3.0/libgdamm/handlerboolean.h
+include/libgdamm-3.0/libgdamm/handlernumerical.h
+include/libgdamm-3.0/libgdamm/handlerstring.h
+include/libgdamm-3.0/libgdamm/handlertime.h
+include/libgdamm-3.0/libgdamm/handlertype.h
+include/libgdamm-3.0/libgdamm/init.h
+include/libgdamm-3.0/libgdamm/object.h
+include/libgdamm-3.0/libgdamm/parameter.h
+include/libgdamm-3.0/libgdamm/parameterlist.h
+include/libgdamm-3.0/libgdamm/private/blob_p.h
+include/libgdamm-3.0/libgdamm/private/blobop_p.h
+include/libgdamm-3.0/libgdamm/private/client_p.h
+include/libgdamm-3.0/libgdamm/private/column_p.h
+include/libgdamm-3.0/libgdamm/private/columnindex_p.h
+include/libgdamm-3.0/libgdamm/private/command_p.h
+include/libgdamm-3.0/libgdamm/private/connection_p.h
+include/libgdamm-3.0/libgdamm/private/connectionevent_p.h
+include/libgdamm-3.0/libgdamm/private/datahandler_p.h
+include/libgdamm-3.0/libgdamm/private/datamodel_p.h
+include/libgdamm-3.0/libgdamm/private/datamodelarray_p.h
+include/libgdamm-3.0/libgdamm/private/datamodelfiltersql_p.h
+include/libgdamm-3.0/libgdamm/private/datamodelhash_p.h
+include/libgdamm-3.0/libgdamm/private/datamodelimport_p.h
+include/libgdamm-3.0/libgdamm/private/datamodelindex_p.h
+include/libgdamm-3.0/libgdamm/private/datamodeliter_p.h
+include/libgdamm-3.0/libgdamm/private/datamodelquery_p.h
+include/libgdamm-3.0/libgdamm/private/datamodelrow_p.h
+include/libgdamm-3.0/libgdamm/private/dataproxy_p.h
+include/libgdamm-3.0/libgdamm/private/datasourceinfo_p.h
+include/libgdamm-3.0/libgdamm/private/dict_p.h
+include/libgdamm-3.0/libgdamm/private/dictaggregate_p.h
+include/libgdamm-3.0/libgdamm/private/dictconstraint_p.h
+include/libgdamm-3.0/libgdamm/private/dictdatabase_p.h
+include/libgdamm-3.0/libgdamm/private/dictfield_p.h
+include/libgdamm-3.0/libgdamm/private/dictfunction_p.h
+include/libgdamm-3.0/libgdamm/private/dicttable_p.h
+include/libgdamm-3.0/libgdamm/private/dicttype_p.h
+include/libgdamm-3.0/libgdamm/private/entity_p.h
+include/libgdamm-3.0/libgdamm/private/entityfield_p.h
+include/libgdamm-3.0/libgdamm/private/handlerbin_p.h
+include/libgdamm-3.0/libgdamm/private/handlerboolean_p.h
+include/libgdamm-3.0/libgdamm/private/handlernumerical_p.h
+include/libgdamm-3.0/libgdamm/private/handlerstring_p.h
+include/libgdamm-3.0/libgdamm/private/handlertime_p.h
+include/libgdamm-3.0/libgdamm/private/handlertype_p.h
+include/libgdamm-3.0/libgdamm/private/object_p.h
+include/libgdamm-3.0/libgdamm/private/parameter_p.h
+include/libgdamm-3.0/libgdamm/private/parameterlist_p.h
+include/libgdamm-3.0/libgdamm/private/providerinfo_p.h
+include/libgdamm-3.0/libgdamm/private/query_p.h
+include/libgdamm-3.0/libgdamm/private/querycondition_p.h
+include/libgdamm-3.0/libgdamm/private/queryfield_p.h
+include/libgdamm-3.0/libgdamm/private/queryfieldagg_p.h
+include/libgdamm-3.0/libgdamm/private/queryfieldall_p.h
+include/libgdamm-3.0/libgdamm/private/queryfieldfield_p.h
+include/libgdamm-3.0/libgdamm/private/queryfieldfunc_p.h
+include/libgdamm-3.0/libgdamm/private/queryfieldvalue_p.h
+include/libgdamm-3.0/libgdamm/private/queryjoin_p.h
+include/libgdamm-3.0/libgdamm/private/queryobject_p.h
+include/libgdamm-3.0/libgdamm/private/querytarget_p.h
+include/libgdamm-3.0/libgdamm/private/referer_p.h
+include/libgdamm-3.0/libgdamm/private/renderer_p.h
+include/libgdamm-3.0/libgdamm/private/row_p.h
+include/libgdamm-3.0/libgdamm/private/serveroperation_p.h
+include/libgdamm-3.0/libgdamm/private/serverprovider_p.h
+include/libgdamm-3.0/libgdamm/private/transactionstatus_p.h
+include/libgdamm-3.0/libgdamm/private/xmlstorage_p.h
+include/libgdamm-3.0/libgdamm/providerinfo.h
+include/libgdamm-3.0/libgdamm/query.h
+include/libgdamm-3.0/libgdamm/querycondition.h
+include/libgdamm-3.0/libgdamm/queryfield.h
+include/libgdamm-3.0/libgdamm/queryfieldagg.h
+include/libgdamm-3.0/libgdamm/queryfieldall.h
+include/libgdamm-3.0/libgdamm/queryfieldfield.h
+include/libgdamm-3.0/libgdamm/queryfieldfunc.h
+include/libgdamm-3.0/libgdamm/queryfieldvalue.h
+include/libgdamm-3.0/libgdamm/queryjoin.h
+include/libgdamm-3.0/libgdamm/queryobject.h
+include/libgdamm-3.0/libgdamm/querytarget.h
+include/libgdamm-3.0/libgdamm/referer.h
+include/libgdamm-3.0/libgdamm/renderer.h
+include/libgdamm-3.0/libgdamm/row.h
+include/libgdamm-3.0/libgdamm/serveroperation.h
+include/libgdamm-3.0/libgdamm/serverprovider.h
+include/libgdamm-3.0/libgdamm/transactionstatus.h
+include/libgdamm-3.0/libgdamm/value.h
+include/libgdamm-3.0/libgdamm/wrap_init.h
+include/libgdamm-3.0/libgdamm/xmlstorage.h
+lib/libgdamm-3.0.a
+lib/libgdamm-3.0.la
+lib/libgdamm-3.0.so
+lib/libgdamm-3.0.so.10
+lib/libgdamm-3.0/include/libgdammconfig.h
+lib/libgdamm-3.0/proc/m4/convert.m4
+lib/libgdamm-3.0/proc/m4/convert_libgdamm.m4
+libdata/pkgconfig/libgdamm-3.0.pc
+@dirrm lib/libgdamm-3.0/proc/m4
+@dirrm lib/libgdamm-3.0/proc
+@dirrm lib/libgdamm-3.0/include
+@dirrm lib/libgdamm-3.0
+@dirrm include/libgdamm-3.0/libgdamm/private
+@dirrm include/libgdamm-3.0/libgdamm
+@dirrm include/libgdamm-3.0
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 56a7786ccb0d..ad1a19be073e 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgnomedb/Makefile,v 1.30 2007/07/23 19:49:12 mezz Exp $
+#   $MCom: ports/databases/libgnomedb/Makefile,v 1.32 2008/02/05 13:09:24 kwm Exp $
 #
 
 PORTNAME=	libgnomedb
-PORTVERSION=	1.9.102
-PORTREVISION?=	5
+PORTVERSION=	3.0.0
+PORTREVISION?=	0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -33,10 +33,9 @@ USE_LDCONFIG=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	libgnomedb.schemas
+GCONF_SCHEMAS=	libgnomedb-3.0.schemas
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
 .include <bsd.port.mk>
-
 .endif
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index 4df10c152be8..72b2935276c9 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomedb-1.9.102.tar.bz2) = a29e5b845d6bd94fdd70c4c0c0abcbf1
-SHA256 (gnome2/libgnomedb-1.9.102.tar.bz2) = becd12ec688daded8c08d94ae6268d169716872d0f405bf3ce96eb846b078bd8
-SIZE (gnome2/libgnomedb-1.9.102.tar.bz2) = 1821841
+MD5 (gnome2/libgnomedb-3.0.0.tar.bz2) = 2a41abd14b123f0c9d4f540b9c07bedd
+SHA256 (gnome2/libgnomedb-3.0.0.tar.bz2) = 51f79da270c3d45fae71df98f4de0f8a6512bff399b0026eaaa60c0d2424f3ef
+SIZE (gnome2/libgnomedb-3.0.0.tar.bz2) = 4192722
diff --git a/databases/libgnomedb/files/patch-Makefile.in b/databases/libgnomedb/files/patch-Makefile.in
deleted file mode 100644
index d0890cf04d75..000000000000
--- a/databases/libgnomedb/files/patch-Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	Thu Oct 13 15:59:10 2005
-+++ Makefile.in	Thu Oct 13 16:00:04 2005
-@@ -290,15 +290,13 @@
- @BUILD_GNOMEDB_SHARP_TRUE@GNOME_DIRECTORY = gnomedb-sharp
- @BUILD_WITH_GNOME_FALSE@GNOME_DIRECTORY = 
- @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center
--@ENABLE_GTK_DOC_FALSE@DOC_DIRECTORY = 
--@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc
-+DOC_DIRECTORY = doc
- SUBDIRS = \
- 	po \
- 	libgnomedb \
- 	$(LIBGLADE_DIRECTORY) \
- 	$(GNOME_DIRECTORY) \
- 	$(GNOMEDB_SHARP_DIRECTORY) \
--	testing \
- 	extra \
- 	examples \
- 	$(DOC_DIRECTORY) \
diff --git a/databases/libgnomedb/files/patch-doc::libgnomedb-C.omf.in b/databases/libgnomedb/files/patch-doc::libgnomedb-C.omf.in
deleted file mode 100644
index e51ccfd6b655..000000000000
--- a/databases/libgnomedb/files/patch-doc::libgnomedb-C.omf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/libgnomedb-C.omf.in.orig	Thu Oct  2 12:15:36 2003
-+++ doc/libgnomedb-C.omf.in	Thu Oct  2 12:15:52 2003
-@@ -15,7 +15,7 @@
-     </description>
-     <type>user's guide</type>
-     <format mime="text/html"/>
--    <identifier url="file:/@prefix@/share/gtk-doc/html/libgnomedb/index.html"/>
-+    <identifier url="file:/@prefix@/share/doc/libgnomedb/index.html"/>
-     <language code="C"/>
-     <relation seriesid="0c3a2de2-d4ca-11d6-8994-cd3caececda4"/>
-     <rights type="GNU FDL" license.version="1.1"/>
diff --git a/databases/libgnomedb/files/patch-doc_C_Makefile.in b/databases/libgnomedb/files/patch-doc_C_Makefile.in
deleted file mode 100644
index 448aad65622a..000000000000
--- a/databases/libgnomedb/files/patch-doc_C_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/C/Makefile.in.orig	Tue Jun  7 16:57:58 2005
-+++ doc/C/Makefile.in	Tue Jun  7 16:58:27 2005
-@@ -119,7 +119,7 @@
- HAVE_GTKSOURCEVIEW_TRUE = @HAVE_GTKSOURCEVIEW_TRUE@
- HAVE_LIBGLADE_FALSE = @HAVE_LIBGLADE_FALSE@
- HAVE_LIBGLADE_TRUE = @HAVE_LIBGLADE_TRUE@
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
deleted file mode 100644
index 44a4771037f8..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
+++ /dev/null
@@ -1,20 +0,0 @@
-
-$FreeBSD$
-
---- libgnomedb/gnome-db-find-dialog.c.orig
-+++ libgnomedb/gnome-db-find-dialog.c
-@@ -220,12 +220,14 @@
- 	
- 	g_object_ref (dm);
- 	
-+	{
- 	GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title);
- 	gnome_db_find_dialog_add_fields_from_model (dialog, dm);
- 
- 	g_object_unref (dm);
- 
- 	return dialog;
-+	}
- }
- 
- /**
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
deleted file mode 100644
index 607e5da74d26..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-sql-console.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-$FreeBSD$
-
---- libgnomedb/gnome-db-sql-console.c.orig
-+++ libgnomedb/gnome-db-sql-console.c
-@@ -596,8 +596,8 @@
- 
- 	/* help */
- 	if (!cmde_ok && !strcmp (pcmde, "?")) {
--		cmde_ok = TRUE;
- 		GString *string;
-+		cmde_ok = TRUE;
- 
- 		string = g_string_new (_("SQL statements:\n"
- 					 "  they can span several lines, and are executed\n"
diff --git a/databases/libgnomedb/files/patch-po::Makefile.in.in b/databases/libgnomedb/files/patch-po::Makefile.in.in
deleted file mode 100644
index 2e0e6e70ee75..000000000000
--- a/databases/libgnomedb/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- po/Makefile.in.in.orig	Thu Jul 22 11:06:21 2004
-+++ po/Makefile.in.in	Thu Jul 22 11:06:58 2004
-@@ -35,6 +35,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- CC = @CC@
- GENCAT = @GENCAT@
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index b7cc503799c6..ce0fd710e66c 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -1,200 +1,217 @@
-bin/gnome-database-properties
+bin/gnome-database-properties-%%VERSION%%
 bin/gnome-db-browser
+bin/gnome-db-demo
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/extra_marshal.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-dbms-update-viewer.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-editor.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-error-dialog.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-error.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-extra-enum-types.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-gray-bar.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-report-editor.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-selector-private.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-selector.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/gnome-db-sql-console.h
+include/libgnomedb-%%VERSION%%/libgnomedb-extra/libgnomedb-extra.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-cursor.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-db-relations.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-entity.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-field.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-fkconstraint.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-item.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-join.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-query-struct.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-text.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas-tip.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/gnome-db-canvas.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/graph-utility.h
+include/libgnomedb-%%VERSION%%/libgnomedb-graph/libgnomedb-graph.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-data-cell-renderer-boolean.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-data-cell-renderer-combo.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-data-cell-renderer-info.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-data-cell-renderer-textual.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-boolean.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-combo.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-common-time.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-date.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-none.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-shell.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-string.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-time.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-timestamp.h
 include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-entry-wrapper.h
+include/libgnomedb-%%VERSION%%/libgnomedb/data-entries/gnome-db-format-entry.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-basic-form.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-combo.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-connection-properties.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-entry.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-import.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-source-selector.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-store.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-widget-info.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-data-widget.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dbms-update-viewer.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-decl.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-config-druid.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-config.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-assistant.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-editor.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-dsn-spec.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-editor.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-enum-types.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-enums.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-error-dialog.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-error.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-find-dialog.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-form.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-gray-bar.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-grid.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-i18n.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-login-dialog.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-login.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-plugin.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-provider-selector.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-raw-form.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-raw-grid.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-report-editor.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-selector-private.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-selector.h
-include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-sql-console.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-server-operation.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-stock.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-tools.h
+include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-transaction-status.h
 include/libgnomedb-%%VERSION%%/libgnomedb/gnome-db-util.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-cursor.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-db-relations.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-entity.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-field.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-fkconstraint.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-item.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-join.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-query-struct.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-text.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas-tip.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/gnome-db-canvas.h
-include/libgnomedb-%%VERSION%%/libgnomedb/graph/graph-utility.h
-include/libgnomedb-%%VERSION%%/libgnomedb/libgnomedb-private.h
 include/libgnomedb-%%VERSION%%/libgnomedb/libgnomedb.h
 include/libgnomedb-%%VERSION%%/libgnomedb/marshal.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-aggregates.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-data-types.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-functions.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-graphs.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-onequery.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-onetable.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-onetarget.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-queries.h
-include/libgnomedb-%%VERSION%%/libgnomedb/sel-tables.h
-include/libgnomedb-%%VERSION%%/libgnomedb/utility.h
-lib/libglade/2.0/libgnomedb.a
-lib/libglade/2.0/libgnomedb.la
-lib/libglade/2.0/libgnomedb.so
-lib/libgnomedb-3.a
-lib/libgnomedb-3.la
-lib/libgnomedb-3.so
-lib/libgnomedb-3.so.4
-lib/libgnomedb/plugins/libgnomedb_entry_cidr.a
-lib/libgnomedb/plugins/libgnomedb_entry_cidr.la
-lib/libgnomedb/plugins/libgnomedb_entry_cidr.so
-lib/libgnomedb/plugins/libgnomedb_entry_cidr.so.4
-lib/libgnomedb/plugins/libgnomedb_entry_filesel.a
-lib/libgnomedb/plugins/libgnomedb_entry_filesel.la
-lib/libgnomedb/plugins/libgnomedb_entry_filesel.so
-lib/libgnomedb/plugins/libgnomedb_entry_filesel.so.4
-lib/libgnomedb/plugins/libgnomedb_entry_passmd5.a
-lib/libgnomedb/plugins/libgnomedb_entry_passmd5.la
-lib/libgnomedb/plugins/libgnomedb_entry_passmd5.so
-lib/libgnomedb/plugins/libgnomedb_entry_passmd5.so.4
-lib/libgnomedb/plugins/libgnomedb_entry_text.a
-lib/libgnomedb/plugins/libgnomedb_entry_text.la
-lib/libgnomedb/plugins/libgnomedb_entry_text.so
-lib/libgnomedb/plugins/libgnomedb_entry_text.so.4
-lib/libgnomedb_graph-3.a
-lib/libgnomedb_graph-3.la
-lib/libgnomedb_graph-3.so
-lib/libgnomedb_graph-3.so.4
-lib/libgnomedb_handlers-3.a
-lib/libgnomedb_handlers-3.la
-lib/libgnomedb_handlers-3.so
-lib/libgnomedb_handlers-3.so.4
-libdata/pkgconfig/libgnomedb-2.0.pc
-share/applications/database-properties.desktop
-share/mime-info/libgnomedb.keys
-share/mime-info/libgnomedb.mime
-share/omf/libgnomedb/libgnomedb-C.omf
-share/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
-share/pixmaps/libgnomedb/gnome-db-aggregates_24x24.png
-share/pixmaps/libgnomedb/gnome-db-commit_24x24.png
-share/pixmaps/libgnomedb/gnome-db-connect_24x24.png
-share/pixmaps/libgnomedb/gnome-db-database-login_48x48.png
-share/pixmaps/libgnomedb/gnome-db-database_16x16.png
-share/pixmaps/libgnomedb/gnome-db-database_24x24.png
-share/pixmaps/libgnomedb/gnome-db-database_48x48.png
-share/pixmaps/libgnomedb/gnome-db-designer_24x24.png
-share/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
-share/pixmaps/libgnomedb/gnome-db-field_16x16.png
-share/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
-share/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
-share/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
-share/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
-share/pixmaps/libgnomedb/gnome-db-query_16x16.png
-share/pixmaps/libgnomedb/gnome-db-query_24x24.png
-share/pixmaps/libgnomedb/gnome-db-relations_16x16.png
-share/pixmaps/libgnomedb/gnome-db-relations_24x24.png
-share/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
-share/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
-share/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
-share/pixmaps/libgnomedb/gnome-db-sql_16x16.png
-share/pixmaps/libgnomedb/gnome-db-sql_24x24.png
-share/pixmaps/libgnomedb/gnome-db-table_16x16.png
-share/pixmaps/libgnomedb/gnome-db-tables_16x16.png
-share/pixmaps/libgnomedb/gnome-db-tables_24x24.png
-share/pixmaps/libgnomedb/gnome-db-triggers_16x16.png
-share/pixmaps/libgnomedb/gnome-db-types_16x16.png
-share/pixmaps/libgnomedb/gnome-db-types_24x24.png
-share/pixmaps/libgnomedb/gnome-db-views_16x16.png
-share/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png
-share/pixmaps/libgnomedb/gnome-db.png
-share/locale/az/LC_MESSAGES/libgnomedb-3.mo
-share/locale/be/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ca/LC_MESSAGES/libgnomedb-3.mo
-share/locale/cs/LC_MESSAGES/libgnomedb-3.mo
-share/locale/da/LC_MESSAGES/libgnomedb-3.mo
-share/locale/de/LC_MESSAGES/libgnomedb-3.mo
-share/locale/el/LC_MESSAGES/libgnomedb-3.mo
-share/locale/en_CA/LC_MESSAGES/libgnomedb-3.mo
-share/locale/en_GB/LC_MESSAGES/libgnomedb-3.mo
-share/locale/es/LC_MESSAGES/libgnomedb-3.mo
-share/locale/eu/LC_MESSAGES/libgnomedb-3.mo
-share/locale/fa/LC_MESSAGES/libgnomedb-3.mo
-share/locale/fi/LC_MESSAGES/libgnomedb-3.mo
-share/locale/fr/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ga/LC_MESSAGES/libgnomedb-3.mo
-share/locale/gl/LC_MESSAGES/libgnomedb-3.mo
-share/locale/hr/LC_MESSAGES/libgnomedb-3.mo
-share/locale/hu/LC_MESSAGES/libgnomedb-3.mo
-share/locale/it/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ja/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ka/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ko/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ml/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ms/LC_MESSAGES/libgnomedb-3.mo
-share/locale/nb/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ne/LC_MESSAGES/libgnomedb-3.mo
-share/locale/nl/LC_MESSAGES/libgnomedb-3.mo
-share/locale/no/LC_MESSAGES/libgnomedb-3.mo
-share/locale/pl/LC_MESSAGES/libgnomedb-3.mo
-share/locale/pt/LC_MESSAGES/libgnomedb-3.mo
-share/locale/pt_BR/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ru/LC_MESSAGES/libgnomedb-3.mo
-share/locale/rw/LC_MESSAGES/libgnomedb-3.mo
-share/locale/sk/LC_MESSAGES/libgnomedb-3.mo
-share/locale/sl/LC_MESSAGES/libgnomedb-3.mo
-share/locale/sq/LC_MESSAGES/libgnomedb-3.mo
-share/locale/sr/LC_MESSAGES/libgnomedb-3.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomedb-3.mo
-share/locale/sv/LC_MESSAGES/libgnomedb-3.mo
-share/locale/ta/LC_MESSAGES/libgnomedb-3.mo
-share/locale/tr/LC_MESSAGES/libgnomedb-3.mo
-share/locale/uk/LC_MESSAGES/libgnomedb-3.mo
-share/locale/vi/LC_MESSAGES/libgnomedb-3.mo
-share/locale/zh_CN/LC_MESSAGES/libgnomedb-3.mo
-share/locale/zh_HK/LC_MESSAGES/libgnomedb-3.mo
-share/locale/zh_TW/LC_MESSAGES/libgnomedb-3.mo
-@dirrm share/pixmaps/libgnomedb
-@dirrm share/omf/libgnomedb
+lib/libglade/2.0/libgnomedb-%%VERSION%%.a
+lib/libglade/2.0/libgnomedb-%%VERSION%%.la
+lib/libglade/2.0/libgnomedb-%%VERSION%%.so
+lib/libgnomedb-%%VERSION%%.a
+lib/libgnomedb-%%VERSION%%.la
+lib/libgnomedb-%%VERSION%%.so
+lib/libgnomedb-%%VERSION%%.so.4
+lib/libgnomedb/plugins/libgnomedb_entry_builtin_plugins.a
+lib/libgnomedb/plugins/libgnomedb_entry_builtin_plugins.la
+lib/libgnomedb/plugins/libgnomedb_entry_builtin_plugins.so
+lib/libgnomedb_extra-%%VERSION%%.a
+lib/libgnomedb_extra-%%VERSION%%.la
+lib/libgnomedb_extra-%%VERSION%%.so
+lib/libgnomedb_extra-%%VERSION%%.so.4
+lib/libgnomedb_graph-%%VERSION%%.a
+lib/libgnomedb_graph-%%VERSION%%.la
+lib/libgnomedb_graph-%%VERSION%%.so
+lib/libgnomedb_graph-%%VERSION%%.so.4
+libdata/pkgconfig/libgnomedb-%%VERSION%%.pc
+libdata/pkgconfig/libgnomedb-extra-%%VERSION%%.pc
+libdata/pkgconfig/libgnomedb-graph-%%VERSION%%.pc
+share/applications/database-properties-%%VERSION%%.desktop
+share/gnome-db/demo/console.c
+share/gnome-db/demo/ddl_queries.c
+share/gnome-db/demo/demo_db.db
+share/gnome-db/demo/demo_dict.xml
+share/gnome-db/demo/form.c
+share/gnome-db/demo/form_pict.c
+share/gnome-db/demo/form_rw.c
+share/gnome-db/demo/graph.c
+share/gnome-db/demo/grid.c
+share/gnome-db/demo/grid_pict.c
+share/gnome-db/demo/grid_rw.c
+share/gnome-db/demo/linked_grid_form.c
+share/gnome-db/demo/linked_model_param.c
+share/gnome-db/demo/selector.c
+share/gnome-db/gnome-db-entry-filesel-spec.xml
+share/gnome-db/gnome-db-entry-password.xml
+share/gnome-db/gnome-db-entry-pict-spec.xml
+share/gnome-db/gnome-db-entry-pict-spec_string.xml
+share/gnome-db/gnome-db-entry-string-number.xml
+share/gnome-db/gnome-db-entry-string-string.xml
+share/gnome-db/import_encodings.xml
+share/gnome-db/server_operation.glade
+share/locale/ar/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ka/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ne/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/rw/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/libgnomedb-%%VERSION%%.mo
+share/omf/libgnomedb/libgnomedb-%%VERSION%%-C.omf
+share/pixmaps/gnome-db.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-aggregates_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-aggregates_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-commit_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-connect_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-console_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-console_48x48.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-database_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-database_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-database_48x48.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-designer_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-disconnect_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-field_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-indexes_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-no-transaction_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-procedures_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-procedures_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-query_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-query_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-relations_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-relations_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-rollback_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-sequences_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-sequences_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-sql_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-sql_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-table_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-tables_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-tables_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-triggers_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-types_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-types_24x24.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-views_16x16.png
+share/pixmaps/libgnomedb-%%VERSION%%/gnome-db-within-transaction_24x24.png
+@dirrm share/pixmaps/libgnomedb-%%VERSION%%
+@dirrm share/gnome-db/demo
+@dirrm share/gnome-db
 @dirrm lib/libgnomedb/plugins
 @dirrm lib/libgnomedb
-@dirrm include/libgnomedb-%%VERSION%%/libgnomedb/graph
 @dirrm include/libgnomedb-%%VERSION%%/libgnomedb/data-entries
 @dirrm include/libgnomedb-%%VERSION%%/libgnomedb
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb-graph
+@dirrm include/libgnomedb-%%VERSION%%/libgnomedb-extra
 @dirrm include/libgnomedb-%%VERSION%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrmtry share/applications
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz