Update to 2.6.2.

Changes since 2.6.1:

      * Swapped About and Help (Jorn Baayen)
      * Fixed cddb-slave2 documentation link (Kaushal Kumar)

Bugs fixed since 2.6.1:

      * 140344: use gnome-common (Christian Neumair)
      * 141406: use a colorspace convertor from gst-plugins
      * 137198: install gstreamer-properties correctly (Julio Vidal)
      * 125409: redraw display text when style changes (Leena Gunda)
      * 137464: use gtk_icon_theme in recorder (Fernando Herrera)
      * 141985: also check .cddb entries (Thomas)
      * 114015: Fix display of unknown entries (Thomas)
      * 124924: Initialize pointers (Thomas)
      * 119596: Differentiate between audio and data cd (Balamurali Viswanathan)
      * 139555: Make CD playback stop when application exits (Richard Kinder)

Changes since 2.6.0:

      * Added Gujarati translation (Guntupalli Karunakar)
      * Fixed mixer icons for ALSA (Ronald Bultje)

Bugs fixed since 2.6.0:

      * 133217: Underquoted definitions in acinclude.m4
      * 134094: Small g_print errors

4 files changed, 8 insertions, 24 deletions

diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 057f01f0d13..2683e3af88b 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2004/04/14 16:15:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/15 16:34:10 jmmv Exp $
 
-DISTNAME=		gnome-media-2.6.0
-PKGREVISION=		1
+DISTNAME=		gnome-media-2.6.2
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-media/2.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -14,7 +13,7 @@ BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
-USE_DIRS+=		xdg-1.1
+USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/multimedia/gnome2-media/PLIST b/multimedia/gnome2-media/PLIST
index e238700056e..e6d8dfafe00 100644
--- a/multimedia/gnome2-media/PLIST
+++ b/multimedia/gnome2-media/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/02 05:51:03 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/15 16:34:10 jmmv Exp $
 bin/cddb-slave2-properties
 bin/gnome-audio-profiles-properties
 bin/gnome-cd
@@ -330,6 +330,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-media-2.0.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-media-2.0.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-media-2.0.mo
diff --git a/multimedia/gnome2-media/distinfo b/multimedia/gnome2-media/distinfo
index 1c5366adbeb..e5bbd284f48 100644
--- a/multimedia/gnome2-media/distinfo
+++ b/multimedia/gnome2-media/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2004/04/17 15:04:31 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2004/05/15 16:34:10 jmmv Exp $
 
-SHA1 (gnome-media-2.6.0.tar.bz2) = 41f64e9c800df461133a1eac8853954c1bdb5da2
-Size (gnome-media-2.6.0.tar.bz2) = 2943852 bytes
-SHA1 (patch-aa) = 8ba862f280caec8295b95f84b7f53c0fbd2f04a7
+SHA1 (gnome-media-2.6.2.tar.bz2) = 06dfe66ecbb462bd07930d706fd897aa532bccf2
+Size (gnome-media-2.6.2.tar.bz2) = 2970530 bytes
 SHA1 (patch-ag) = 114ddd8d95bf4b2e471d3bc13308aa03cef7dd1a
 SHA1 (patch-ai) = 5eb11da18015ac4d4c3a85bc38b75e59f1890a7e
diff --git a/multimedia/gnome2-media/patches/patch-aa b/multimedia/gnome2-media/patches/patch-aa
deleted file mode 100644
index cccc71efa58..00000000000
--- a/multimedia/gnome2-media/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/04/02 05:51:03 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=137198
-
---- gstreamer-properties/Makefile.in.orig	2004-03-09 09:19:42.000000000 +0100
-+++ gstreamer-properties/Makefile.in
-@@ -239,7 +239,7 @@ desktop_icons_DATA = gstreamer-propertie
- gladedir = $(datadir)/gstreamer-properties/glade
- glade_DATA = gstreamer-properties.glade 
- 
--desktopdir = $(datadir)/applications
-+desktopdir = $(datadir)/control-center-2.0/capplets
- Desktop_in_files = gstreamer-properties.desktop.in
- desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
-