update to 2.20.1

This switches to the new gnome-2.20 branch.

This should also resolve PR pkg/37282 by Gilles Gravier.

3 files changed, 98 insertions, 109 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index a26622c30d1..70aa77f9a63 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.90 2007/09/21 13:04:30 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2007/11/05 11:44:06 drochner Exp $
 #
 
-DISTNAME=		gnome-panel-2.18.3
-PKGREVISION=		2
+DISTNAME=		gnome-panel-2.20.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
@@ -32,10 +31,9 @@ GCONF_SCHEMAS+=	window-list.schemas
 GCONF_ENTRIES=		panel-default-setup.entries
 
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.14.2
-BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.10.0
+BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.12.0
 BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.5.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.13.0
-BUILDLINK_API_DEPENDS.libwnck+=		libwnck>=2.13.5
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnome-panel
 PKG_SUPPORTED_OPTIONS=	evolution
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index 84e006534cd..3a27d4fbea4 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2007/09/25 10:54:23 hira Exp $
+@comment $NetBSD: PLIST,v 1.35 2007/11/05 11:44:06 drochner Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
@@ -37,13 +37,34 @@ share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
 share/gnome-2.0/ui/GNOME_WindowListApplet.xml
 share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
 share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+share/gnome-panel/glade/fish.glade
+share/gnome-panel/glade/panel-properties-dialog.glade
+share/gnome-panel/glade/panel-run-dialog.glade
+share/gnome-panel/glade/panel-test-applets.glade
+share/gnome-panel/glade/timezone.glade
+share/gnome-panel/glade/window-list.glade
+share/gnome-panel/glade/workspace-switcher.glade
+share/gnome-panel/pixmaps/fishanim.png
+share/gnome-panel/pixmaps/footguy.png
+share/gnome-panel/pixmaps/gnome-gegl2-2.png
+share/gnome-panel/pixmaps/gnome-gegl2.png
+share/gnome-panel/pixmaps/monkey.png
+share/gnome-panel/pixmaps/oldwanda.png
+share/gnome-panel/pixmaps/wanda.png
+share/gnome-panel/pixmaps/world_map-960.png
 share/gnome-panelrc
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
+share/gnome/help/clock/ca/clock.xml
+share/gnome/help/clock/ca/figures/clock_applet.png
+share/gnome/help/clock/ca/legal.xml
 share/gnome/help/clock/de/clock.xml
 share/gnome/help/clock/de/figures/clock_applet.png
 share/gnome/help/clock/de/legal.xml
+share/gnome/help/clock/el/clock.xml
+share/gnome/help/clock/el/figures/clock_applet.png
+share/gnome/help/clock/el/legal.xml
 share/gnome/help/clock/es/clock.xml
 share/gnome/help/clock/es/figures/clock_applet.png
 share/gnome/help/clock/es/legal.xml
@@ -62,6 +83,9 @@ share/gnome/help/clock/ko/legal.xml
 share/gnome/help/clock/nl/clock.xml
 share/gnome/help/clock/nl/figures/clock_applet.png
 share/gnome/help/clock/nl/legal.xml
+share/gnome/help/clock/oc/clock.xml
+share/gnome/help/clock/oc/figures/clock_applet.png
+share/gnome/help/clock/oc/legal.xml
 share/gnome/help/clock/pa/clock.xml
 share/gnome/help/clock/pa/figures/clock_applet.png
 share/gnome/help/clock/pa/legal.xml
@@ -90,10 +114,6 @@ share/gnome/help/fish-applet-2/de/legal.xml
 share/gnome/help/fish-applet-2/ja/figures/fish_applet.png
 share/gnome/help/fish-applet-2/ja/fish-applet-2.xml
 share/gnome/help/fish-applet-2/ja/legal.xml
-share/gnome/help/fish-applet-2/ko/figures/fish_applet.png
-share/gnome/help/fish-applet-2/ko/figures/fish_settings.png
-share/gnome/help/fish-applet-2/ko/fish-applet-2.xml
-share/gnome/help/fish-applet-2/ko/legal.xml
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png
 share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml
@@ -105,6 +125,12 @@ share/gnome/help/fish-applet-2/zh_TW/legal.xml
 share/gnome/help/fish/C/figures/fish_applet.png
 share/gnome/help/fish/C/fish.xml
 share/gnome/help/fish/C/legal.xml
+share/gnome/help/fish/ca/figures/fish_applet.png
+share/gnome/help/fish/ca/fish.xml
+share/gnome/help/fish/ca/legal.xml
+share/gnome/help/fish/el/figures/fish_applet.png
+share/gnome/help/fish/el/fish.xml
+share/gnome/help/fish/el/legal.xml
 share/gnome/help/fish/es/figures/fish_applet.png
 share/gnome/help/fish/es/fish.xml
 share/gnome/help/fish/es/legal.xml
@@ -114,105 +140,66 @@ share/gnome/help/fish/fr/legal.xml
 share/gnome/help/fish/it/figures/fish_applet.png
 share/gnome/help/fish/it/fish.xml
 share/gnome/help/fish/it/legal.xml
+share/gnome/help/fish/ko/figures/fish_applet.png
+share/gnome/help/fish/ko/fish.xml
+share/gnome/help/fish/ko/legal.xml
+share/gnome/help/fish/oc/figures/fish_applet.png
+share/gnome/help/fish/oc/fish.xml
+share/gnome/help/fish/oc/legal.xml
 share/gnome/help/fish/sv/figures/fish_applet.png
 share/gnome/help/fish/sv/fish.xml
 share/gnome/help/fish/sv/legal.xml
 share/gnome/help/fish/uk/figures/fish_applet.png
 share/gnome/help/fish/uk/fish.xml
 share/gnome/help/fish/uk/legal.xml
-share/gnome/help/window-list/C/figures/window_list_applet.png
-share/gnome/help/window-list/C/figures/window_list_group_applet.png
-share/gnome/help/window-list/C/legal.xml
 share/gnome/help/window-list/C/window-list.xml
+share/gnome/help/window-list/ca/window-list.xml
 share/gnome/help/window-list/de/figures/window_list_applet.png
 share/gnome/help/window-list/de/figures/window_list_group.png
 share/gnome/help/window-list/de/figures/window_list_group_applet.png
 share/gnome/help/window-list/de/legal.xml
 share/gnome/help/window-list/de/window-list.xml
-share/gnome/help/window-list/es/figures/window_list_applet.png
-share/gnome/help/window-list/es/figures/window_list_group_applet.png
-share/gnome/help/window-list/es/legal.xml
+share/gnome/help/window-list/el/window-list.xml
 share/gnome/help/window-list/es/window-list.xml
-share/gnome/help/window-list/fr/figures/window_list_applet.png
-share/gnome/help/window-list/fr/figures/window_list_group_applet.png
-share/gnome/help/window-list/fr/legal.xml
 share/gnome/help/window-list/fr/window-list.xml
-share/gnome/help/window-list/it/figures/window_list_applet.png
-share/gnome/help/window-list/it/figures/window_list_group_applet.png
-share/gnome/help/window-list/it/legal.xml
 share/gnome/help/window-list/it/window-list.xml
 share/gnome/help/window-list/ja/figures/window_list_applet.png
 share/gnome/help/window-list/ja/figures/window_list_group_applet.png
 share/gnome/help/window-list/ja/legal.xml
 share/gnome/help/window-list/ja/window-list.xml
-share/gnome/help/window-list/ko/figures/window_list_applet.png
-share/gnome/help/window-list/ko/figures/window_list_group.png
-share/gnome/help/window-list/ko/figures/window_list_group_applet.png
-share/gnome/help/window-list/ko/legal.xml
 share/gnome/help/window-list/ko/window-list.xml
-share/gnome/help/window-list/pa/figures/window_list_applet.png
-share/gnome/help/window-list/pa/figures/window_list_group_applet.png
-share/gnome/help/window-list/pa/legal.xml
+share/gnome/help/window-list/oc/window-list.xml
 share/gnome/help/window-list/pa/window-list.xml
-share/gnome/help/window-list/ru/figures/window_list_applet.png
-share/gnome/help/window-list/ru/figures/window_list_group_applet.png
-share/gnome/help/window-list/ru/legal.xml
 share/gnome/help/window-list/ru/window-list.xml
-share/gnome/help/window-list/sv/figures/window_list_applet.png
-share/gnome/help/window-list/sv/figures/window_list_group_applet.png
-share/gnome/help/window-list/sv/legal.xml
 share/gnome/help/window-list/sv/window-list.xml
-share/gnome/help/window-list/uk/figures/window_list_applet.png
-share/gnome/help/window-list/uk/figures/window_list_group_applet.png
-share/gnome/help/window-list/uk/legal.xml
 share/gnome/help/window-list/uk/window-list.xml
-share/gnome/help/window-list/zh_CN/figures/window_list_applet.png
-share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
-share/gnome/help/window-list/zh_CN/legal.xml
 share/gnome/help/window-list/zh_CN/window-list.xml
 share/gnome/help/window-list/zh_TW/figures/window_list_applet.png
 share/gnome/help/window-list/zh_TW/figures/window_list_group.png
 share/gnome/help/window-list/zh_TW/figures/window_list_group_applet.png
 share/gnome/help/window-list/zh_TW/legal.xml
 share/gnome/help/window-list/zh_TW/window-list.xml
-share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/C/legal.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
+share/gnome/help/workspace-switcher/ca/workspace-switcher.xml
 share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/de/legal.xml
 share/gnome/help/workspace-switcher/de/workspace-switcher.xml
-share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/es/legal.xml
+share/gnome/help/workspace-switcher/el/workspace-switcher.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
-share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/fr/legal.xml
 share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
-share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/it/legal.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
 share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/ja/legal.xml
 share/gnome/help/workspace-switcher/ja/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png
-share/gnome/help/workspace-switcher/ko/legal.xml
 share/gnome/help/workspace-switcher/ko/workspace-switcher.xml
-share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/nl/legal.xml
 share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
-share/gnome/help/workspace-switcher/pa/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/pa/legal.xml
+share/gnome/help/workspace-switcher/oc/workspace-switcher.xml
 share/gnome/help/workspace-switcher/pa/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ru/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/ru/legal.xml
 share/gnome/help/workspace-switcher/ru/workspace-switcher.xml
-share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/sv/legal.xml
 share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
-share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png
-share/gnome/help/workspace-switcher/uk/legal.xml
 share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
+share/gnome/help/workspace-switcher/vi/workspace-switcher.xml
 share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_CN/legal.xml
@@ -221,19 +208,6 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_TW/legal.xml
 share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml
-share/gnome/panel/glade/fish.glade
-share/gnome/panel/glade/panel-properties-dialog.glade
-share/gnome/panel/glade/panel-run-dialog.glade
-share/gnome/panel/glade/panel-test-applets.glade
-share/gnome/panel/glade/window-list.glade
-share/gnome/panel/glade/workspace-switcher.glade
-share/gnome/panel/pixmaps/fishanim.png
-share/gnome/panel/pixmaps/footguy.png
-share/gnome/panel/pixmaps/gnome-gegl2-2.png
-share/gnome/panel/pixmaps/gnome-gegl2.png
-share/gnome/panel/pixmaps/monkey.png
-share/gnome/panel/pixmaps/oldwanda.png
-share/gnome/panel/pixmaps/wanda.png
 share/gtk-doc/html/panel-applet/PanelApplet.html
 share/gtk-doc/html/panel-applet/applet-popups.html
 share/gtk-doc/html/panel-applet/applet-porting.html
@@ -348,6 +322,7 @@ share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
@@ -375,6 +350,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
@@ -387,6 +363,8 @@ share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/uz/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-panel-2.0.mo
@@ -396,13 +374,16 @@ share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 share/omf/clock/clock-C.omf
+share/omf/clock/clock-ca.omf
 share/omf/clock/clock-de.omf
+share/omf/clock/clock-el.omf
 share/omf/clock/clock-es.omf
 share/omf/clock/clock-fr.omf
 share/omf/clock/clock-it.omf
 share/omf/clock/clock-ja.omf
 share/omf/clock/clock-ko.omf
 share/omf/clock/clock-nl.omf
+share/omf/clock/clock-oc.omf
 share/omf/clock/clock-pa.omf
 share/omf/clock/clock-ru.omf
 share/omf/clock/clock-sr.omf
@@ -411,43 +392,55 @@ share/omf/clock/clock-uk.omf
 share/omf/clock/clock-zh_CN.omf
 share/omf/clock/clock-zh_TW.omf
 share/omf/fish/fish-C.omf
+share/omf/fish/fish-ca.omf
+share/omf/fish/fish-el.omf
 share/omf/fish/fish-es.omf
 share/omf/fish/fish-fr.omf
 share/omf/fish/fish-it.omf
+share/omf/fish/fish-ko.omf
+share/omf/fish/fish-oc.omf
 share/omf/fish/fish-sv.omf
 share/omf/fish/fish-uk.omf
 share/omf/gnome-panel/fish-applet-2-de.omf
 share/omf/gnome-panel/fish-applet-2-ja.omf
-share/omf/gnome-panel/fish-applet-2-ko.omf
 share/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/omf/gnome-panel/fish-applet-2-zh_TW.omf
 share/omf/gnome-panel/window-list-de.omf
 share/omf/gnome-panel/window-list-ja.omf
-share/omf/gnome-panel/window-list-ko.omf
 share/omf/gnome-panel/window-list-zh_TW.omf
 share/omf/gnome-panel/workspace-switcher-de.omf
 share/omf/gnome-panel/workspace-switcher-ja.omf
-share/omf/gnome-panel/workspace-switcher-ko.omf
 share/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/omf/gnome-panel/workspace-switcher-zh_TW.omf
 share/omf/window-list/window-list-C.omf
+share/omf/window-list/window-list-ca.omf
+share/omf/window-list/window-list-de.omf
+share/omf/window-list/window-list-el.omf
 share/omf/window-list/window-list-es.omf
 share/omf/window-list/window-list-fr.omf
 share/omf/window-list/window-list-it.omf
+share/omf/window-list/window-list-ko.omf
+share/omf/window-list/window-list-oc.omf
 share/omf/window-list/window-list-pa.omf
 share/omf/window-list/window-list-ru.omf
 share/omf/window-list/window-list-sv.omf
 share/omf/window-list/window-list-uk.omf
 share/omf/window-list/window-list-zh_CN.omf
 share/omf/workspace-switcher/workspace-switcher-C.omf
+share/omf/workspace-switcher/workspace-switcher-ca.omf
+share/omf/workspace-switcher/workspace-switcher-de.omf
+share/omf/workspace-switcher/workspace-switcher-el.omf
 share/omf/workspace-switcher/workspace-switcher-es.omf
 share/omf/workspace-switcher/workspace-switcher-fr.omf
 share/omf/workspace-switcher/workspace-switcher-it.omf
+share/omf/workspace-switcher/workspace-switcher-ko.omf
 share/omf/workspace-switcher/workspace-switcher-nl.omf
+share/omf/workspace-switcher/workspace-switcher-oc.omf
 share/omf/workspace-switcher/workspace-switcher-pa.omf
 share/omf/workspace-switcher/workspace-switcher-ru.omf
 share/omf/workspace-switcher/workspace-switcher-sv.omf
 share/omf/workspace-switcher/workspace-switcher-uk.omf
+share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/omf/workspace-switcher
 @dirrm share/omf/window-list
 @dirrm share/omf/gnome-panel
@@ -463,83 +456,73 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gtk-doc/html/panel-applet
-@dirrm share/gnome/panel/pixmaps
-@dirrm share/gnome/panel/glade
-@dirrm share/gnome/panel
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
 @dirrm share/gnome/help/workspace-switcher/zh_CN/figures
 @dirrm share/gnome/help/workspace-switcher/zh_CN
-@dirrm share/gnome/help/workspace-switcher/uk/figures
+@dirrm share/gnome/help/workspace-switcher/vi
 @dirrm share/gnome/help/workspace-switcher/uk
-@dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
-@dirrm share/gnome/help/workspace-switcher/ru/figures
 @dirrm share/gnome/help/workspace-switcher/ru
-@dirrm share/gnome/help/workspace-switcher/pa/figures
 @dirrm share/gnome/help/workspace-switcher/pa
-@dirrm share/gnome/help/workspace-switcher/nl/figures
+@dirrm share/gnome/help/workspace-switcher/oc
 @dirrm share/gnome/help/workspace-switcher/nl
-@dirrm share/gnome/help/workspace-switcher/ko/figures
 @dirrm share/gnome/help/workspace-switcher/ko
 @dirrm share/gnome/help/workspace-switcher/ja/figures
 @dirrm share/gnome/help/workspace-switcher/ja
-@dirrm share/gnome/help/workspace-switcher/it/figures
 @dirrm share/gnome/help/workspace-switcher/it
-@dirrm share/gnome/help/workspace-switcher/fr/figures
 @dirrm share/gnome/help/workspace-switcher/fr
-@dirrm share/gnome/help/workspace-switcher/es/figures
 @dirrm share/gnome/help/workspace-switcher/es
+@dirrm share/gnome/help/workspace-switcher/el
 @dirrm share/gnome/help/workspace-switcher/de/figures
 @dirrm share/gnome/help/workspace-switcher/de
-@dirrm share/gnome/help/workspace-switcher/C/figures
+@dirrm share/gnome/help/workspace-switcher/ca
 @dirrm share/gnome/help/workspace-switcher/C
 @dirrm share/gnome/help/workspace-switcher
 @dirrm share/gnome/help/window-list/zh_TW/figures
 @dirrm share/gnome/help/window-list/zh_TW
-@dirrm share/gnome/help/window-list/zh_CN/figures
 @dirrm share/gnome/help/window-list/zh_CN
-@dirrm share/gnome/help/window-list/uk/figures
 @dirrm share/gnome/help/window-list/uk
-@dirrm share/gnome/help/window-list/sv/figures
 @dirrm share/gnome/help/window-list/sv
-@dirrm share/gnome/help/window-list/ru/figures
 @dirrm share/gnome/help/window-list/ru
-@dirrm share/gnome/help/window-list/pa/figures
 @dirrm share/gnome/help/window-list/pa
-@dirrm share/gnome/help/window-list/ko/figures
+@dirrm share/gnome/help/window-list/oc
 @dirrm share/gnome/help/window-list/ko
 @dirrm share/gnome/help/window-list/ja/figures
 @dirrm share/gnome/help/window-list/ja
-@dirrm share/gnome/help/window-list/it/figures
 @dirrm share/gnome/help/window-list/it
-@dirrm share/gnome/help/window-list/fr/figures
 @dirrm share/gnome/help/window-list/fr
-@dirrm share/gnome/help/window-list/es/figures
 @dirrm share/gnome/help/window-list/es
+@dirrm share/gnome/help/window-list/el
 @dirrm share/gnome/help/window-list/de/figures
 @dirrm share/gnome/help/window-list/de
-@dirrm share/gnome/help/window-list/C/figures
+@dirrm share/gnome/help/window-list/ca
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
 @dirrm share/gnome/help/fish/uk/figures
 @dirrm share/gnome/help/fish/uk
 @dirrm share/gnome/help/fish/sv/figures
 @dirrm share/gnome/help/fish/sv
+@dirrm share/gnome/help/fish/oc/figures
+@dirrm share/gnome/help/fish/oc
+@dirrm share/gnome/help/fish/ko/figures
+@dirrm share/gnome/help/fish/ko
 @dirrm share/gnome/help/fish/it/figures
 @dirrm share/gnome/help/fish/it
 @dirrm share/gnome/help/fish/fr/figures
 @dirrm share/gnome/help/fish/fr
 @dirrm share/gnome/help/fish/es/figures
 @dirrm share/gnome/help/fish/es
+@dirrm share/gnome/help/fish/el/figures
+@dirrm share/gnome/help/fish/el
+@dirrm share/gnome/help/fish/ca/figures
+@dirrm share/gnome/help/fish/ca
 @dirrm share/gnome/help/fish/C/figures
 @dirrm share/gnome/help/fish/C
 @dirrm share/gnome/help/fish-applet-2/zh_TW/figures
 @dirrm share/gnome/help/fish-applet-2/zh_TW
 @dirrm share/gnome/help/fish-applet-2/zh_CN/figures
 @dirrm share/gnome/help/fish-applet-2/zh_CN
-@dirrm share/gnome/help/fish-applet-2/ko/figures
-@dirrm share/gnome/help/fish-applet-2/ko
 @dirrm share/gnome/help/fish-applet-2/ja/figures
 @dirrm share/gnome/help/fish-applet-2/ja
 @dirrm share/gnome/help/fish-applet-2/de/figures
@@ -560,6 +543,8 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @dirrm share/gnome/help/clock/ru
 @dirrm share/gnome/help/clock/pa/figures
 @dirrm share/gnome/help/clock/pa
+@dirrm share/gnome/help/clock/oc/figures
+@dirrm share/gnome/help/clock/oc
 @dirrm share/gnome/help/clock/nl/figures
 @dirrm share/gnome/help/clock/nl
 @dirrm share/gnome/help/clock/ko/figures
@@ -572,14 +557,20 @@ share/omf/workspace-switcher/workspace-switcher-uk.omf
 @dirrm share/gnome/help/clock/fr
 @dirrm share/gnome/help/clock/es/figures
 @dirrm share/gnome/help/clock/es
+@dirrm share/gnome/help/clock/el/figures
+@dirrm share/gnome/help/clock/el
 @dirrm share/gnome/help/clock/de/figures
 @dirrm share/gnome/help/clock/de
+@dirrm share/gnome/help/clock/ca/figures
+@dirrm share/gnome/help/clock/ca
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
 @comment in gnome2-dirs: @dirrm share/gnome/help
+@dirrm share/gnome-panel/pixmaps
+@dirrm share/gnome-panel/glade
+@dirrm share/gnome-panel
 @comment in gnome2-dirs: @dirrm share/gnome-2.0/ui
-@comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @comment in libbonobo: @dirrm lib/bonobo/servers
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 3f8f71c6352..f792a490646 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.35 2007/07/12 19:41:57 drochner Exp $
+$NetBSD: distinfo,v 1.36 2007/11/05 11:44:06 drochner Exp $
 
-SHA1 (gnome-panel-2.18.3.tar.bz2) = a521b722a1cc753ea0fa3ed7dcf5262750235f9a
-RMD160 (gnome-panel-2.18.3.tar.bz2) = 346c3e981de3af98632d43511545b1877cf9cb5e
-Size (gnome-panel-2.18.3.tar.bz2) = 2722555 bytes
+SHA1 (gnome-panel-2.20.1.tar.bz2) = 92288158cd4ab9cc56557ca4345292316e7af6bd
+RMD160 (gnome-panel-2.20.1.tar.bz2) = 9648be6685038114066790136caf0cbade68ffba
+Size (gnome-panel-2.20.1.tar.bz2) = 2820992 bytes