Update to 0.63:

For Release 0.63
----------------

 - Better GUI (Vivien)
 - Added support for table creation, destruction and renaming, and for column
   addition and removal (Vivien)
 - Fixed #316627 (Joseph)
 - Fixed #329939 (Thomas)
 - Fixed #327161 (Vivien)
 - Translations:
	- new Finnish translation (Ilkka Tuohela)
	- new Basque translation (Iñaki Larrañaga)
	- new Galician translation (Ignacio Casal Quinteiro)
	- new Chinese (Hong Kong, Taiwan) translation (Chao-Hsiung)
	- removed the obsolete no translation (Kjartan Maraas)
	- vi (Clytie)
	- ca (Josep)
	- nb (Kjartan)
	- fr (Marc-André)
	- ja (Satoru)
	- ru (Valek)
	- es (Francisco Javier)
	- de (Hendrik)
	- pt_BR (Raphael, Marco)
	- en_CA (Adam)
	- nl (Vincent)
	- cs (Miloslav)

4 files changed, 15 insertions, 64 deletions

diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 8af1e3524e6..c9858585630 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.43 2006/07/14 11:14:37 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2006/09/11 17:07:48 wiz Exp $
 #
 
-DISTNAME=		mergeant-0.62
-PKGREVISION=		5
+DISTNAME=		mergeant-0.63
 CATEGORIES=		databases gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.62/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.63/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 GNOME-DB database front-end
 
-BROKEN=			Does not work with current libgda version. Waiting for next release.
-
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake intltool perl pkg-config
 USE_PKGLOCALEDIR=	YES
diff --git a/databases/mergeant/PLIST b/databases/mergeant/PLIST
index e47a1853d84..27bc12b8282 100644
--- a/databases/mergeant/PLIST
+++ b/databases/mergeant/PLIST
@@ -1,40 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/09/11 17:07:48 wiz Exp $
 bin/mergeant
 lib/bonobo/servers/GNOME_Mergeant.server
 share/application-registry/mergeant.applications
 share/applications/mergeant.desktop
-share/gnome/help/mergeant/C/book1.html
-share/gnome/help/mergeant/C/c13.html
-share/gnome/help/mergeant/C/c47.html
-share/gnome/help/mergeant/C/c68.html
-share/gnome/help/mergeant/C/c76.html
-share/gnome/help/mergeant/C/c8.html
-share/gnome/help/mergeant/C/c84.html
-share/gnome/help/mergeant/C/c94.html
-share/gnome/help/mergeant/C/docbook.css
-share/gnome/help/mergeant/C/docbook.css
-share/gnome/help/mergeant/C/images/datasources.png
-share/gnome/help/mergeant/C/images/dba_properties.png
-share/gnome/help/mergeant/C/images/workspace-data-types.png
-share/gnome/help/mergeant/C/images/workspace-graphs.png
-share/gnome/help/mergeant/C/images/workspace-queries.png
-share/gnome/help/mergeant/C/images/workspace.png
-share/gnome/help/mergeant/C/index.html
-share/gnome/help/mergeant/C/stylesheet-images/caution.gif
-share/gnome/help/mergeant/C/stylesheet-images/home.gif
-share/gnome/help/mergeant/C/stylesheet-images/important.gif
-share/gnome/help/mergeant/C/stylesheet-images/next.gif
-share/gnome/help/mergeant/C/stylesheet-images/note.gif
-share/gnome/help/mergeant/C/stylesheet-images/prev.gif
-share/gnome/help/mergeant/C/stylesheet-images/tip.gif
-share/gnome/help/mergeant/C/stylesheet-images/toc-blank.gif
-share/gnome/help/mergeant/C/stylesheet-images/toc-minus.gif
-share/gnome/help/mergeant/C/stylesheet-images/toc-plus.gif
-share/gnome/help/mergeant/C/stylesheet-images/up.gif
-share/gnome/help/mergeant/C/stylesheet-images/warning.gif
 share/gnome/help/mergeant/C/topic.dat
-share/gnome/help/mergeant/C/x19.html
-share/gnome/help/mergeant/C/x40.html
 share/locale/am/LC_MESSAGES/mergeant.mo
 share/locale/az/LC_MESSAGES/mergeant.mo
 share/locale/ca/LC_MESSAGES/mergeant.mo
@@ -45,31 +14,27 @@ share/locale/el/LC_MESSAGES/mergeant.mo
 share/locale/en_CA/LC_MESSAGES/mergeant.mo
 share/locale/en_GB/LC_MESSAGES/mergeant.mo
 share/locale/es/LC_MESSAGES/mergeant.mo
+share/locale/eu/LC_MESSAGES/mergeant.mo
 share/locale/fa/LC_MESSAGES/mergeant.mo
+share/locale/fi/LC_MESSAGES/mergeant.mo
 share/locale/fr/LC_MESSAGES/mergeant.mo
+share/locale/gl/LC_MESSAGES/mergeant.mo
 share/locale/hr/LC_MESSAGES/mergeant.mo
 share/locale/it/LC_MESSAGES/mergeant.mo
 share/locale/ja/LC_MESSAGES/mergeant.mo
-share/locale/ja/LC_MESSAGES/mergeant.mo
-share/locale/lt/LC_MESSAGES/mergeant.mo
 share/locale/lt/LC_MESSAGES/mergeant.mo
 share/locale/ml/LC_MESSAGES/mergeant.mo
 share/locale/ms/LC_MESSAGES/mergeant.mo
 share/locale/nb/LC_MESSAGES/mergeant.mo
-share/locale/nb/LC_MESSAGES/mergeant.mo
-share/locale/ne/LC_MESSAGES/mergeant.mo
 share/locale/ne/LC_MESSAGES/mergeant.mo
 share/locale/nl/LC_MESSAGES/mergeant.mo
-share/locale/no/LC_MESSAGES/mergeant.mo
 share/locale/pl/LC_MESSAGES/mergeant.mo
 share/locale/pt/LC_MESSAGES/mergeant.mo
 share/locale/pt_BR/LC_MESSAGES/mergeant.mo
 share/locale/ru/LC_MESSAGES/mergeant.mo
 share/locale/rw/LC_MESSAGES/mergeant.mo
-share/locale/rw/LC_MESSAGES/mergeant.mo
 share/locale/sk/LC_MESSAGES/mergeant.mo
 share/locale/sq/LC_MESSAGES/mergeant.mo
-share/locale/sq/LC_MESSAGES/mergeant.mo
 share/locale/sr/LC_MESSAGES/mergeant.mo
 share/locale/sr@Latn/LC_MESSAGES/mergeant.mo
 share/locale/sv/LC_MESSAGES/mergeant.mo
@@ -77,6 +42,8 @@ share/locale/tr/LC_MESSAGES/mergeant.mo
 share/locale/uk/LC_MESSAGES/mergeant.mo
 share/locale/vi/LC_MESSAGES/mergeant.mo
 share/locale/zh_CN/LC_MESSAGES/mergeant.mo
+share/locale/zh_HK/LC_MESSAGES/mergeant.mo
+share/locale/zh_TW/LC_MESSAGES/mergeant.mo
 share/mime-info/mergeant.keys
 share/mime-info/mergeant.mime
 share/omf/mergeant/mergeant-C.omf
@@ -102,7 +69,9 @@ share/pixmaps/mergeant/query-view-view_16x16.png
 @dirrm share/omf/mergeant
 @comment in scrollkeeper: @dirrm share/omf
 @comment in xdg-dirs: @dirrm share/mime-info
+@exec ${MKDIR} %D/share/gnome/help/mergeant/C/stylesheet-images
 @dirrm share/gnome/help/mergeant/C/stylesheet-images
+@exec ${MKDIR} %D/share/gnome/help/mergeant/C/images
 @dirrm share/gnome/help/mergeant/C/images
 @dirrm share/gnome/help/mergeant/C
 @dirrm share/gnome/help/mergeant
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index 6390ea69b2d..426989819f7 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2006/02/04 17:03:30 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/09/11 17:07:48 wiz Exp $
 
-SHA1 (mergeant-0.62.tar.bz2) = 9ca45fcd06a21dc4e62250dc561ada97199ace42
-RMD160 (mergeant-0.62.tar.bz2) = 226fce0beb6a22f7b79abd13c199618a78390b54
-Size (mergeant-0.62.tar.bz2) = 1005279 bytes
-SHA1 (patch-aa) = 514d079fbeef0b71e9506a9a077f3739b8a97a8c
+SHA1 (mergeant-0.63.tar.bz2) = ae9916d66608658c83f05ddff0cecb7ec6cf49a2
+RMD160 (mergeant-0.63.tar.bz2) = 546fde56ac1fd7b5543391ed4b2e8d62133f2ba0
+Size (mergeant-0.63.tar.bz2) = 971555 bytes
diff --git a/databases/mergeant/patches/patch-aa b/databases/mergeant/patches/patch-aa
deleted file mode 100644
index e41fb8f5283..00000000000
--- a/databases/mergeant/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/02/04 17:03:30 wiz Exp $
-
---- src/main.c.orig	2005-05-15 17:02:21.000000000 +0000
-+++ src/main.c
-@@ -25,6 +25,9 @@
- 
- #include <stdio.h>
- #include <libgnomedb/libgnomedb.h>
-+#ifdef HAVE_LOCALE_H
-+#include <locale.h>
-+#endif
- #include <gtk/gtk.h>
- #include "workspace-window.h"
- #include "session.h"