Update to 2.8.0. This version corresponds to GNOME 2.8.0.

gnome-control-center 2.8.0

Jody Goldberg
 * Fixed float/int mismatch in peditor

Jonathan Blandford
 * Fix docs link for at-properties capplet.

Pierre Ossman
 * display the volume dialog in the correct place

Sergey V. Udaltsov
 * default switchcut (Alt*2) is introduced

Translations:
 * All translations updated

------------------------------------------------------------------------------
gnome-control-center 2.7.1

Translations:
 * Bosnian translation added.

Frederic Crozat:
 * Use themed icon for windows

Rodney Dawes:
 * Add "W x H pixels" to description, and remove file size for bg capplet

Sergey:
 * Fixes to keybinding capplet

Kjartan Maraas:
 * text cleanup

Jeroen Zwartepoorte:
 * Use the parent type in the G_DEFINE_TYPE

------------------------------------------------------------------------------
gnome-control-center 2.7.0
    * No NEWS file updates this time due to time pressures.  2.7.1
    should have a full change.

5 files changed, 15 insertions, 26 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 910e01a498c..23539602665 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2004/06/26 15:46:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2004/09/21 16:56:18 jmmv Exp $
 #
 
-DISTNAME=	control-center-2.6.1
+DISTNAME=	control-center-2.8.0
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.8/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index e36f3c97981..ea523eca185 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2004/05/15 15:00:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/09/21 16:56:18 jmmv Exp $
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
 bin/gnome-control-center
 bin/gnome-default-applications-properties
 bin/gnome-display-properties
-bin/gnome-file-types-properties
 bin/gnome-font-properties
 bin/gnome-font-viewer
 bin/gnome-keybinding-properties
@@ -53,7 +52,6 @@ share/control-center-2.0/capplets/at-properties.desktop
 share/control-center-2.0/capplets/background.desktop
 share/control-center-2.0/capplets/default-applications.desktop
 share/control-center-2.0/capplets/display-properties.desktop
-share/control-center-2.0/capplets/file-types.desktop
 share/control-center-2.0/capplets/font-properties.desktop
 share/control-center-2.0/capplets/gnome-network-preferences.desktop
 share/control-center-2.0/capplets/gnome-settings-mouse.desktop
@@ -67,7 +65,6 @@ share/control-center-2.0/icons/display-capplet.png
 share/control-center-2.0/interfaces/acme.glade
 share/control-center-2.0/interfaces/apply-font.glade
 share/control-center-2.0/interfaces/at-enable-dialog.glade
-share/control-center-2.0/interfaces/file-types-properties.glade
 share/control-center-2.0/interfaces/font-properties.glade
 share/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
 share/control-center-2.0/interfaces/gnome-background-properties.glade
@@ -150,6 +147,7 @@ ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/control-center-2.0.mo
@@ -182,6 +180,7 @@ ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/control-center-2.0.mo
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index 1259a06804b..3b2669baeac 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/04/01 18:40:09 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/09/21 16:56:18 jmmv Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 GNOME2_CONTROL_CENTER_BUILDLINK3_MK:=	${GNOME2_CONTROL_CENTER_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngnome2-control-center}
 BUILDLINK_PACKAGES+=	gnome2-control-center
 
 .if !empty(GNOME2_CONTROL_CENTER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.6.0
+BUILDLINK_DEPENDS.gnome2-control-center+=	gnome2-control-center>=2.8.0
 BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 .endif	# GNOME2_CONTROL_CENTER_BUILDLINK3_MK
 
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 74e80bd9a43..b66a1e37a83 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2004/06/26 15:46:52 jmmv Exp $
+$NetBSD: distinfo,v 1.13 2004/09/21 16:56:18 jmmv Exp $
 
-SHA1 (control-center-2.6.1.tar.bz2) = a7e367e24c65dcde65b36f014945acfb1261667d
-Size (control-center-2.6.1.tar.bz2) = 2487807 bytes
+SHA1 (control-center-2.8.0.tar.bz2) = 0b0a409b51d86af38215b95739caa33a126c8140
+Size (control-center-2.8.0.tar.bz2) = 2732757 bytes
 SHA1 (patch-ab) = 15d24efe8e39d948b5663e641f47ea41b815e17d
 SHA1 (patch-ac) = e2df2c5ffc0841f409985eafbafb96c5c9a5551a
-SHA1 (patch-ad) = 7177bd7d915fd2d8fa43f0fb614aa61afab61722
+SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
diff --git a/x11/gnome2-control-center/patches/patch-ad b/x11/gnome2-control-center/patches/patch-ad
index c08c7ab7d33..6cf652a3c32 100644
--- a/x11/gnome2-control-center/patches/patch-ad
+++ b/x11/gnome2-control-center/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2004/06/26 15:46:52 jmmv Exp $
+$NetBSD: patch-ad,v 1.3 2004/09/21 16:56:18 jmmv Exp $
 
---- configure.orig	2004-04-15 18:59:14.000000000 +0200
+--- configure.orig	2004-08-30 01:56:22.000000000 +0200
 +++ configure
-@@ -23220,7 +23220,7 @@ if test `eval echo '${'$as_ac_Header'}'`
+@@ -23083,7 +23083,7 @@ if test `eval echo '${'$as_ac_Header'}'`
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  _ACEOF
@@ -11,12 +11,3 @@ $NetBSD: patch-ad,v 1.2 2004/06/26 15:46:52 jmmv Exp $
  fi
  
  done
-@@ -25958,6 +25958,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- 	#ifdef __NetBSD__
-+	#include <sys/param.h>
-+	#include <sys/sysctl.h>
- 	#include <soundcard.h>
- 	#else
- 	#include <sys/soundcard.h>