9 files changed, 136 insertions, 157 deletions

diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 18166163a64b..d82b6a0cd70c 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgnomedb
-PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/libgnomedb/1.0
+MASTER_SITE_SUBDIR=	sources/libgnomedb/1.2
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -20,8 +19,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \
-		intlhack lthack
-USE_INC_LIBTOOL_VER=	13
+		intlhack
+USE_LIBTOOL_VER=15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index 55a23e5cd28d..223a42243fa1 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomedb-1.0.4.tar.bz2) = 956ddc8ddb3f4a2594a52b8a1b783f29
-SIZE (gnome2/libgnomedb-1.0.4.tar.bz2) = 621983
+MD5 (gnome2/libgnomedb-1.2.1.tar.bz2) = 5e2ff4eaa2bdb02493af4e21b5f5bf8b
+SIZE (gnome2/libgnomedb-1.2.1.tar.bz2) = 645167
diff --git a/databases/libgnomedb/files/patch-Makefile.in b/databases/libgnomedb/files/patch-Makefile.in
index ad0f1fd1b43e..c23a0014f8f1 100644
--- a/databases/libgnomedb/files/patch-Makefile.in
+++ b/databases/libgnomedb/files/patch-Makefile.in
@@ -1,12 +1,12 @@
---- Makefile.in.orig	Sun Apr 18 16:19:21 2004
-+++ Makefile.in	Sun Apr 18 16:19:38 2004
-@@ -212,8 +212,7 @@
- 
- @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center components monikers
- 
--@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc
+--- Makefile.in.orig	Thu Jul 22 10:56:33 2004
++++ Makefile.in	Thu Jul 22 10:57:14 2004
+@@ -251,8 +251,7 @@
+ @HAVE_LIBGLADE_TRUE@LIBGLADE_DIRECTORY = glade
+ @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 \
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c
deleted file mode 100644
index b652611d1d51..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c
+++ /dev/null
@@ -1,37 +0,0 @@
-2004-04-18 Joe Marcus Clarke <marcus@FreeBSD.org>
-
-* libgnomedb/gnome-db-data-source-selector.c: (show_data_sources):
-
-Be sure to add something to the DSN menu so that this menu gets initialized.
-Failure to do so will cause a segmentation fault when trying to login to
-the database.
-
---- libgnomedb/gnome-db-data-source-selector.c.orig	Sun Apr 18 21:41:59 2004
-+++ libgnomedb/gnome-db-data-source-selector.c	Sun Apr 18 21:43:20 2004
-@@ -61,8 +61,25 @@
- 						    dsn_info->name);
- 		gnome_db_config_free_data_source_info (dsn_info);
- 	}
--	else
-+	else {
-+		GList *dsn_list;
-+		GList *l;
-+
-+		/* load data sources */
-+		dsn_list = gnome_db_config_get_data_source_list ();
-+		for (l = dsn_list; l != NULL; l = l->next) {
-+			GdaDataSourceInfo *dsn_info = (GdaDataSourceInfo *) l->data;
-+
-+			if (!dsn_info)
-+				continue;
-+
-+			/* add the data source to the option menu */
-+			gnome_db_option_menu_add_item (GTK_OPTION_MENU (selector), dsn_info->name);
-+		}
-+
-+		gnome_db_config_free_data_source_list (dsn_list);
- 		gtk_option_menu_set_history (GTK_OPTION_MENU (selector), 0);
-+	}
- }
- 
- /*
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
new file mode 100644
index 000000000000..27555ef8d7e3
--- /dev/null
+++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c
@@ -0,0 +1,16 @@
+--- libgnomedb/gnome-db-find-dialog.c.orig	Thu Jul 22 17:40:26 2004
++++ libgnomedb/gnome-db-find-dialog.c	Thu Jul 22 17:41:02 2004
+@@ -216,11 +216,12 @@
+ GtkWidget *
+ gnome_db_find_dialog_new_with_model (const gchar *title, GdaDataModel *dm)
+ {
++	GnomeDbFindDialog *dialog;
+ 	g_return_val_if_fail (GDA_IS_DATA_MODEL (dm), NULL);
+ 	
+ 	g_object_ref (dm);
+ 	
+-	GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title);
++	dialog = gnome_db_find_dialog_new (title);
+ 	gnome_db_find_dialog_add_fields_from_model (dialog, dm);
+ 
+ 	g_object_unref (dm);
diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c
deleted file mode 100644
index 392c7d06ec20..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomedb/gnome-db-form.c.orig	Mon Aug  2 10:13:56 2004
-+++ libgnomedb/gnome-db-form.c	Mon Aug  2 10:14:09 2004
-@@ -582,6 +582,6 @@
- 		form->priv->navigator_current_row = row;
- 		show_navigator_row (form);
- 		break;
--	case GNOME_DB_FORM_TYPE_LIST :
-+	case GNOME_DB_FORM_TYPE_LIST :;
- 	}
- }
diff --git a/databases/libgnomedb/files/patch-libgnomedb_utils.c b/databases/libgnomedb/files/patch-libgnomedb_utils.c
deleted file mode 100644
index 92979f008432..000000000000
--- a/databases/libgnomedb/files/patch-libgnomedb_utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgnomedb/utils.c.orig	Mon Aug  2 10:12:06 2004
-+++ libgnomedb/utils.c	Mon Aug  2 10:12:16 2004
-@@ -45,7 +45,7 @@
- 		dialog = gnome_db_error_dialog_new (_("Error"));
- 		gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (dialog),
- 						   gda_connection_get_errors (cnc));
--	default :
-+	default :;
- 	}
- }
- 
diff --git a/databases/libgnomedb/files/patch-po::Makefile.in.in b/databases/libgnomedb/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..2e0e6e70ee75
--- /dev/null
+++ b/databases/libgnomedb/files/patch-po::Makefile.in.in
@@ -0,0 +1,10 @@
+--- 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 a7c91a4d5591..0f6a2c9ef98d 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -1,91 +1,95 @@
 bin/gnome-database-properties
-include/libgnomedb/gnome-db-browser.h
-include/libgnomedb/gnome-db-combo.h
-include/libgnomedb/gnome-db-config.h
-include/libgnomedb/gnome-db-connection-properties.h
-include/libgnomedb/gnome-db-connection-selector.h
-include/libgnomedb/gnome-db-control-widget.h
-include/libgnomedb/gnome-db-control.h
-include/libgnomedb/gnome-db-data-source-selector.h
-include/libgnomedb/gnome-db-dsn-config-druid.h
-include/libgnomedb/gnome-db-dsn-config.h
-include/libgnomedb/gnome-db-editor.h
-include/libgnomedb/gnome-db-error-dialog.h
-include/libgnomedb/gnome-db-error.h
-include/libgnomedb/gnome-db-form.h
-include/libgnomedb/gnome-db-gray-bar.h
-include/libgnomedb/gnome-db-grid.h
-include/libgnomedb/gnome-db-i18n.h
-include/libgnomedb/gnome-db-icon-list.h
-include/libgnomedb/gnome-db-list.h
-include/libgnomedb/gnome-db-login-dialog.h
-include/libgnomedb/gnome-db-login.h
-include/libgnomedb/gnome-db-model.h
-include/libgnomedb/gnome-db-provider-selector.h
-include/libgnomedb/gnome-db-query-builder.h
-include/libgnomedb/gnome-db-report-editor.h
-include/libgnomedb/gnome-db-stock.h
-include/libgnomedb/gnome-db-table-editor.h
-include/libgnomedb/gnome-db-util.h
-include/libgnomedb/libgnomedb.h
-lib/bonobo/monikers/libmoniker_database.so
+include/libgnomedb-1.2/libgnomedb/gnome-db-browser.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-combo.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-config.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-connection-properties.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-connection-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-control-widget.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-control.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-data-source-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config-druid.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-error-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-error.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-find-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-form.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-gray-bar.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-grid.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-i18n.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-icon-list.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-list.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-login-dialog.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-login.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-model.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-provider-selector.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-query-builder.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-report-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-stock.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-table-editor.h
+include/libgnomedb-1.2/libgnomedb/gnome-db-util.h
+include/libgnomedb-1.2/libgnomedb/libgnomedb.h
 lib/libglade/2.0/libgnomedb.so
 lib/libgnomedb-2.a
 lib/libgnomedb-2.so
-lib/libgnomedb-2.so.3
+lib/libgnomedb-2.so.4
 libdata/pkgconfig/libgnomedb.pc
-libdata/bonobo/servers/GNOME_Database_Components.server
-libdata/bonobo/servers/GNOME_Database_Monikers.server
-libexec/gnome-database-components
-%%DOCSDIR%%/fdl-section1.html
-%%DOCSDIR%%/fdl-section10.html
-%%DOCSDIR%%/fdl-section2.html
-%%DOCSDIR%%/fdl-section3.html
-%%DOCSDIR%%/fdl-section4.html
-%%DOCSDIR%%/fdl-section5.html
-%%DOCSDIR%%/fdl-section6.html
-%%DOCSDIR%%/fdl-section7.html
-%%DOCSDIR%%/fdl-section8.html
-%%DOCSDIR%%/fdl-section9.html
-%%DOCSDIR%%/fdl-using.html
-%%DOCSDIR%%/fdl.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/libgnomedb-basic.html
-%%DOCSDIR%%/libgnomedb-bonobo.html
-%%DOCSDIR%%/libgnomedb-gnome-db-config.html
-%%DOCSDIR%%/libgnomedb-gnome-db-model.html
-%%DOCSDIR%%/libgnomedb-gnome-db-stock.html
-%%DOCSDIR%%/libgnomedb-gnome-db-util.html
-%%DOCSDIR%%/libgnomedb-gnomedbbrowser.html
-%%DOCSDIR%%/libgnomedb-gnomedbcombo.html
-%%DOCSDIR%%/libgnomedb-gnomedbconnectionproperties.html
-%%DOCSDIR%%/libgnomedb-gnomedbconnectionselector.html
-%%DOCSDIR%%/libgnomedb-gnomedbcontrol.html
-%%DOCSDIR%%/libgnomedb-gnomedbcontrolwidget.html
-%%DOCSDIR%%/libgnomedb-gnomedbdatasourceselector.html
-%%DOCSDIR%%/libgnomedb-gnomedbdsnconfig.html
-%%DOCSDIR%%/libgnomedb-gnomedbdsnconfigdruid.html
-%%DOCSDIR%%/libgnomedb-gnomedbeditor.html
-%%DOCSDIR%%/libgnomedb-gnomedberror.html
-%%DOCSDIR%%/libgnomedb-gnomedberrordialog.html
-%%DOCSDIR%%/libgnomedb-gnomedbform.html
-%%DOCSDIR%%/libgnomedb-gnomedbgraybar.html
-%%DOCSDIR%%/libgnomedb-gnomedbgrid.html
-%%DOCSDIR%%/libgnomedb-gnomedbiconlist.html
-%%DOCSDIR%%/libgnomedb-gnomedblist.html
-%%DOCSDIR%%/libgnomedb-gnomedblogin.html
-%%DOCSDIR%%/libgnomedb-gnomedblogindialog.html
-%%DOCSDIR%%/libgnomedb-gnomedbproviderselector.html
-%%DOCSDIR%%/libgnomedb-gnomedbquerybuilder.html
-%%DOCSDIR%%/libgnomedb-gnomedbreporteditor.html
-%%DOCSDIR%%/libgnomedb-gnomedbtableeditor.html
-%%DOCSDIR%%/libgnomedb-gnomedbwindow.html
-%%DOCSDIR%%/libgnomedb-introduction.html
-%%DOCSDIR%%/libgnomedb-libgnomedb.html
-%%DOCSDIR%%/libgnomedb-widgets.html
 share/gnome/control-center-2.0/capplets/database-properties.desktop
 share/gnome/gnome-db/ui/db-shell.xml
+share/gnome/gtk-doc/html/libgnomedb/fdl-section1.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section10.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section2.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section3.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section4.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section5.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section6.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section7.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section8.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-section9.html
+share/gnome/gtk-doc/html/libgnomedb/fdl-using.html
+share/gnome/gtk-doc/html/libgnomedb/fdl.html
+share/gnome/gtk-doc/html/libgnomedb/home.png
+share/gnome/gtk-doc/html/libgnomedb/index.html
+share/gnome/gtk-doc/html/libgnomedb/index.sgml
+share/gnome/gtk-doc/html/libgnomedb/left.png
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbBrowser.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbCombo.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionProperties.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionSelector.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControl.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControlWidget.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDataSourceSelector.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfig.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfigDruid.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbEditor.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbError.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbErrorDialog.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbFindDialog.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbForm.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrayBar.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrid.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbIconList.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbList.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLogin.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLoginDialog.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbProviderSelector.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbQueryBuilder.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbReportEditor.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbTableEditor.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbWindow.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-basic.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-bonobo.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-config.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-model.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-stock.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-util.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-introduction.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-libgnomedb.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb-widgets.html
+share/gnome/gtk-doc/html/libgnomedb/libgnomedb.devhelp
+share/gnome/gtk-doc/html/libgnomedb/right.png
+share/gnome/gtk-doc/html/libgnomedb/style.css
+share/gnome/gtk-doc/html/libgnomedb/up.png
 share/gnome/mime-info/libgnomedb.keys
 share/gnome/mime-info/libgnomedb.mime
 share/gnome/omf/libgnomedb/libgnomedb-C.omf
@@ -99,12 +103,15 @@ share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-database_48x48.png
 share/gnome/pixmaps/libgnomedb/gnome-db-designer_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-field_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-query_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-query_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-relations_16x16.png
+share/gnome/pixmaps/libgnomedb/gnome-db-relations_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
@@ -136,12 +143,13 @@ share/locale/ga/LC_MESSAGES/libgnomedb-2.mo
 share/locale/gl/LC_MESSAGES/libgnomedb-2.mo
 share/locale/hr/LC_MESSAGES/libgnomedb-2.mo
 share/locale/hu/LC_MESSAGES/libgnomedb-2.mo
-share/locale/id/LC_MESSAGES/libgnomedb-2.mo
 share/locale/it/LC_MESSAGES/libgnomedb-2.mo
 share/locale/ja/LC_MESSAGES/libgnomedb-2.mo
+share/locale/ka/LC_MESSAGES/libgnomedb-2.mo
 share/locale/ko/LC_MESSAGES/libgnomedb-2.mo
 share/locale/ml/LC_MESSAGES/libgnomedb-2.mo
 share/locale/ms/LC_MESSAGES/libgnomedb-2.mo
+share/locale/nb/LC_MESSAGES/libgnomedb-2.mo
 share/locale/nl/LC_MESSAGES/libgnomedb-2.mo
 share/locale/no/LC_MESSAGES/libgnomedb-2.mo
 share/locale/pl/LC_MESSAGES/libgnomedb-2.mo
@@ -150,6 +158,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomedb-2.mo
 share/locale/ru/LC_MESSAGES/libgnomedb-2.mo
 share/locale/sk/LC_MESSAGES/libgnomedb-2.mo
 share/locale/sl/LC_MESSAGES/libgnomedb-2.mo
+share/locale/sq/LC_MESSAGES/libgnomedb-2.mo
 share/locale/sr/LC_MESSAGES/libgnomedb-2.mo
 share/locale/sr@Latn/LC_MESSAGES/libgnomedb-2.mo
 share/locale/sv/LC_MESSAGES/libgnomedb-2.mo
@@ -161,7 +170,10 @@ share/locale/zh_CN/LC_MESSAGES/libgnomedb-2.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomedb-2.mo
 @dirrm share/gnome/pixmaps/libgnomedb
 @dirrm share/gnome/omf/libgnomedb
+@dirrm share/gnome/gtk-doc/html/libgnomedb
+@unexec rmdir %D/share/gnome/gtk-doc/html 2> /dev/null || true
+@unexec rmdir %D/share/gnome/gtk-doc 2> /dev/null || true
 @dirrm share/gnome/gnome-db/ui
 @dirrm share/gnome/gnome-db
-@dirrm %%DOCSDIR%%
-@dirrm include/libgnomedb
+@dirrm include/libgnomedb-1.2/libgnomedb
+@dirrm include/libgnomedb-1.2