update to 2.32.0

This switches to the gnome-2.32 release branch.

3 files changed, 12 insertions, 11 deletions

diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index ec25da78082..7ffe69586a8 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2010/11/15 22:59:04 abs Exp $
+# $NetBSD: Makefile,v 1.26 2010/11/24 20:37:33 drochner Exp $
 #
 
-DISTNAME=	libgnomekbd-2.30.2
-PKGREVISION=	2
+DISTNAME=	libgnomekbd-2.32.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -25,8 +24,6 @@ PKGCONFIG_OVERRIDE+=	libgnomekbd.pc.in
 PKGCONFIG_OVERRIDE+=	libgnomekbdui.pc.in
 
 .include "../../devel/GConf/schemas.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=4.0
 .include "../../x11/libxklavier/buildlink3.mk"
diff --git a/x11/libgnomekbd/PLIST b/x11/libgnomekbd/PLIST
index 206c8b7c789..72e5071f81a 100644
--- a/x11/libgnomekbd/PLIST
+++ b/x11/libgnomekbd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2010/07/14 16:16:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/11/24 20:37:33 drochner Exp $
 bin/gkbd-indicator-plugins-capplet
 include/libgnomekbd/gkbd-desktop-config.h
 include/libgnomekbd/gkbd-indicator-config.h
@@ -16,6 +16,7 @@ share/applications/gkbd-indicator-plugins-capplet.desktop
 share/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
 share/libgnomekbd/ui/gkbd-indicator-plugins.ui
 share/libgnomekbd/ui/gkbd-indicator-plugins_add.ui
+share/libgnomekbd/ui/show-layout.ui
 share/locale/ar/LC_MESSAGES/libgnomekbd.mo
 share/locale/as/LC_MESSAGES/libgnomekbd.mo
 share/locale/ast/LC_MESSAGES/libgnomekbd.mo
@@ -32,6 +33,7 @@ share/locale/dz/LC_MESSAGES/libgnomekbd.mo
 share/locale/el/LC_MESSAGES/libgnomekbd.mo
 share/locale/en@shaw/LC_MESSAGES/libgnomekbd.mo
 share/locale/en_GB/LC_MESSAGES/libgnomekbd.mo
+share/locale/eo/LC_MESSAGES/libgnomekbd.mo
 share/locale/es/LC_MESSAGES/libgnomekbd.mo
 share/locale/et/LC_MESSAGES/libgnomekbd.mo
 share/locale/eu/LC_MESSAGES/libgnomekbd.mo
@@ -43,6 +45,7 @@ share/locale/gu/LC_MESSAGES/libgnomekbd.mo
 share/locale/he/LC_MESSAGES/libgnomekbd.mo
 share/locale/hi/LC_MESSAGES/libgnomekbd.mo
 share/locale/hu/LC_MESSAGES/libgnomekbd.mo
+share/locale/id/LC_MESSAGES/libgnomekbd.mo
 share/locale/it/LC_MESSAGES/libgnomekbd.mo
 share/locale/ja/LC_MESSAGES/libgnomekbd.mo
 share/locale/ka/LC_MESSAGES/libgnomekbd.mo
@@ -54,6 +57,7 @@ share/locale/mai/LC_MESSAGES/libgnomekbd.mo
 share/locale/mk/LC_MESSAGES/libgnomekbd.mo
 share/locale/ml/LC_MESSAGES/libgnomekbd.mo
 share/locale/mr/LC_MESSAGES/libgnomekbd.mo
+share/locale/ms/LC_MESSAGES/libgnomekbd.mo
 share/locale/nb/LC_MESSAGES/libgnomekbd.mo
 share/locale/nl/LC_MESSAGES/libgnomekbd.mo
 share/locale/nn/LC_MESSAGES/libgnomekbd.mo
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index f5927aed122..db2f5a15cc8 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2010/07/14 16:16:49 drochner Exp $
+$NetBSD: distinfo,v 1.13 2010/11/24 20:37:33 drochner Exp $
 
-SHA1 (libgnomekbd-2.30.2.tar.bz2) = 474acc0ae87ac8eccadbf48b60fad885f9e271f7
-RMD160 (libgnomekbd-2.30.2.tar.bz2) = fc1d96bf48283cbe0379a019d2aa3307f77e4f13
-Size (libgnomekbd-2.30.2.tar.bz2) = 405388 bytes
+SHA1 (libgnomekbd-2.32.0.tar.bz2) = 8401db5d7888185fb3a5855f316771aa09865403
+RMD160 (libgnomekbd-2.32.0.tar.bz2) = 5ecca30979373f746224693c6b9ff8b6fe2a8e18
+Size (libgnomekbd-2.32.0.tar.bz2) = 410928 bytes
 SHA1 (patch-aa) = 7be6e43e63a4701b38052e08a06129a064094cde
 SHA1 (patch-ab) = cc148a31666c05a80edc2baf608d72a1a0ccec98
 SHA1 (patch-ad) = 5cb43be430334d9a1f1c6888012ff9b9395f3126