Update to 2.6.1:

  Fixes
	* Fix a crash with the logout dialog on multi-screen setups (Mark)

  Translators
	* Zuza Software Foundation (af)
	* Hizkuntza Politikarako Sailburuordetza (eu)
	* Guntupalli Karunakar (gu)
	* John C Barstow (mi)

4 files changed, 20 insertions, 17 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index ab65d1aac25..98466a4979d 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2004/04/14 16:15:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.39 2004/05/15 16:41:58 jmmv Exp $
 #
 
-DISTNAME=		gnome-session-2.6.0
+DISTNAME=		gnome-session-2.6.1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.6/}
 SITES_gnome-splash-2.6.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST
index 577201558fb..6f2e785a9d1 100644
--- a/x11/gnome-session/PLIST
+++ b/x11/gnome-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/04/01 18:48:11 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/05/15 16:41:58 jmmv Exp $
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
@@ -15,6 +15,7 @@ share/control-center-2.0/capplets/session-properties.desktop
 share/gconf/schemas/gnome-session.schemas
 share/gnome/default.session
 share/gnome/default.wm
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-session-2.0.mo
@@ -39,6 +40,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-session-2.0.mo
@@ -51,6 +53,7 @@ ${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-session-2.0.mo
+${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gnome-session-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 9aad064a181..f40ca1c336a 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2004/04/01 18:48:11 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2004/05/15 16:41:58 jmmv Exp $
 
-SHA1 (gnome-session-2.6.0.tar.bz2) = 0f01ba17747cb4da23ec5925acdc2b039f3eeba7
-Size (gnome-session-2.6.0.tar.bz2) = 836172 bytes
+SHA1 (gnome-session-2.6.1.tar.bz2) = 62e8f34af5e6e243b9df46573be22843c0bc86b1
+Size (gnome-session-2.6.1.tar.bz2) = 863210 bytes
 SHA1 (gnome-splash-2.6.0.png) = b4eb67f21208f2262c1e4e6b284115bfbe3f4590
 Size (gnome-splash-2.6.0.png) = 124455 bytes
-SHA1 (patch-aa) = 17add977c9edf787128ff1311fa83182bbe8c967
+SHA1 (patch-aa) = dad8d1a40dad19a9b7bc58e62a3777a8bea7abc3
diff --git a/x11/gnome-session/patches/patch-aa b/x11/gnome-session/patches/patch-aa
index f5983b78a2f..932ac787d09 100644
--- a/x11/gnome-session/patches/patch-aa
+++ b/x11/gnome-session/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2004/04/01 18:48:11 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2004/05/15 16:41:58 jmmv Exp $
 
---- gnome-session/Makefile.in.orig	2004-03-09 11:59:34.000000000 +0100
+--- gnome-session/Makefile.in.orig	2004-04-19 16:29:22.000000000 +0200
 +++ gnome-session/Makefile.in
-@@ -164,7 +164,7 @@ INCLUDES = \
- 	-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""	\
- 	-DHALT_COMMAND=\""$(HALT_COMMAND)\""		\
- 	-DRSH_COMMAND=\""$(RSH_COMMAND)\""		\
--	-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""		\
-+	-DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""		\
- 	-DDEFAULTDIR="\"$(defaultdir)\""		\
- 	-DESD_SERVER="\"$(ESD_SERVER)\""
+@@ -155,7 +155,7 @@ NULL = 
  
+ defaultdir = $(datadir)/gnome
+ 
+-INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						$(DISABLE_DEPRECATED_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\""		-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\"	    	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DRSH_COMMAND=\""$(RSH_COMMAND)\""			-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""			-DDEFAULTDIR="\"$(defaultdir)\""			-DESD_SERVER="\"$(ESD_SERVER)\""
++INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						$(DISABLE_DEPRECATED_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\""		-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\"	    	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DRSH_COMMAND=\""$(RSH_COMMAND)\""			-DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""			-DDEFAULTDIR="\"$(defaultdir)\""			-DESD_SERVER="\"$(ESD_SERVER)\""
+ 
+ 
+ # Used by the GNOME_PROGRAM_STANDARD_PROPERTIES macros