7 files changed, 36 insertions, 252 deletions

diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index eebffb793f2f..647d4b51a07e 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.2.3
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-utils/2.4
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,8 +27,6 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-MAN1=	gnome-calculator.1 \
-	gnome-character-map.1 gnome-dictionary.1 \
-	gnome-search-tool.1 gnome-system-log.1 gdialog.1
+MAN1=	gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index e129db538a78..7d698ea00191 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-2.2.3.tar.bz2) = 2bde68d39e135a99dfd308a7ec7b6c4a
+MD5 (gnome2/gnome-utils-2.4.0.tar.bz2) = 6986c0b7b5898f1f515add00b946ae48
diff --git a/deskutils/gnomeutils2/files/patch-ad b/deskutils/gnomeutils2/files/patch-ad
deleted file mode 100644
index 65ebff071c14..000000000000
--- a/deskutils/gnomeutils2/files/patch-ad
+++ /dev/null
@@ -1,28 +0,0 @@
---- gdialog/dialog.h.orig	Tue Jul  6 16:23:33 1999
-+++ gdialog/dialog.h	Wed Aug 18 11:34:23 1999
-@@ -36,24 +36,7 @@
- #include <gnome.h>
- #endif
- 
--#ifdef ultrix
--#  include <cursesX.h>
--#else
--#  if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
--#    include <ncurses.h>
--#  else
--#    if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sgi)
--#        define hacked 1
--#        define _XOPEN_SOURCE_EXTENDED
--#        define _ACS_COMPAT_CODE
--#    endif
--#    include <curses.h>
--#    ifdef hacked
--#        undef _XOPEN_SOURCE_EXTENDED
--#        undef _ACS_COMPAT_CODE
--#    endif
--#  endif
--#endif
-+#include <ncurses.h>
- 
- /*
-  * Change these if you want
diff --git a/deskutils/gnomeutils2/files/patch-ai b/deskutils/gnomeutils2/files/patch-ai
index fb458fceab12..927a2b461d2f 100644
--- a/deskutils/gnomeutils2/files/patch-ai
+++ b/deskutils/gnomeutils2/files/patch-ai
@@ -1,11 +1,11 @@
---- sgmldocs.make.orig	Mon May  6 23:46:55 2002
-+++ sgmldocs.make	Mon May  6 23:47:10 2002
-@@ -32,7 +32,7 @@
- #   dist-hook: app-dist-hook
- #
- 
+--- xmldocs.make.orig	Thu Aug  7 09:56:16 2003
++++ xmldocs.make	Thu Aug  7 13:55:58 2003
+@@ -36,7 +36,7 @@
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
 -docdir = $(datadir)/gnome/help/$(docname)/$(lang)
 +docdir = $(datadir)/help/$(docname)/$(lang)
  
- doc_DATA = index.html
- 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c
index 3fe0abf93a19..1155fdb97624 100644
--- a/deskutils/gnomeutils2/files/patch-logview_logview.c
+++ b/deskutils/gnomeutils2/files/patch-logview_logview.c
@@ -1,5 +1,5 @@
---- logview/logview.c.orig	Sun Feb 16 15:34:59 2003
-+++ logview/logview.c	Wed Apr 23 14:51:26 2003
+--- logview/logview.c.orig	Sun Feb 16 15:36:07 2003
++++ logview/logview.c	Thu Apr 24 12:53:35 2003
 @@ -774,7 +774,7 @@
  
  	if ( ! found) {
@@ -27,11 +27,3 @@
  		if (access (full_name, R_OK) == 0) {
  			found = TRUE;
  			g_free (cfg->action_db_path);
-@@ -882,7 +882,6 @@
- 		else
- 			prefs->logfile = NULL;
- 	}
--	g_free (logfile);	
- }
- 
- void SaveUserPrefs(UserPrefsStruct *prefs)
diff --git a/deskutils/gnomeutils2/pkg-descr b/deskutils/gnomeutils2/pkg-descr
index 7738e6fc53a3..3aaba4bf64ba 100644
--- a/deskutils/gnomeutils2/pkg-descr
+++ b/deskutils/gnomeutils2/pkg-descr
@@ -1,3 +1,3 @@
-GNOME 2 support utilities, including an on-the-fly dialog box tool
-(like Zenity), a dictionary, a frontend for find(1), and a system log
-viewer.
+GNOME 2.0 support utilities, including an on-the-fly dialog box tool
+(like Zenity), a dictionary, a frontend for find(1), a system log
+viewer, and more.
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 20c31677e486..7fd75b26c23b 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -1,19 +1,23 @@
-bin/gdialog
-bin/gnome-calculator
-bin/gnome-character-map
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
 etc/gconf/schemas/gdict.schemas
+etc/gconf/schemas/gnome-search-tool.schemas
 etc/gconf/schemas/logview.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
-share/gnome/applications/gnome-calculator.desktop
-share/gnome/applications/gnome-character-map.desktop
 share/gnome/applications/gnome-dictionary.desktop
 share/gnome/applications/gnome-search-tool.desktop
 share/gnome/applications/gnome-system-log.desktop
@@ -21,76 +25,6 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
 share/gnome/gnome-system-log/gnome-system-log-actions.db
 share/gnome/gnome-system-log/gnome-system-log-descript.db
 share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/gdialog/C/figures/example-dialog.png
-share/gnome/help/gdialog/C/figures/gdialog-msgbox.png
-share/gnome/help/gdialog/C/figures/gdialog-yesno.png
-share/gnome/help/gdialog/C/gdialog.xml
-share/gnome/help/gdialog/C/legal.xml
-share/gnome/help/gdialog/ja/figures/example-dialog.png
-share/gnome/help/gdialog/ja/figures/gdialog-msgbox.png
-share/gnome/help/gdialog/ja/figures/gdialog-yesno.png
-share/gnome/help/gdialog/ja/gdialog.xml
-share/gnome/help/gdialog/ja/legal.xml
-share/gnome/help/gnome-calculator/C/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/C/gnome-calculator.xml
-share/gnome/help/gnome-calculator/C/legal.xml
-share/gnome/help/gnome-calculator/de/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/de/gnome-calculator.xml
-share/gnome/help/gnome-calculator/de/legal.xml
-share/gnome/help/gnome-calculator/es/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/es/gnome-calculator.xml
-share/gnome/help/gnome-calculator/es/legal.xml
-share/gnome/help/gnome-calculator/fr/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/fr/gnome-calculator.xml
-share/gnome/help/gnome-calculator/fr/legal.xml
-share/gnome/help/gnome-calculator/it/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/it/gnome-calculator.xml
-share/gnome/help/gnome-calculator/it/legal.xml
-share/gnome/help/gnome-calculator/ja/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/ja/gnome-calculator.xml
-share/gnome/help/gnome-calculator/ja/legal.xml
-share/gnome/help/gnome-calculator/ko/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/ko/gnome-calculator.xml
-share/gnome/help/gnome-calculator/ko/legal.xml
-share/gnome/help/gnome-calculator/sv/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/sv/gnome-calculator.xml
-share/gnome/help/gnome-calculator/sv/legal.xml
-share/gnome/help/gnome-calculator/zh_CN/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/zh_CN/gnome-calculator.xml
-share/gnome/help/gnome-calculator/zh_CN/legal.xml
-share/gnome/help/gnome-calculator/zh_TW/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/zh_TW/gnome-calculator.xml
-share/gnome/help/gnome-calculator/zh_TW/legal.xml
-share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/C/gnome-character-map.xml
-share/gnome/help/gnome-character-map/C/legal.xml
-share/gnome/help/gnome-character-map/de/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/de/gnome-character-map.xml
-share/gnome/help/gnome-character-map/de/legal.xml
-share/gnome/help/gnome-character-map/es/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/es/gnome-character-map.xml
-share/gnome/help/gnome-character-map/es/legal.xml
-share/gnome/help/gnome-character-map/fr/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/fr/gnome-character-map.xml
-share/gnome/help/gnome-character-map/fr/legal.xml
-share/gnome/help/gnome-character-map/it/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/it/gnome-character-map.xml
-share/gnome/help/gnome-character-map/it/legal.xml
-share/gnome/help/gnome-character-map/ja/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/ja/gnome-character-map.xml
-share/gnome/help/gnome-character-map/ja/legal.xml
-share/gnome/help/gnome-character-map/ko/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/ko/gnome-character-map.xml
-share/gnome/help/gnome-character-map/ko/legal.xml
-share/gnome/help/gnome-character-map/sv/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/sv/gnome-character-map.xml
-share/gnome/help/gnome-character-map/sv/legal.xml
-share/gnome/help/gnome-character-map/zh_CN/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/zh_CN/gnome-character-map.xml
-share/gnome/help/gnome-character-map/zh_CN/legal.xml
-share/gnome/help/gnome-character-map/zh_TW/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/zh_TW/gnome-character-map.xml
-share/gnome/help/gnome-character-map/zh_TW/legal.xml
 share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
 share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
 share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
@@ -102,9 +36,6 @@ share/gnome/help/gnome-dictionary/ja/legal.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
-share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/de/legal.xml
 share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/es/legal.xml
@@ -159,58 +90,12 @@ share/gnome/help/gnome-system-log/zh_CN/legal.xml
 share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png
 share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
 share/gnome/help/gnome-system-log/zh_TW/legal.xml
-share/gnome/omf/gnome-utils/gdialog-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gdialog-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-search-tool-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
@@ -248,15 +133,17 @@ share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
 share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gdict.png
-share/gnome/pixmaps/gnome-character-map.png
+share/gnome/pixmaps/gnome-search-tool/gnome-search-tool-animation.png
 share/gnome/pixmaps/gnome-searchtool.png
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
@@ -272,6 +159,7 @@ share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
@@ -291,6 +179,7 @@ share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo
@@ -301,7 +190,7 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@dirrm share/gnome/pixmaps/gnome-system-log
+@dirrm share/gnome/pixmaps/gnome-search-tool
 @dirrm share/gnome/help/gnome-system-log/zh_TW/figures
 @dirrm share/gnome/help/gnome-system-log/zh_TW
 @dirrm share/gnome/help/gnome-system-log/zh_CN/figures
@@ -339,8 +228,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-search-tool/fr
 @dirrm share/gnome/help/gnome-search-tool/es/figures
 @dirrm share/gnome/help/gnome-search-tool/es
-@dirrm share/gnome/help/gnome-search-tool/de/figures
-@dirrm share/gnome/help/gnome-search-tool/de
 @dirrm share/gnome/help/gnome-search-tool/C/figures
 @dirrm share/gnome/help/gnome-search-tool/C
 @dirrm share/gnome/help/gnome-search-tool
@@ -349,83 +236,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/C/figures
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
-@dirrm share/gnome/help/gnome-character-map/zh_TW/figures
-@dirrm share/gnome/help/gnome-character-map/zh_TW
-@dirrm share/gnome/help/gnome-character-map/zh_CN/figures
-@dirrm share/gnome/help/gnome-character-map/zh_CN
-@dirrm share/gnome/help/gnome-character-map/sv/figures
-@dirrm share/gnome/help/gnome-character-map/sv
-@dirrm share/gnome/help/gnome-character-map/ko/figures
-@dirrm share/gnome/help/gnome-character-map/ko
-@dirrm share/gnome/help/gnome-character-map/ja/figures
-@dirrm share/gnome/help/gnome-character-map/ja
-@dirrm share/gnome/help/gnome-character-map/it/figures
-@dirrm share/gnome/help/gnome-character-map/it
-@dirrm share/gnome/help/gnome-character-map/fr/figures
-@dirrm share/gnome/help/gnome-character-map/fr
-@dirrm share/gnome/help/gnome-character-map/es/figures
-@dirrm share/gnome/help/gnome-character-map/es
-@dirrm share/gnome/help/gnome-character-map/de/figures
-@dirrm share/gnome/help/gnome-character-map/de
-@dirrm share/gnome/help/gnome-character-map/C/figures
-@dirrm share/gnome/help/gnome-character-map/C
-@dirrm share/gnome/help/gnome-character-map
-@dirrm share/gnome/help/gnome-calculator/zh_TW/figures
-@dirrm share/gnome/help/gnome-calculator/zh_TW
-@dirrm share/gnome/help/gnome-calculator/zh_CN/figures
-@dirrm share/gnome/help/gnome-calculator/zh_CN
-@dirrm share/gnome/help/gnome-calculator/sv/figures
-@dirrm share/gnome/help/gnome-calculator/sv
-@dirrm share/gnome/help/gnome-calculator/ko/figures
-@dirrm share/gnome/help/gnome-calculator/ko
-@dirrm share/gnome/help/gnome-calculator/ja/figures
-@dirrm share/gnome/help/gnome-calculator/ja
-@dirrm share/gnome/help/gnome-calculator/it/figures
-@dirrm share/gnome/help/gnome-calculator/it
-@dirrm share/gnome/help/gnome-calculator/fr/figures
-@dirrm share/gnome/help/gnome-calculator/fr
-@dirrm share/gnome/help/gnome-calculator/es/figures
-@dirrm share/gnome/help/gnome-calculator/es
-@dirrm share/gnome/help/gnome-calculator/de/figures
-@dirrm share/gnome/help/gnome-calculator/de
-@dirrm share/gnome/help/gnome-calculator/C/figures
-@dirrm share/gnome/help/gnome-calculator/C
-@dirrm share/gnome/help/gnome-calculator
-@dirrm share/gnome/help/gdialog/ja/figures
-@dirrm share/gnome/help/gdialog/ja
-@dirrm share/gnome/help/gdialog/C/figures
-@dirrm share/gnome/help/gdialog/C
 @dirrm share/gnome/gnome-system-log
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-it.omf 2>/dev/null || /usr/bin/true