Update to 0.12.1:

For Release 0.12.1
------------------
 - Added missing plugins directory to spec file (adam)
 - Fixed crash in #113623 (rodrigo)
 - Fixed main window resizing problems (rodrigo)
 - Updated translations:
        - fr (redfox)

For Release 0.12
----------------
 - Fixed UTF8 strings displaying (gonzalo)
 - Some documentation fixes (cj)
 - HIG-ify .desktop file (rodrigo)
 - HIG-ify preferences dialog (rodrigo)
 - Made menus to be disabled instead of hidden, as suggested in the
   HIG (rodrigo)
 - Made plugins install directory FHS compliant (frederic)
 - Updated translations:
        - ca (pablo)
	- cs (mitr)
        - fa (roozbeh)
	- fr (redfox)
	- nl (adrighem)
	- pt (dnloreto)
	- sv (menthos)

For Release 0.11
----------------
 - Spec file fixes (yanko)
 - Fixed #105178 (rodrigo)
 - Fixed #103094 (rodrigo)
 - Use new libgnomedb stock icons (rodrigo)
 - Made settings dialog look like Nautilus's preferences (rodrigo)
 - Added missing features to GConf-oriented GtkEntry's (rodrigo)
 - Updated translations:
	- am (yacob)
	- cs (mitr)
	- es (pablodc)
	- nl (adrighem)
	- pl (chyla)
	- pt (dnloreto)
	- pt_BR (evandrofg)
	- sv (menthos)
	- uk (rasta)
	- vi (pablo)

3 files changed, 77 insertions, 26 deletions

diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 18d1ef757f9..27ed6180614 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2003/06/02 01:21:07 jschauma Exp $
+# $NetBSD: Makefile,v 1.7 2003/06/10 14:21:25 jmmv Exp $
 #
 
-DISTNAME=		mergeant-0.10.0
-PKGREVISION=		2
+DISTNAME=		mergeant-0.12.1
 CATEGORIES=		databases gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.10/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/mergeant/0.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@netbsd.org
@@ -24,4 +23,5 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../databases/libgnomedb/buildlink2.mk"
 .include "../../print/libgnomeprintui/buildlink2.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mergeant/PLIST b/databases/mergeant/PLIST
index 21202f3664c..6ab3f8a00ce 100644
--- a/databases/mergeant/PLIST
+++ b/databases/mergeant/PLIST
@@ -1,40 +1,86 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/30 16:19:54 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/06/10 14:21:25 jmmv Exp $
 bin/mergeant
+lib/mergeant/plugins/libPnetaddr.a
+lib/mergeant/plugins/libPnetaddr.la
+lib/mergeant/plugins/libPnetaddr.so
+lib/mergeant/plugins/libPnetaddr.so.0
+lib/mergeant/plugins/libPnetaddr.so.0.0
+lib/mergeant/plugins/libPpicts.a
+lib/mergeant/plugins/libPpicts.la
+lib/mergeant/plugins/libPpicts.so
+lib/mergeant/plugins/libPpicts.so.0
+lib/mergeant/plugins/libPpicts.so.0.0
+lib/mergeant/plugins/libPsample.a
+lib/mergeant/plugins/libPsample.la
+lib/mergeant/plugins/libPsample.so
+lib/mergeant/plugins/libPsample.so.0
+lib/mergeant/plugins/libPsample.so.0.0
 share/application-registry/mergeant.applications
 share/applications/mergeant.desktop
+share/gnome/help/mergeant/C/c137.html
+share/gnome/help/mergeant/C/c220.html
+share/gnome/help/mergeant/C/c25.html
+share/gnome/help/mergeant/C/c254.html
+share/gnome/help/mergeant/C/c342.html
+share/gnome/help/mergeant/C/c372.html
+share/gnome/help/mergeant/C/c375.html
+share/gnome/help/mergeant/C/f20.html
+share/gnome/help/mergeant/C/images/env_form.jpg
+share/gnome/help/mergeant/C/images/env_grid.jpg
+share/gnome/help/mergeant/C/images/env_prop.jpg
+share/gnome/help/mergeant/C/images/framework.eps
+share/gnome/help/mergeant/C/images/framework.fig
+share/gnome/help/mergeant/C/images/framework.jpg
+share/gnome/help/mergeant/C/images/gas.gif
+share/gnome/help/mergeant/C/images/main.jpg
+share/gnome/help/mergeant/C/images/plugins_dt.jpg
+share/gnome/help/mergeant/C/images/plugins_objects.jpg
+share/gnome/help/mergeant/C/images/plugins_sum.jpg
+share/gnome/help/mergeant/C/images/properties.jpg
+share/gnome/help/mergeant/C/images/queryprop.jpg
+share/gnome/help/mergeant/C/images/queryprop_cond.jpg
+share/gnome/help/mergeant/C/images/queryprop_joins.jpg
+share/gnome/help/mergeant/C/images/queryprop_objects.jpg
+share/gnome/help/mergeant/C/images/queryprop_sql.jpg
+share/gnome/help/mergeant/C/images/rels.jpg
+share/gnome/help/mergeant/C/images/sysinfo.jpg
+share/gnome/help/mergeant/C/index.html
 share/gnome/help/mergeant/C/topic.dat
+share/gnome/help/mergeant/C/x110.html
+share/gnome/help/mergeant/C/x168.html
+share/gnome/help/mergeant/C/x210.html
+share/gnome/help/mergeant/C/x236.html
+share/gnome/help/mergeant/C/x245.html
+share/gnome/help/mergeant/C/x313.html
+share/gnome/help/mergeant/C/x32.html
+share/gnome/help/mergeant/C/x350.html
+share/gnome/help/mergeant/C/x66.html
+share/gnome/help/mergeant/C/x80.html
+share/gnome/help/mergeant/C/x92.html
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/mergeant.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mergeant.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mergeant.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mergeant.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/mergeant.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mergeant.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mergeant.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/mergeant.mo
 share/mergeant/dtd/mergeant.dtd
-share/mergeant/plugins/libPnetaddr.a
-share/mergeant/plugins/libPnetaddr.la
-share/mergeant/plugins/libPnetaddr.so
-share/mergeant/plugins/libPnetaddr.so.0
-share/mergeant/plugins/libPnetaddr.so.0.0
-share/mergeant/plugins/libPpicts.a
-share/mergeant/plugins/libPpicts.la
-share/mergeant/plugins/libPpicts.so
-share/mergeant/plugins/libPpicts.so.0
-share/mergeant/plugins/libPpicts.so.0.0
-share/mergeant/plugins/libPsample.a
-share/mergeant/plugins/libPsample.la
-share/mergeant/plugins/libPsample.so
-share/mergeant/plugins/libPsample.so.0
-share/mergeant/plugins/libPsample.so.0.0
 share/mime-info/mergeant.keys
 share/mime-info/mergeant.mime
 share/omf/mergeant/mergeant-C.omf
@@ -55,14 +101,19 @@ share/pixmaps/mergeant/query-view-query_16x16.png
 share/pixmaps/mergeant/query-view-table_16x16.png
 share/pixmaps/mergeant/query-view-view_16x16.png
 @dirrm share/pixmaps/mergeant
+@exec ${RMDIR} %D/share/pixmaps/document-icons 2>/dev/null || ${TRUE}
 @dirrm share/omf/mergeant
-@comment in gnome-dirs: @dirrm share/mime-info
-@dirrm share/mergeant/plugins
+@comment in scrollkeeper: @dirrm share/omf
+@comment in gnome2-dirs: @dirrm share/mime-info
 @dirrm share/mergeant/dtd
 @dirrm share/mergeant
 @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
+@comment in gnome2-dirs: @dirrm share/gnome/help
+@comment in gnome2-dirs: @dirrm share/applications
+@comment in gnome2-dirs: @dirrm share/application-registry
+@dirrm lib/mergeant/plugins
+@dirrm lib/mergeant
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index 627ed07bdfe..dc829c02e06 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/02/22 10:32:50 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/06/10 14:21:26 jmmv Exp $
 
-SHA1 (mergeant-0.10.0.tar.bz2) = 7fe0cf972c249b6f38568197e5f253fdfc2608c5
-Size (mergeant-0.10.0.tar.bz2) = 1100433 bytes
+SHA1 (mergeant-0.12.1.tar.bz2) = 486b47b81122489c859603b45edfade25c858f93
+Size (mergeant-0.12.1.tar.bz2) = 1204581 bytes
 SHA1 (patch-aa) = 44c5ccfb615f35f7102cf3324f7a304a43e89218
 SHA1 (patch-ab) = f8675a317f867dc9996f6e5ac51ab2dd41500f06