Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

9 files changed, 51 insertions, 168 deletions

diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index 56398c8c4dd0..36c2fefb4f95 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.4
+MASTER_SITE_SUBDIR=	sources/gnome-panel/2.6
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,8 +19,9 @@ COMMENT=	Panel component for the GNOME 2 Desktop
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop libwnck lthack \
-		intlhack
+USE_REINPLACE=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
+		libwnck
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
@@ -32,4 +32,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 MAN1=	gnome-panel.1 gnome-panel-preferences.1
 
+post-patch:
+.for po in da.po it.po zh_TW.po
+	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index 2e18221ce043..922d7c3b0c78 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.4.2.tar.bz2) = d62da1f6cb129f65206a945d93a2fa85
-SIZE (gnome2/gnome-panel-2.4.2.tar.bz2) = 2662404
+MD5 (gnome2/gnome-panel-2.6.0.tar.bz2) = 9e0ad03c9266d342b99837ca4e947b55
+SIZE (gnome2/gnome-panel-2.6.0.tar.bz2) = 2933581
diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c
index 976764570ff1..ccf5378b135f 100644
--- a/x11/gnomepanel/files/patch-applets_clock_clock.c
+++ b/x11/gnomepanel/files/patch-applets_clock_clock.c
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- applets/clock/clock.c	2002/05/14 14:08:16	1.1
-+++ applets/clock/clock.c	2002/05/14 14:12:56
-@@ -14,7 +14,9 @@
+--- applets/clock/clock.c.orig	Tue Jan 13 11:55:58 2004
++++ applets/clock/clock.c	Wed Jan 14 15:43:39 2004
+@@ -47,7 +47,9 @@
  #include <dirent.h>
  #include <string.h>
  #include <time.h>
@@ -13,15 +10,15 @@ $FreeBSD$
  
  #include <panel-applet.h>
  #include <panel-applet-gconf.h>
-@@ -684,7 +686,11 @@
- 	cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error);
- 	if (error || (cd->hourformat != 12 && cd->hourformat != 24)) {
- 		/* if value is not valid, set it according to locale */
+@@ -539,7 +541,11 @@
+ {
+         const char *am;
+ 
 +#ifdef HAVE_LANGINFO_H
- 		const char *am = nl_langinfo (AM_STR);
+         am = nl_langinfo (AM_STR);
 +#else
-+		const char *am = "AM";
++	am = "AM";
 +#endif
- 		cd->hourformat = (am[0] == '\0') ? 24 : 12;
+         return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
+ }
  
- 		if (error)
diff --git a/x11/gnomepanel/files/patch-configure b/x11/gnomepanel/files/patch-configure
new file mode 100644
index 000000000000..732f3a86022c
--- /dev/null
+++ b/x11/gnomepanel/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Wed Jan 14 15:54:42 2004
++++ configure	Wed Jan 14 15:55:13 2004
+@@ -5536,7 +5536,7 @@
+ 
+ 
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-		  inttypes.h stdint.h unistd.h
++		  inttypes.h stdint.h unistd.h langinfo.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
diff --git a/x11/gnomepanel/files/patch-po_da.po b/x11/gnomepanel/files/patch-po_da.po
deleted file mode 100644
index 96bfea954001..000000000000
--- a/x11/gnomepanel/files/patch-po_da.po
+++ /dev/null
@@ -1,29 +0,0 @@
---- po/da.po.orig	Wed Oct  1 15:54:18 2003
-+++ po/da.po	Wed Oct  1 15:56:23 2003
-@@ -48,7 +48,7 @@
- 
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%a %-d. %b"
-+msgstr "%a %d. %b"
- 
- #. translators: reverse the order of these arguments
- #. *              if the time should come before the
-@@ -75,7 +75,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%A den %-d. %B"
-+msgstr "%A den %d. %B"
- 
- #: applets/clock/clock.c:472
- msgid "Calendar"
-@@ -95,7 +95,7 @@
- 
- #: applets/clock/clock.c:809
- msgid "%A, %B %d %Y"
--msgstr "%A, %-d. %B %Y"
-+msgstr "%A, %d. %B %Y"
- 
- #: applets/clock/clock.c:850
- #, c-format
diff --git a/x11/gnomepanel/files/patch-po_it.po b/x11/gnomepanel/files/patch-po_it.po
deleted file mode 100644
index 00118bd344bc..000000000000
--- a/x11/gnomepanel/files/patch-po_it.po
+++ /dev/null
@@ -1,59 +0,0 @@
---- po/it.po.orig	Wed Oct  1 15:55:34 2003
-+++ po/it.po	Wed Oct  1 15:56:12 2003
-@@ -17,23 +17,23 @@
- 
- #: applets/clock/clock.c:219
- msgid "%l:%M:%S %p"
--msgstr "%-I.%M.%S %p"
-+msgstr "%I.%M.%S %p"
- 
- #: applets/clock/clock.c:219
- msgid "%l:%M %p"
--msgstr "%-I.%M %p"
-+msgstr "%I.%M %p"
- 
- #: applets/clock/clock.c:221 applets/clock/clock.c:773
- msgid "%H:%M:%S"
--msgstr "%-H.%M.%S"
-+msgstr "%H.%M.%S"
- 
- #: applets/clock/clock.c:221 applets/clock/clock.c:775
- msgid "%H:%M"
--msgstr "%-H.%M"
-+msgstr "%H.%M"
- 
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%a %-d %b"
-+msgstr "%a %d %b"
- 
- #. translators: reverse the order of these arguments
- #. *              if the time should come before the
-@@ -60,7 +60,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%A %-d %B"
-+msgstr "%A %d %B"
- 
- #: applets/clock/clock.c:472
- msgid "Calendar"
-@@ -72,15 +72,15 @@
- 
- #: applets/clock/clock.c:768
- msgid "%I:%M:%S %p"
--msgstr "%-I.%M.%S %p"
-+msgstr "%I.%M.%S %p"
- 
- #: applets/clock/clock.c:770
- msgid "%I:%M %p"
--msgstr "%-I.%M %p"
-+msgstr "%I.%M %p"
- 
- #: applets/clock/clock.c:809
- msgid "%A, %B %d %Y"
--msgstr "%A, %-d %B %Y"
-+msgstr "%A, %d %B %Y"
- 
- #: applets/clock/clock.c:850
- #, c-format
diff --git a/x11/gnomepanel/files/patch-po_zh_TW.po b/x11/gnomepanel/files/patch-po_zh_TW.po
deleted file mode 100644
index 3e7e16c45ddb..000000000000
--- a/x11/gnomepanel/files/patch-po_zh_TW.po
+++ /dev/null
@@ -1,20 +0,0 @@
---- po/zh_TW.po.orig	Wed Oct  1 15:57:10 2003
-+++ po/zh_TW.po	Wed Oct  1 15:57:19 2003
-@@ -40,7 +40,7 @@
- 
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%-m月%-d日(%a)"
-+msgstr "%m月%d日(%a)"
- 
- #. translators: reverse the order of these arguments
- #. *              if the time should come before the
-@@ -67,7 +67,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%-m月%-d日(%A)"
-+msgstr "%m月%d日(%A)"
- 
- #: applets/clock/clock.c:472
- msgid "Calendar"
diff --git a/x11/gnomepanel/pkg-descr b/x11/gnomepanel/pkg-descr
index 5e73398913a9..263044b5e130 100644
--- a/x11/gnomepanel/pkg-descr
+++ b/x11/gnomepanel/pkg-descr
@@ -1,3 +1,3 @@
-Panel component for the GNOME 2 Desktop.
+This drives the GNOME 2 panel.
 
 WWW: http://www.gnome.org/
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index f10b99a60775..e691400d6c7d 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -64,9 +64,9 @@ etc/gconf/schemas/panel-toplevel.schemas
 etc/gconf/schemas/window-list.schemas
 etc/gconf/schemas/workspace-switcher.schemas
 include/panel-2.0/GNOME_Panel.h
+include/panel-2.0/panel-applet-enums.h
 include/panel-2.0/panel-applet-gconf.h
 include/panel-2.0/panel-applet.h
-lib/libclock-applet-2.so
 lib/libpanel-applet-2.a
 lib/libpanel-applet-2.so
 lib/libpanel-applet-2.so.0
@@ -76,21 +76,27 @@ libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
 libdata/bonobo/servers/GNOME_Panel.server
 libdata/bonobo/servers/GNOME_Wncklet_Factory.server
 libdata/pkgconfig/libpanelapplet-2.0.pc
+libexec/clock-applet
 libexec/fish-applet-2
 libexec/notification-area-applet
 libexec/wnck-applet
+share/doc/panel-applet/PanelApplet.html
 share/doc/panel-applet/applet-popups.html
 share/doc/panel-applet/applet-porting.html
 share/doc/panel-applet/applet-writing.html
+share/doc/panel-applet/home.png
+share/doc/panel-applet/index.html
 share/doc/panel-applet/index.sgml
-share/doc/panel-applet/libpanel-applet.html
+share/doc/panel-applet/left.png
 share/doc/panel-applet/multi-applets.html
-share/doc/panel-applet/panel-applet-panel-applet-gconf-utilities.html
+share/doc/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html
+share/doc/panel-applet/panel-applet.devhelp
 share/doc/panel-applet/panel-applet.html
 share/doc/panel-applet/panel-signals.html
-share/doc/panel-applet/panelapplet.html
+share/doc/panel-applet/right.png
 share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/doc/panel-applet/up.png
 share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml
@@ -129,9 +135,6 @@ share/gnome/help/clock/ko/legal.xml
 share/gnome/help/clock/sv/clock.xml
 share/gnome/help/clock/sv/figures/clock_applet.png
 share/gnome/help/clock/sv/legal.xml
-share/gnome/help/clock/uk/clock.xml
-share/gnome/help/clock/uk/figures/clock_applet.png
-share/gnome/help/clock/uk/legal.xml
 share/gnome/help/clock/zh_CN/clock.xml
 share/gnome/help/clock/zh_CN/figures/clock_applet.png
 share/gnome/help/clock/zh_CN/legal.xml
@@ -168,9 +171,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png
 share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
 share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
 share/gnome/help/fish-applet-2/sv/legal.xml
-share/gnome/help/fish-applet-2/uk/figures/fish_applet.png
-share/gnome/help/fish-applet-2/uk/fish-applet-2.xml
-share/gnome/help/fish-applet-2/uk/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
@@ -217,10 +217,6 @@ share/gnome/help/window-list/sv/figures/window_list_group.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.png
 share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
@@ -261,9 +257,6 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/sv/figures/workspacelist_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/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
@@ -289,8 +282,6 @@ share/gnome/omf/gnome-panel/clock-ko.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/clock-sv.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/clock-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/clock-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/clock-zh_TW.omf
@@ -311,8 +302,6 @@ share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/fish-applet-2-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
@@ -333,8 +322,6 @@ share/gnome/omf/gnome-panel/window-list-ko.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-sv.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/window-list-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/window-list-zh_TW.omf
@@ -355,8 +342,6 @@ share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-panel/workspace-switcher-uk.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
@@ -385,7 +370,6 @@ share/gnome/pixmaps/gnome-panel-type-sliding.png
 share/gnome/pixmaps/gnome-panel.png
 share/gnome/pixmaps/gnome-run.png
 share/gnome/pixmaps/gnome-screenshot.png
-share/gnome/pixmaps/gnome-show-desktop.png
 share/gnome/pixmaps/panel-drawer.png
 share/gnome/pixmaps/panel-force-quit.png
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
@@ -400,6 +384,7 @@ share/locale/cy/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-panel-2.0.mo
@@ -412,6 +397,7 @@ share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
@@ -423,10 +409,12 @@ share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
@@ -437,8 +425,10 @@ share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ta/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/vi/LC_MESSAGES/gnome-panel-2.0.mo
@@ -452,8 +442,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @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/uk
 @dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
 @dirrm share/gnome/help/workspace-switcher/ko/figures
@@ -475,8 +463,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @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/ko/figures
@@ -498,8 +484,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @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/uk/figures
-@dirrm share/gnome/help/fish-applet-2/uk
 @dirrm share/gnome/help/fish-applet-2/sv/figures
 @dirrm share/gnome/help/fish-applet-2/sv
 @dirrm share/gnome/help/fish-applet-2/ko/figures
@@ -521,8 +505,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/zh_TW
 @dirrm share/gnome/help/clock/zh_CN/figures
 @dirrm share/gnome/help/clock/zh_CN
-@dirrm share/gnome/help/clock/uk/figures
-@dirrm share/gnome/help/clock/uk
 @dirrm share/gnome/help/clock/sv/figures
 @dirrm share/gnome/help/clock/sv
 @dirrm share/gnome/help/clock/ko/figures
@@ -601,7 +583,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-ko.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-uk.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true
@@ -612,7 +593,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-ko.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-uk.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true
@@ -623,7 +603,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-ko.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-uk.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true
@@ -634,6 +613,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-ko.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-uk.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true