Update to 2.10.0:

==============
Version 2.10.0
==============

  Misc

	* New splash screen (Sami "alump" Viitanen)
        * Improved schemas string (Byran Clark, Kjartan Maraas)

  Translators

	* Vladimir \"Kaladan\" Petkov (bg)
	* Jordi Mallach (ca)
	* Miloslav Trmac (cs)
	* Martin Willemoes Hansen (da)
	* Frank Arnold (de)
	* Kostas Papadimas (el)
	* Adam Weinberger (en_CA)
	* David Lodge (en_GB)
	* Francisco Javier F. Serrador (es)
	* Ivar Smolin (et)
	* Pauli Virtanen (fi)
	* Christophe Merlet (RedFox) (fr)
	* Ankit Patel (gu)
	* Gil Osher (he)
	* Gabor Kelemen (hu)
	* Luca Ferretti (it)
	* Takeshi AIHANA (ja)
	* Changwoo Ryu (ko)
	* Žygimantas Beručka (lt)
	* Kjartan Maraas (nb)
	* Tino Meinen (nl)
	* Åsmund Skjæveland (nn)
	* Kjartan Maraas (no)
	* GNOME PL Team (pl)
	* Evandro Fernandes Giovanini (pt_BR)
	* Duarte Loreto (pt)
	* Mişu Moldovan (ro)
	* Leonid Kanter (ru)
	* Marcel Telka (sk)
	* Laurent Dhima (sq)
	* Данило Шеган (sr)
	* Christian Rose (sv)
	* Theppitak Karoonboonyanan (th)
	* Maxim Dziumanenko (uk)
	* Simon Kemisho (xh)
	* Wang Jian (zh_CN)
	* Woodman Tuen (zh_TW)

=============
Version 2.9.4
=============

  Session Manager

	* Use GDM's logout actions protocol to shutdown/reboot (Raffaele Sandrini, Mark)
	* Change "Prompt" to "Ask" in the configuration dialog (Vincent Noel)
	* Fix compiler warnings (Jens Granseuer)
	* Slave the lifecycle of the keyring daemon to the session (Alex Larsson)

  Translators

	* Jordi Mallach (ca)
	* Miloslav Trmac (cs)
	* Adam Weinberger (en_CA)
	* Francisco Javier F. Serrador (es)
	* Kjartan Maraas (nb)
	* Kjartan Maraas (no)
	* Laurent Dhima (sq)
	* Christian Rose (sv)
	* Zuza Software Foundation (zu)

=============
Version 2.9.2
=============

  Misc

	* Add X-GNOME-Bugzilla-Version to .desktop file (Christoffer Olsen)
	* Install .desktop file in $(datadir)/applications (Mark)

  Translators

	* Martin Willemoes Hansen (da)
	* Zuza Software Foundation (nso)

5 files changed, 20 insertions, 90 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index c036ad1f549..6d5e1e8e2da 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.47 2005/02/13 23:30:07 recht Exp $
+# $NetBSD: Makefile,v 1.48 2005/03/22 16:21:26 jmmv Exp $
 #
 
-DISTNAME=		gnome-session-2.8.1
-PKGREVISION=		2
+DISTNAME=		gnome-session-2.10.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.8/}
-SITES_gnome-splash-2.8.0.1.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.10/}
+SITES_gnome-splash-2.10.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
 EXTRACT_SUFX=		.tar.bz2
-DISTFILES=		${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.8.0.1.png
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.10.0.png
 
 MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
@@ -43,6 +42,7 @@ BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.3nb1
 .include "../../devel/GConf2-ui/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
@@ -53,7 +53,7 @@ BUILDLINK_DEPENDS.gnome-vfs2+=	gnome-vfs2>=2.8.3nb1
 post-extract:
 	${MV} ${WRKSRC}/gnome-session/gnome-splash.png \
 	    ${WRKSRC}/gnome-session/gnome-splash-orig.png
-	${CP} ${DISTDIR}/gnome-splash-2.8.0.1.png \
+	${CP} ${DISTDIR}/gnome-splash-2.10.0.png \
 	    ${WRKSRC}/gnome-session/gnome-splash.png
 
 post-install:
diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST
index 7f9147f2fdd..f13c642e69f 100644
--- a/x11/gnome-session/PLIST
+++ b/x11/gnome-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/09/21 16:58:42 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/22 16:21:26 jmmv Exp $
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
@@ -11,7 +11,7 @@ man/man1/gnome-smproxy.1
 man/man1/gnome-wm.1
 man/man1/session-properties.1
 man/man5/default.session.5
-share/control-center-2.0/capplets/session-properties.desktop
+share/applications/session-properties.desktop
 share/gconf/schemas/gnome-session.schemas
 share/gnome/default.session
 share/gnome/default.wm
@@ -64,6 +64,7 @@ ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/nso/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
@@ -83,12 +84,14 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
 share/pixmaps/splash/gnome-splash-orig.png
 share/pixmaps/splash/gnome-splash.png
 @dirrm share/pixmaps/splash
 @comment in xdg-dirs: @dirrm share/pixmaps
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
-@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 1bab2138c7b..857f933726a 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.18 2005/02/23 17:36:11 wiz Exp $
+$NetBSD: distinfo,v 1.19 2005/03/22 16:21:26 jmmv Exp $
 
-SHA1 (gnome-session-2.8.1.tar.bz2) = 0766a65f3b9de1b3266018da2c8f0fe0465e8f23
-RMD160 (gnome-session-2.8.1.tar.bz2) = 9928d812c05a316d5fe7d447f4564e181b6fa7f7
-Size (gnome-session-2.8.1.tar.bz2) = 883921 bytes
-SHA1 (gnome-splash-2.8.0.1.png) = c278e7fd1eb487b1905cedf0bb62e2672ba0e6f8
-RMD160 (gnome-splash-2.8.0.1.png) = 4cd28660148beaf150b153b7fa9a726fc6c6c28d
-Size (gnome-splash-2.8.0.1.png) = 115672 bytes
+SHA1 (gnome-session-2.10.0.tar.bz2) = 51f5c23025e664f22f1d1a07a35faf2816895a3f
+RMD160 (gnome-session-2.10.0.tar.bz2) = 263969c6ad6e0baa4c7cb451605223c62f7c75b1
+Size (gnome-session-2.10.0.tar.bz2) = 796754 bytes
+SHA1 (gnome-splash-2.10.0.png) = 6122762cdf20f4045c0f575b2a50227cac022e00
+RMD160 (gnome-splash-2.10.0.png) = 8ee358de34506dbc044f356ea51b3e5819a00806
+Size (gnome-splash-2.10.0.png) = 40412 bytes
 SHA1 (patch-aa) = 6cdba04e00c439858b428dd275fff1c0c263534f
 SHA1 (patch-ab) = 7287c9f0a921f2dfe28373027a4f3564d58e5ac8
-SHA1 (patch-ac) = 45c0b5fcdef56b2286dbf84e73e924f5ad74bc6d
-SHA1 (patch-ae) = 36c909fcd0da338c692a49bf3a95e8867efac197
diff --git a/x11/gnome-session/patches/patch-ac b/x11/gnome-session/patches/patch-ac
deleted file mode 100644
index df58aaf515d..00000000000
--- a/x11/gnome-session/patches/patch-ac
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2004/11/19 19:59:14 jmmv Exp $
-
---- gnome-session/logout.c.orig	2004-07-19 20:11:14.000000000 +0200
-+++ gnome-session/logout.c
-@@ -37,12 +37,20 @@
- 
- static gchar *halt_command[] =
- {
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+  "/sbin/shutdown", "-p", "now", NULL
-+#else
-   HALT_COMMAND, NULL
-+#endif
- };
- 
- static gchar *reboot_command[] =
- {
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+  "/sbin/shutdown", "-r", "now", NULL
-+#else
-   REBOOT_COMMAND, NULL
-+#endif
- };
- 
- /* What action to take upon shutdown */
-@@ -298,6 +306,7 @@ display_gui (void)
-   GtkWidget *reboot = NULL;
-   GtkWidget *invisible;
-   gboolean   retval = FALSE;
-+  gboolean can_shutdown = FALSE;
-   gboolean save_active = FALSE;
-   gboolean halt_active = FALSE;
-   gboolean reboot_active = FALSE;
-@@ -392,6 +401,7 @@ display_gui (void)
- 			  FALSE, TRUE, 0);
-     }
- 
-+#if defined(__linux__)
-   /* Red Hat specific code to check if the user has a
-    * good chance of being able to shutdown the system,
-    * and if so, give them that option
-@@ -400,6 +410,13 @@ display_gui (void)
-   t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL);
-   if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) &&
-       access (halt_command[0], X_OK) == 0)
-+    can_shutdown = TRUE;
-+#else
-+  if (access (halt_command[0], X_OK) == 0)
-+    can_shutdown = TRUE;
-+#endif
-+
-+  if (can_shutdown)
-     {
-       GtkWidget *title, *spacer;
-       GtkWidget *action_vbox, *hbox;
diff --git a/x11/gnome-session/patches/patch-ae b/x11/gnome-session/patches/patch-ae
deleted file mode 100644
index c8fd35e1321..00000000000
--- a/x11/gnome-session/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/12/08 02:13:39 taca Exp $
-
---- gnome-session/manager.c.orig	Fri Oct  1 19:13:23 2004
-+++ gnome-session/manager.c
-@@ -1042,9 +1042,10 @@ no_response_warning (gpointer data)
- 
-       if (interact_ping_replied)
- 	{
-+	  IceConn ice_conn;
- 	  gsm_verbose ("have interact_list; sending ping with data to client %p\n", client);
- 	  print_client (client);
--	  IceConn ice_conn = SmsGetIceConnection (client->connection);
-+	  ice_conn = SmsGetIceConnection (client->connection);
- 	  interact_ping_replied = FALSE;
- 	  IcePing (ice_conn, interact_ping_reply, (IcePointer)client);
- 	}