update to 2.32.1

This switches to the gnome-2.32 release branch.

3 files changed, 16 insertions, 10 deletions

diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index e3c808d6dab..a6df49046d8 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2010/11/15 22:58:33 abs Exp $
+# $NetBSD: Makefile,v 1.22 2010/11/24 20:51:19 drochner Exp $
 #
 
-DISTNAME=	gnome-settings-daemon-2.30.2
-PKGREVISION=	2
+DISTNAME=	gnome-settings-daemon-2.32.1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-settings-daemon/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -26,6 +25,7 @@ GCONF_SCHEMAS+=	apps_gnome_settings_daemon_keybindings.schemas
 GCONF_SCHEMAS+=	apps_gnome_settings_daemon_xrandr.schemas
 GCONF_SCHEMAS+=	apps_gnome_settings_daemon_housekeeping.schemas
 GCONF_SCHEMAS+=	desktop_gnome_peripherals_touchpad.schemas
+GCONF_SCHEMAS+=	desktop_gnome_peripherals_smartcard.schemas
 PKGCONFIG_OVERRIDE+=	data/gnome-settings-daemon.pc.in
 
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.3
diff --git a/sysutils/gnome-settings-daemon/PLIST b/sysutils/gnome-settings-daemon/PLIST
index 49052db9b6a..91f1f353947 100644
--- a/sysutils/gnome-settings-daemon/PLIST
+++ b/sysutils/gnome-settings-daemon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2010/07/14 16:17:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/11/24 20:51:19 drochner Exp $
 include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-plugin.h
 lib/gnome-settings-daemon-2.0/a11y-keyboard.gnome-settings-plugin
@@ -36,13 +36,19 @@ share/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
 share/gconf/schemas/apps_gnome_settings_daemon_xrandr.schemas
 share/gconf/schemas/desktop_gnome_font_rendering.schemas
 share/gconf/schemas/desktop_gnome_keybindings.schemas
+share/gconf/schemas/desktop_gnome_peripherals_smartcard.schemas
 share/gconf/schemas/desktop_gnome_peripherals_touchpad.schemas
 share/gconf/schemas/gnome-settings-daemon.schemas
 share/gnome-control-center/keybindings/50-accessibility.xml
 share/gnome-settings-daemon/acme.ui
 share/gnome-settings-daemon/gsd-a11y-preferences-dialog.ui
+share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-capslock-off.png
+share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-capslock-on.png
+share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-off.png
+share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-numlock-on.png
+share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-off.png
+share/gnome-settings-daemon/icons/hicolor/64x64/devices/kbd-scrolllock-on.png
 share/gnome-settings-daemon/modmap-dialog.ui
-share/gnome-settings-daemon/show-layout.ui
 share/gnome-settings-daemon/xrdb/Editres.ad
 share/gnome-settings-daemon/xrdb/Emacs.ad
 share/gnome-settings-daemon/xrdb/General.ad
diff --git a/sysutils/gnome-settings-daemon/distinfo b/sysutils/gnome-settings-daemon/distinfo
index 1a2ada2cc78..bafc44fb555 100644
--- a/sysutils/gnome-settings-daemon/distinfo
+++ b/sysutils/gnome-settings-daemon/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2010/07/14 16:17:41 drochner Exp $
+$NetBSD: distinfo,v 1.12 2010/11/24 20:51:19 drochner Exp $
 
-SHA1 (gnome-settings-daemon-2.30.2.tar.bz2) = 75fe75eaa7d6197514c1de8b8c47c869f2bade2c
-RMD160 (gnome-settings-daemon-2.30.2.tar.bz2) = a4547cdb13c2c5dc8f690cf198853129514adaab
-Size (gnome-settings-daemon-2.30.2.tar.bz2) = 1250365 bytes
+SHA1 (gnome-settings-daemon-2.32.1.tar.bz2) = f2550acb4a9fd8f96ead1263ba5739915c303f6e
+RMD160 (gnome-settings-daemon-2.32.1.tar.bz2) = 71aef9419eeca5f9fa59bb55990327c307f9ca31
+Size (gnome-settings-daemon-2.32.1.tar.bz2) = 1331850 bytes
 SHA1 (patch-ac) = 6e77934d2ad8a75a0b476cf26a3ec72ea8160b23