Update to 2.6.0. Changes since previous stable version (2.4.x):

2.6.0:
* Translations:
	- Added Punjabi translation (Amanpreet Singh Alam)
	- Updated Hungarian translation (Andras Timar)
        - Added British translation (Gareth Owen)

2.5.92:
* Translations:
	- Updated Croatian translation (Robert Sedak)
	- Added Canadian English translation (Alexander Winston)
	- Updated Ukrainian translation (Maxim Dziumanenko)
	- Updated Thai translation (Theppitak Karoonboonyanan)

2.5.91:
* Fixes:
	- Show key documentation even if it has been modified (Bug #121813,
	  Fernando Herrera)

2.5.4:
* Fixes:
	- Fix a crash when deleting keys (Bugs #105884 and #124662, Sanjiv
	  Agarwala)
	- Copy path if no key is slected (Bug #132085, Fernando Herrera)
	- Fix a crash with NULLs nodes (Bug #128272, Fernando Herrea)
	- Unify copyright strings (Bug #101728, Christian Neumair)
	- Handle escaping of keys correctly (Bug #96744, Hidetoshi
	  Tajima)
	- Removed final "," in enums (Fernando Herrera)

* Improvements:
	- Update statusbar on key selection (Fernando Herrera)
	- Added man page (Sebastien Bacher)

2.5.1:
* Fixes:
	- Fix a crash with unset values (Bug #121084, Sebastien Bacher)
	- Added float support to the list editor, fixing a crash (Ross Burton)
	- Remove the GTK_DISABLE_DEPRECATED flag (Bug #123932, Arvind Samptur)

* Improvements:
	- Set the cursor to GDK_WATCH while we are figuring
	  out the child nodes (Federico Mena Quintero)
	- Expand tree items when double clicked (Christophe Fergeau)

3 files changed, 14 insertions, 8 deletions

diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index c53d9b538e4..0d4a8fcd6b1 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2004/03/08 19:40:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/01 18:51:26 jmmv Exp $
 #
 
-DISTNAME=		gconf-editor-2.4.0
-PKGREVISION=		4
+DISTNAME=		gconf-editor-2.6.0
 CATEGORIES=		editors gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gconf-editor/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		sab@posix.org.uk
diff --git a/editors/gconf-editor/PLIST b/editors/gconf-editor/PLIST
index f8fc84f729c..75048237e66 100644
--- a/editors/gconf-editor/PLIST
+++ b/editors/gconf-editor/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/16 23:20:05 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/01 18:51:26 jmmv Exp $
 bin/gconf-editor
+man/man1/gconf-editor.1
 share/applications/gconf-editor.desktop
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gconf-editor.mo
@@ -13,6 +14,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gconf-editor.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gconf-editor.mo
@@ -22,6 +24,7 @@ ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gconf-editor.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gconf-editor.mo
@@ -34,9 +37,11 @@ ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gconf-editor.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gconf-editor.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gconf-editor.mo
@@ -49,6 +54,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/gconf-editor.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gconf-editor.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gconf-editor.mo
@@ -65,4 +71,5 @@ share/pixmaps/gconf-editor/folder-closed.png
 share/pixmaps/gconf-editor/folder-open.png
 share/pixmaps/gconf-editor/stock-about-16.png
 @dirrm share/pixmaps/gconf-editor
+@comment in xdg-dirs: share/pixmaps
 @comment in xdg-dirs: share/applications
diff --git a/editors/gconf-editor/distinfo b/editors/gconf-editor/distinfo
index 5646d425b26..50f30e41700 100644
--- a/editors/gconf-editor/distinfo
+++ b/editors/gconf-editor/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/12/15 00:06:12 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/04/01 18:51:26 jmmv Exp $
 
-SHA1 (gconf-editor-2.4.0.tar.bz2) = 685603b099ea04ecf91b77de88c88c21724caf64
-Size (gconf-editor-2.4.0.tar.bz2) = 352468 bytes
+SHA1 (gconf-editor-2.6.0.tar.bz2) = 5be993449d65c216d005499c2203d157a662fadb
+Size (gconf-editor-2.6.0.tar.bz2) = 372032 bytes