Update to 2.12.0:

==============
Version 2.12.0
==============

 Fixes

	* Fix FAM crasher in gmenu-simple-editor (Ed Catmur)

 Translators

	* Rhys Jones (cy)
	* Vincent Untz (fr)
	* Ignacio Casal Quinteiro (gl)
	* Norayr Chilingaryan (hy)
	* Žygimantas Beručka (lt)
	* Duarte Loreto (pt)
	* Leonid Kanter (ru)
	* Elian Myftiu (sq)
	* Данило Шеган (sr)
	* Onur Can Cakmak (tr)
	* Clytie Siddall (vi)

===============
Version 2.11.92
===============

 Fixes

	* Fix memory corruption crasher handling notifies (Mark)
	* Fix python syntax warning (Mark)
	* Fix build when FAM isn't found (Elijah Newren)
	* Fix crasher when a <AppDir> references a subdir of another <AppDir> (Mark)
	* Fix duplicate entries after updating (Mark)
	* Fix infinite loop (Frederic Crozat)
	* Make <LegacyDir> with prefix work again (Chris Lahey, Mark)

  Translators

	* Rostislav "zbrox" Raykov (bg)
	* Jordi Mallach (ca)
	* Hendrik Brandt (de)
	* Nikos Charonitakis (el)
	* Roozbeh Pournader (fa)
	* ahmad riza h nst (id)
	* Takeshi AIHANA (ja)
	* Young-Ho Cha (ko)
	* GNOME PL Team (pl)
	* Sebastian Ivan (ro)
	* Maxim Dziumanenko (uk)
	* Clytie Siddall (vi)

===============
Version 2.11.91
===============

  Fixes

	* Install .desktop file for editor (Dennis Cranston, Mark)
	* Fix the window icon in the editor (Jaap A. Haitsma, Mark)
	* Allow running editor in different prefix from python (Mark)

  Translators

	* Miloslav Trmac (cs)
	* Hendrik Brandt (de)
	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Priit Laes (et)
	* Ilkka Tuohela (fi)
	* Ankit Patel (gu)
	* Reuven Gonen (he)
	* Gabor Kelemen (hu)
	* Takeshi AIHANA (ja)
	* Kjartan Maraas (nb)
	* Tino Meinen (nl)
	* Kjartan Maraas (no)
	* Afonso Celso Medina (pt_BR)
	* Marcel Telka (sk)
	* Theppitak Karoonboonyanan (th)
	* Clytie Siddall (vi)
	* Funda Wang (zh_CN)
	* Woodman Tuen (zh_TW)

===============
Version 2.11.90
===============

  Fixes

	* Fix issue with handling of filename encodings (Mark)
	* Only try to include ".directory" for <LegacyDir> if it exists (Mark)
	* Re-name the Edutainment sub-menu to Education (Mark)
	* Fix spec compliance issue with <Merge> tag handling (Mark)
	* Remove some unused code (Mark)
	* Plug some leaks (Mark)

  Menu Editor

	* HIGify menu editor (Dennis Cranston)
	* Make "Desktop" menu appear correctly (Mark)

  Misc

	* Allow building against uninstalled library (Brian Cameron)

  Translators

	* Ales Nyakhaychyk (be)
	* Rostislav "zbrox" Raykov (bg)
	* Miloslav Trmac (cs)
	* Martin Willemoes Hansen (da)
	* Hendrik Brandt (de)
	* Nikos Charonitakis (el)
	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Priit Laes (et)
	* Iñaki Larrañaga (eu)
	* Ilkka Tuohela (fi)
	* Ignacio Casal Quinteiro (gl)
	* Ankit Patel (gu)
	* Yuval Tanny (he)
	* Swapnil Hajare (mr)
	* Terance Edward Sola (nb)
	* Ganesh Ghimire (ne)
	* Tino Meinen (nl)
	* Terance Edward Sola (no)
	* Marcel Telka (sk)
	* Elian Myftiu (sq)
	* Данило Шеган (sr)
	* Theppitak Karoonboonyanan (th)
	* Onur Can Cakmak (tr)
	* Clytie Siddall (vi)
	* Funda Wang (zh_CN)
	* Woodman Tuen (zh_TW)

================
Version 2.11.1.1
================

  Fixes

	* Fix crasher bug in libgnome-menu triggered by editor (Mark)
	* Make the editor create $XDG_CONFIG_HOME/menus if it doesn't exist (Mark)

==============
Version 2.11.1
==============

  Features

	* Simple menu editor (Mark)
	* Python bindings (Mark)
	* Support for <Layout> and <DefaultLayout> (Mark, Frederic Crozat)
        * Use FAM directly for monitoring rather than gnome-vfs (Mark)
	* Add API for retaining empty sub-menus and excluded items in
	  the GMenuTree (Mark, Christian Neumair)
        * Add gmenu_tree_directory_get_menu_id() API (Mark)
        * Add gmenu_tree_directory_get_tree() and gmenu_tree_get_menu_file()
          API (Mark)
	* Namespace the API - i.e. MenuTree -> GMenuTree (Mark)

  Fixes

	* Plug major memory leak when the menu is reloaded (Mark)
        * Fix "recursive <MergeFile> inclusion" crash (Mark)
        * Fix problem where you could end up with identical items in
          the same menu (Mark)
	* Fix issue where you could end up with more than one menu
          with the same name (Mark)
        * Update for changes to <Move> behaviour in spec (Mark)
        * Fix off-by-one errors shown up in valgrind (Mark)
	* Remove <LegacyDir>s from default menu (Mark)

   Translators

	* Vladimir "Kaladan" Petkov (bg)
	* Miloslav Trmac (cs)
	* Hendrik Brandt (de)
	* Adam Weinberger (en_CA)
	* David Lodge (en_GB)
	* Francisco Javier F. Serrador (es)
	* Priit Laes (et)
	* Iñaki Larrañaga (eu)
	* Takeshi AIHANA (ja)
	* Steve Murphy (rw)
	* Canonical Ltd (xh)

4 files changed, 16 insertions, 13 deletions

diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index ef4432c3308..3c0775229f5 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2005/08/21 11:27:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2005/10/12 21:52:29 jmmv Exp $
 #
 
-DISTNAME=	gnome-menus-2.10.2
+DISTNAME=	gnome-menus-2.12.0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.12/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/sysutils/gnome-menus/PLIST b/sysutils/gnome-menus/PLIST
index c55c89f2a4f..293e94ba0da 100644
--- a/sysutils/gnome-menus/PLIST
+++ b/sysutils/gnome-menus/PLIST
@@ -1,19 +1,21 @@
-@comment $NetBSD: PLIST,v 1.5 2005/08/21 11:27:31 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/10/12 21:52:30 jmmv Exp $
 bin/gnome-menu-spec-test
-include/gnome-menus/menu-tree.h
+include/gnome-menus/gmenu-tree.h
 lib/libgnome-menu.la
 lib/pkgconfig/libgnome-menu.pc
 share/desktop-directories/Accessibility.directory
 share/desktop-directories/Accessories.directory
 share/desktop-directories/Applications.directory
+share/desktop-directories/Desktop.directory
 share/desktop-directories/Development.directory
-share/desktop-directories/Edutainment.directory
+share/desktop-directories/Education.directory
 share/desktop-directories/Games.directory
 share/desktop-directories/Graphics.directory
 share/desktop-directories/Internet.directory
 share/desktop-directories/Multimedia.directory
 share/desktop-directories/Office.directory
 share/desktop-directories/Other.directory
+share/desktop-directories/Preferences.directory
 share/desktop-directories/Settings-Accessibility.directory
 share/desktop-directories/Settings.directory
 share/desktop-directories/System-Settings.directory
@@ -42,12 +44,14 @@ ${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-menus.mo
+${PKGLOCALEDIR}/locale/hy/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-menus.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-menus.mo
@@ -62,7 +66,6 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-menus.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gnome-menus.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk
index c753ac37188..c3bec44bebc 100644
--- a/sysutils/gnome-menus/buildlink3.mk
+++ b/sysutils/gnome-menus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/03/22 16:10:12 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/10/12 21:52:30 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MENUS_BUILDLINK3_MK:=	${GNOME_MENUS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-menus}
 BUILDLINK_PACKAGES+=	gnome-menus
 
 .if !empty(GNOME_MENUS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-menus+=		gnome-menus>=2.10.0
+BUILDLINK_DEPENDS.gnome-menus+=		gnome-menus>=2.12.0
 BUILDLINK_PKGSRCDIR.gnome-menus?=	../../sysutils/gnome-menus
 .endif	# GNOME_MENUS_BUILDLINK3_MK
 
diff --git a/sysutils/gnome-menus/distinfo b/sysutils/gnome-menus/distinfo
index cc867491628..36b6ec56dc6 100644
--- a/sysutils/gnome-menus/distinfo
+++ b/sysutils/gnome-menus/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/08/21 11:27:31 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2005/10/12 21:52:30 jmmv Exp $
 
-SHA1 (gnome-menus-2.10.2.tar.bz2) = a0fec01aa28fb0a1a671fbc1fb9ef22d96e8f887
-RMD160 (gnome-menus-2.10.2.tar.bz2) = 50300313537cd37e5de27e98c042b83e66f65f33
-Size (gnome-menus-2.10.2.tar.bz2) = 350941 bytes
+SHA1 (gnome-menus-2.12.0.tar.bz2) = bc6012c52c27fcd0506742cde93c00e00bf545fe
+RMD160 (gnome-menus-2.12.0.tar.bz2) = 72caca74259e2cb7ab212f314933354c9bee6a31
+Size (gnome-menus-2.12.0.tar.bz2) = 393280 bytes
 SHA1 (patch-aa) = 8dd7584a5ff414960cac661643fdfa734338d3a7