Update to 2.12.1:

===============
Version 2.12.1
===============

  Misc

	* disable scrollkeeper for distcheck (Vincent)

  Translators

	* Mahay Alam Khan (bn)
	* Ivar Smolin (et)
	* Iñaki Larrañaga (eu)
	* Ignacio Casal Quinteiro (gl)
	* Gil Osher (he)
	* Baris Cicek (tr)
	* Clytie Siddall (vi)

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

  Translators

	* Vladimir "Kaladan" Petkov (bg)
	* Jordi Mallach (ca)
	* Gareth Bowker (cy)
	* Hendrik Richter (de)
	* Francisco Javier F. Serrador (es)
	* Christophe Merlet (RedFox) (fr)
	* Gabor Kelemen (hu)
	* Norayr Chilingaryan (hy)
	* Takeshi AIHANA (ja)
	* Young-Ho Cha (ko)
	* Erdal Ronahi (ku)
	* Žygimantas Beručka (lt)
	* Leonid Kanter (ru)
	* Elian Myftiu (sq)
	* Данило Шеган (sr)

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

  Docs Translations

	* Tommi Vainikainen (fi)

  Translators

	* Ankit Patel (gu)
	* Gabor Kelemen (hu)
	* Mohammad DAMT (id)
	* Kjartan Maraas (nb, no)
	* Gnome PL Team (pl)
	* Evandro Fernandes Giovanini (pt_BR)
	* Duarte Loreto (pt)
	* Dan Damian (ro)
	* Marcel Telka (sk)
	* Prajasakti Localisation Team (te)
	* Gheyret T.Kenji (ug)
	* Maxim Dziumanenko (uk)
	* Wang Jian (zh_CN)
	* Abel Cheung (zh_TW)

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

  Misc

	* Use gnome-doc-utils for building the help docs (Vincent Untz)
	* Use GtkIconTheme for gnome_icon_theme_(find|get)_icon (Christian Persch, Mark)
	* Use trademarked GNOME logo in gnome-about (Luca Cavalli)

  Translators

	* Miloslav Trmac (cs)
	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Ivar Smolin (et)
	* Ilkka Tuohela (fi)
	* Kjartan Maraas (nb, no)
	* Tino Meinen (nl)
	* Paisa Seeluangsawat (th)
	* Clytie Siddall (vi)

==============
Version 2.11.5
==============

  Misc

	* Fix leak (Kjartan Maraas)

  Translators

	* Данило Шеган (sr)

==============
Version 2.11.4
==============

  Misc

	* Fix leak (Kjartan Maraas)

  Translators

	* Martin Willemoes Hansen (da)
	* "Francisco Javier F. Serrador" (es)
	* Marcel Telka (sk)
	* Abel Cheung (zh_TW)

==============
Version 2.11.3
==============

  Translators

	* Ales Nyakhaychyk (be)
	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Ivar Smolin (et)
	* Iñaki Larrañaga (eu)
	* Lilit Azizbekyan (hy)
	* Takeshi AIHANA (ja)
	* Kjartan Maraas (nb)
	* Kjartan Maraas (no)
	* Elian Myftiu (sq)
	* Paisa Seeluangsawat (th)

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

  Misc

	* Add gnome_desktop_item_new_from_basename() API (Dennis Cranston)
	* Fix i18n inialization in GnomeDesktopItem (Frederic Crozat)

  Translators

	* Vladimir \"Kaladan\" Petkov (bg)
	* Miloslav Trmac (cs)
	* Iñaki Larrañaga (eu)
	* Ankit Patel (gu)
	* Tino Meinen (nl)

4 files changed, 43 insertions, 29 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index ebe4d578639..6b7c2601c94 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2005/08/21 11:26:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.43 2005/10/12 21:52:01 jmmv Exp $
 #
 
-DISTNAME=		gnome-desktop-2.10.2
-PKGREVISION=		1
+DISTNAME=		gnome-desktop-2.12.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.10/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.12/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -27,6 +26,7 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index 043539b3884..0388dd12b59 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2005/08/21 11:26:47 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/10/12 21:52:01 jmmv Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
 include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
@@ -7,7 +7,7 @@ lib/libgnome-desktop-2.la
 lib/pkgconfig/gnome-desktop-2.0.pc
 man/man1/gnome-about.1
 share/applications/gnome-about.desktop
-share/gnome-about/gnome-64.gif
+share/gnome-about/gnome-64.png
 share/gnome-about/gnome-version.xml
 share/gnome-about/headers/header-bg-ancient01a.png
 share/gnome-about/headers/header-bg-city01.png
@@ -19,13 +19,16 @@ share/gnome-about/headers/header-bg-mountains01.png
 share/gnome-about/headers/header-bg-snow01.png
 share/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
-share/gnome/help/fdl/eu/fdl.xml
+share/gnome/help/fdl/es/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
-share/gnome/help/gnome-feedback/eu/gnome-feedback.xml
+share/gnome/help/gnome-feedback/es/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
-share/gnome/help/gpl/eu/gpl.xml
+share/gnome/help/gpl/es/gpl.xml
+share/gnome/help/gpl/fi/gpl.xml
+share/gnome/help/gpl/pa/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
-share/gnome/help/lgpl/eu/lgpl.xml
+share/gnome/help/lgpl/es/lgpl.xml
+share/gnome/help/lgpl/pa/lgpl.xml
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -64,6 +67,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -97,6 +101,7 @@ ${PKGLOCALEDIR}/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
+${PKGLOCALEDIR}/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -106,14 +111,17 @@ ${PKGLOCALEDIR}/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 ${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-share/omf/gnome-desktop/fdl-C.omf
-share/omf/gnome-desktop/fdl-eu.omf
-share/omf/gnome-desktop/gnome-feedback-C.omf
-share/omf/gnome-desktop/gnome-feedback-eu.omf
-share/omf/gnome-desktop/gpl-C.omf
-share/omf/gnome-desktop/gpl-eu.omf
-share/omf/gnome-desktop/lgpl-C.omf
-share/omf/gnome-desktop/lgpl-eu.omf
+share/omf/fdl/fdl-C.omf
+share/omf/fdl/fdl-es.omf
+share/omf/gnome-feedback/gnome-feedback-C.omf
+share/omf/gnome-feedback/gnome-feedback-es.omf
+share/omf/gpl/gpl-C.omf
+share/omf/gpl/gpl-es.omf
+share/omf/gpl/gpl-fi.omf
+share/omf/gpl/gpl-pa.omf
+share/omf/lgpl/lgpl-C.omf
+share/omf/lgpl/lgpl-es.omf
+share/omf/lgpl/lgpl-pa.omf
 share/pixmaps/apple-green.png
 share/pixmaps/apple-red.png
 share/pixmaps/gnome-aorta.png
@@ -188,18 +196,24 @@ share/pixmaps/kterm.xpm
 share/pixmaps/monitor.png
 share/pixmaps/vnterm.xpm
 @comment in xdg-dirs: @dirrm share/pixmaps
-@dirrm share/omf/gnome-desktop
+@dirrm share/omf/lgpl
+@dirrm share/omf/gpl
+@dirrm share/omf/gnome-feedback
+@dirrm share/omf/fdl
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/gnome/help/lgpl/eu
+@dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/es
 @comment in gnome2-dirs: @dirrm share/gnome/help/lgpl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/lgpl
-@dirrm share/gnome/help/gpl/eu
+@dirrm share/gnome/help/gpl/pa
+@dirrm share/gnome/help/gpl/fi
+@dirrm share/gnome/help/gpl/es
 @comment in gnome2-dirs: @dirrm share/gnome/help/gpl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/gpl
-@dirrm share/gnome/help/gnome-feedback/eu
+@dirrm share/gnome/help/gnome-feedback/es
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/eu
+@dirrm share/gnome/help/fdl/es
 @comment in gnome2-dirs: @dirrm share/gnome/help/fdl/C
 @comment in gnome2-dirs: @dirrm share/gnome/help/fdl
 @comment in gnome2-dirs: @dirrm share/gnome/help
diff --git a/x11/gnome-desktop/buildlink3.mk b/x11/gnome-desktop/buildlink3.mk
index 0cca39ca17a..651839f0401 100644
--- a/x11/gnome-desktop/buildlink3.mk
+++ b/x11/gnome-desktop/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2005/08/21 11:26:47 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/10/12 21:52:01 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_DESKTOP_BUILDLINK3_MK:=	${GNOME_DESKTOP_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome-desktop}
 BUILDLINK_PACKAGES+=	gnome-desktop
 
 .if !empty(GNOME_DESKTOP_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.10.0
+BUILDLINK_DEPENDS.gnome-desktop+=	gnome-desktop>=2.12.1
 BUILDLINK_PKGSRCDIR.gnome-desktop?=	../../x11/gnome-desktop
 .endif	# GNOME_DESKTOP_BUILDLINK3_MK
 
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index b8a6c1bdb95..4d771724ea4 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2005/08/24 08:49:30 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2005/10/12 21:52:01 jmmv Exp $
 
-SHA1 (gnome-desktop-2.10.2.tar.bz2) = 0d769590b4af44c77fea9d455d503d77fdc52db9
-RMD160 (gnome-desktop-2.10.2.tar.bz2) = 6804087b24bf67ddc9fc48b962a24824a758b633
-Size (gnome-desktop-2.10.2.tar.bz2) = 985248 bytes
+SHA1 (gnome-desktop-2.12.1.tar.bz2) = 6eac1fa43f9f26c1f8b2d26bbf06be8a41aa3b78
+RMD160 (gnome-desktop-2.12.1.tar.bz2) = 1dead489bb30d63a2e2a145a9a7c436c509a47ef
+Size (gnome-desktop-2.12.1.tar.bz2) = 1033105 bytes
 SHA1 (patch-ag) = ad8d3466bdfe18c1b853ba69f863db35a5891996