Update galeon to 0.12.1

Changes from Release Notes
	- mozilla 0.9.4 compatibility
	- lots of bugfixes
	- context menus for reload bypassing cache and proxy
	- find dialog with new options
	- author and user stylesheets support
	- ghelp, info, man, toc support
	- fix hangs on startup with new gnome-vfs
	- allow blocking of plugins
	- support for adding accels to bookmarks
	- copy/cut/paste context menu for forms
	- security icon on the statusbar
	- improved MIME preferences page
	- i18n fixes
	- ability to save background image
	- basic Xinerama support
	- about plugins
	- improved dragging of bookmarks to the toolbars
	- proxy autoconfiguration
	- bookmarks searching
	- better focus behavior
	- Don't repaint bookmarks toolbars when not necessary
	- lots of usability improvements

8 files changed, 73 insertions, 261 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 68fb35fd4f6..d5e5c1e4217 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2001/08/30 15:30:09 taya Exp $
+# $NetBSD: Makefile,v 1.12 2001/09/21 16:37:41 taya Exp $
 
-DISTNAME=	galeon-0.12
+DISTNAME=	galeon-0.12.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 
@@ -8,7 +8,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://galeon.sourceforge.net/
 COMMENT=	GNOME web browser based on gecko (mozilla rendering engine)
 
-BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 BUILD_DEPENDS+=	xml-i18n-tools>=0.8.1:../../textproc/xml-i18n-tools
 DEPENDS+=	mozilla>=0.9.2:../mozilla
 DEPENDS+=	gnome-libs>=1.2.1:../../x11/gnome-libs
@@ -18,6 +17,7 @@ DEPENDS+=	GConf>=1.0.4:../../devel/GConf
 DEPENDS+=	oaf>=0.6.5:../../devel/oaf
 DEPENDS+=	libxml>=1.8.13:../../textproc/libxml
 DEPENDS+=	libiconv>=1.6.1:../../converters/libiconv
+DEPENDS+=	gdk-pixbuf-gnome>=0.10.1:../../graphics/gdk-pixbuf-gnome
 
 USE_X11BASE=	yes
 USE_GMAKE=	yes
@@ -34,9 +34,6 @@ MOZ_LIBDIR=     ${PREFIX}/lib/mozilla
 LDFLAGS+=       -Wl,-R${MOZ_LIBDIR}
 LDFLAGS+=	-export-dynamic
 
-pre-configure:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && ${TOUCH} aclocal.m4)
-
 pre-install:
 	${X11PREFIX}/bin/gconftool --shutdown
 
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 363b11c9275..b2948c4ed09 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2001/08/29 14:02:28 taya Exp $
+$NetBSD: distinfo,v 1.8 2001/09/21 16:37:41 taya Exp $
 
-SHA1 (galeon-0.12.tar.gz) = c68f587c0832a7d90fa5043d87a51a00ad578724
-Size (galeon-0.12.tar.gz) = 2509597 bytes
-SHA1 (patch-aa) = 169e4bd6c9b867f35aa3b52f39a974518fc2547f
-SHA1 (patch-ab) = 3389d29a6301a9047bceb25eeca99ed30fe79232
-SHA1 (patch-ac) = 7e4d6d0dde88e5f24ff23532f64f7d214ab9ea5a
-SHA1 (patch-ae) = 93ec04e621363ec7e82a7a5281e43e1751d32905
-SHA1 (patch-af) = c29d249a680f6a04049001e8fd8f961599be5af7
+SHA1 (galeon-0.12.1.tar.gz) = 2f9cb422d0a73c6b00ac9bf45b5546bd171bef55
+Size (galeon-0.12.1.tar.gz) = 2842045 bytes
+SHA1 (patch-ab) = 89d29acb5848e23b75e959289371346fd47de261
+SHA1 (patch-ae) = 9ee3d5d95d03ca0d696f43660f5fd345c4000030
diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa
deleted file mode 100644
index 2cd2bdf0db3..00000000000
--- a/www/galeon/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2001/08/29 14:02:28 taya Exp $
-
-diff -ru ../Orig/galeon-0.12/configure.in ./configure.in
---- ../Orig/galeon-0.12/configure.in	Sun Aug 19 21:34:13 2001
-+++ ./configure.in	Fri Aug 24 14:21:50 2001
-@@ -205,10 +205,10 @@
- LDFLAGS="$_save_ldflags -L$_mozilla_lib_place"
- 
- dnl Check for nspr and friends
--AC_CHECK_LIB(nspr4, PR_Init, [_mozilla_nspr_libs="-lnspr4"],[],[-lpthread])
-+AC_CHECK_LIB(nspr4, PR_Init, [_mozilla_nspr_libs="-lnspr4"],[],[])
- LDFLAGS="$LDFLAGS $_mozilla_nspr_libs"
--AC_CHECK_LIB(plc4, PL_strcmp, [_mozilla_plc_libs="-lplc4"],[],[-lpthread -lnspr4])
--AC_CHECK_LIB(plds4, PL_NewHashTable, [_mozilla_plds_libs="-lplds4"],[],[-lpthread -lnspr4])
-+AC_CHECK_LIB(plc4, PL_strcmp, [_mozilla_plc_libs="-lplc4"],[],[-lnspr4])
-+AC_CHECK_LIB(plds4, PL_NewHashTable, [_mozilla_plds_libs="-lplds4"],[],[-lnspr4])
- 
- _mozilla_all_nspr_flags="$_mozilla_nspr_libs $_mozilla_plc_libs $_mozilla_plds_libs"
- 
-@@ -235,7 +235,7 @@
- 
- dnl gtk superwin library
- LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
--AC_CHECK_LIB(gtksuperwin, gdk_superwin_get_type, [_mozilla_gtk_super_win_libs="-lgtksuperwin"],[],[-lpthread])
-+AC_CHECK_LIB(gtksuperwin, gdk_superwin_get_type, [_mozilla_gtk_super_win_libs="-lgtksuperwin"],[],[])
- 
- dnl gtk moz embed library
- LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs $_mozilla_gtk_super_win_libs"
diff --git a/www/galeon/patches/patch-ab b/www/galeon/patches/patch-ab
index 8d41b5b1bce..823282fae5a 100644
--- a/www/galeon/patches/patch-ab
+++ b/www/galeon/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.3 2001/08/29 14:02:29 taya Exp $
+$NetBSD: patch-ab,v 1.4 2001/09/21 16:37:42 taya Exp $
 
-diff -ru ../Orig/galeon-0.12/src/MyportalProtocolHandler.cpp ./src/MyportalProtocolHandler.cpp
---- ../Orig/galeon-0.12/src/MyportalProtocolHandler.cpp	Thu Aug  9 20:27:37 2001
-+++ ./src/MyportalProtocolHandler.cpp	Fri Aug 24 14:21:52 2001
-@@ -140,9 +140,9 @@
+diff -ru ../Orig/galeon-0.12.1/src/mozilla/MyportalProtocolHandler.cpp ./src/mozilla/MyportalProtocolHandler.cpp
+--- ../Orig/galeon-0.12.1/src/mozilla/MyportalProtocolHandler.cpp	Sat Sep 15 03:20:27 2001
++++ ./src/mozilla/MyportalProtocolHandler.cpp	Tue Sep 18 01:14:08 2001
+@@ -143,9 +143,9 @@
  	nsresult rv = NS_OK;
  	nsCOMPtr <nsIURI> newUri;
  
diff --git a/www/galeon/patches/patch-ac b/www/galeon/patches/patch-ac
deleted file mode 100644
index cd27675f7d9..00000000000
--- a/www/galeon/patches/patch-ac
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/08/29 14:02:29 taya Exp $
-
-diff -ru ../Orig/galeon-0.12/src/mozilla.cpp ./src/mozilla.cpp
---- ../Orig/galeon-0.12/src/mozilla.cpp	Wed Aug 15 16:43:13 2001
-+++ ./src/mozilla.cpp	Fri Aug 24 14:21:54 2001
-@@ -1117,6 +1117,28 @@
-  * into a form which mozilla can use.
-  * @locStr: The unicode string to encode
-  */
-+size_t
-+my_mbstowcs(wchar_t *pwcs, const char *s, int n)
-+{
-+   int count = 0;
-+   
-+   if (pwcs != NULL) {
-+      do {
-+	 if ((*pwcs++ = (wchar_t) *s++) == 0)
-+	   break;
-+	 count++;
-+      } while (--n != 0);
-+   } else {
-+      do {
-+	 if (((wchar_t)*s++) == 0)
-+	   break;
-+	 count++;
-+      } while (--n != 0);
-+   }
-+   
-+   return count;
-+}
-+
- extern "C" PRUnichar *
- mozilla_locale_to_unicode (const gchar *locStr)
- {
-@@ -1131,7 +1153,9 @@
- 	}
- 
- 	/* count the number of wide characters which will be produced */
--	count = mbstowcs (NULL, locStr, 0);
-+        // Until NetBSD fixes their busted libc
-+        count = my_mbstowcs (NULL, locStr, 0);
-+   
- 	if (count == -1)
- 	{
- 		/* hmm, shouldnt happen but fallback to utf8 */
-@@ -1141,7 +1165,7 @@
- 
- 	/* allocate and decode */
- 	wide = g_new0 (wchar_t, count + 1);
--	mbstowcs (wide, locStr, count + 1);
-+        my_mbstowcs (wide, locStr, count + 1);  // Until NetBSD fixes their busted libc
- 
- 	/* make a unicode string and copy into it */
- 	uniStr = g_new0 (PRUnichar, count + 1);
diff --git a/www/galeon/patches/patch-ae b/www/galeon/patches/patch-ae
index 5faf8f0b86a..eb90402f9e2 100644
--- a/www/galeon/patches/patch-ae
+++ b/www/galeon/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.1 2001/08/29 14:02:29 taya Exp $
+$NetBSD: patch-ae,v 1.2 2001/09/21 16:37:43 taya Exp $
 
-diff -ru ../Orig/galeon-0.12/src/GaleonWrapper.cpp ./src/GaleonWrapper.cpp
---- ../Orig/galeon-0.12/src/GaleonWrapper.cpp	Sat Aug 18 08:48:17 2001
-+++ ./src/GaleonWrapper.cpp	Fri Aug 24 14:22:37 2001
-@@ -220,7 +220,7 @@
+diff -ru ../Orig/galeon-0.12.1/src/mozilla/GaleonWrapper.cpp ./src/mozilla/GaleonWrapper.cpp
+--- ../Orig/galeon-0.12.1/src/mozilla/GaleonWrapper.cpp	Tue Sep 11 10:48:49 2001
++++ ./src/mozilla/GaleonWrapper.cpp	Tue Sep 18 01:06:07 2001
+@@ -223,7 +223,7 @@
  
  	if (!preview)
  	{
diff --git a/www/galeon/patches/patch-af b/www/galeon/patches/patch-af
deleted file mode 100644
index b3bf1549d22..00000000000
--- a/www/galeon/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/08/29 14:02:29 taya Exp $
-
-diff -ru ../Orig/galeon-0.12/src/BaseProtocolHandler.cpp ./src/BaseProtocolHandler.cpp
---- ../Orig/galeon-0.12/src/BaseProtocolHandler.cpp	Sun Aug 19 11:52:33 2001
-+++ ./src/BaseProtocolHandler.cpp	Fri Aug 24 14:22:54 2001
-@@ -92,7 +92,7 @@
- 	nsresult rv = NS_OK;
- 	nsCOMPtr <nsIURI> newUri;
- 
--	rv = nsComponentManager::CreateInstance(kSimpleURICID, NULL,
-+	rv = nsComponentManager::CreateInstance(kSimpleURICID, (nsISupports *)NULL,
- 						NS_GET_IID(nsIURI),
- 						getter_AddRefs(newUri));
- 
diff --git a/www/galeon/pkg/PLIST b/www/galeon/pkg/PLIST
index ab306445b5a..7f2ef483c30 100644
--- a/www/galeon/pkg/PLIST
+++ b/www/galeon/pkg/PLIST
@@ -1,70 +1,11 @@
-@comment $NetBSD: PLIST,v 1.5 2001/08/29 14:02:29 taya Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/09/21 16:37:43 taya Exp $
 bin/galeon
 bin/galeon-bin
-bin/galeon-config-clean
-etc/gconf/gconf.xml.defaults/apps/galeon/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Crash/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/Session/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Mime/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Print/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/compact_bookmark_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/history_dock/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/prefs_dialog/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Crash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/Session/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Mime/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/compact_bookmark_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history_dock/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/prefs_dialog/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows/%gconf.xml
-etc/gconf/schemas/galeon.schemas
+bin/galeon-config-tool
 etc/sound/events/galeon.soundlist
 man/man1/galeon.1
+share/galeon/BackHistory.png
+share/galeon/ForwardHistory.png
 share/galeon/about_logo.png
 share/galeon/babelfish.png
 share/galeon/bookmarks.glade
@@ -79,6 +20,8 @@ share/galeon/dir.xpm
 share/galeon/dir_open.xpm
 share/galeon/download.png
 share/galeon/drag-url-icon.png
+share/galeon/filters.glade
+share/galeon/filters.xml
 share/galeon/fonts.png
 share/galeon/freshmeat.png
 share/galeon/galeon-composite.png
@@ -90,6 +33,7 @@ share/galeon/google.png
 share/galeon/harddrive.png
 share/galeon/history.png
 share/galeon/i-bookmark.xpm
+share/galeon/insecure.xpm
 share/galeon/link.xpm
 share/galeon/logo.png
 share/galeon/mime.png
@@ -108,6 +52,7 @@ share/galeon/preferences.glade
 share/galeon/programs.png
 share/galeon/prompts.glade
 share/galeon/rpm.png
+share/galeon/secure.xpm
 share/galeon/small-close.xpm
 share/galeon/small-detach.xpm
 share/galeon/small-menu.xpm
@@ -170,6 +115,10 @@ share/galeon/spinners/pipeon/014.png
 share/galeon/spinners/pipeon/rest.png
 share/galeon/stop.png
 share/galeon/tabs.png
+share/galeon/tb_drag_arrow_down.xpm
+share/galeon/tb_drag_arrow_left.xpm
+share/galeon/tb_drag_arrow_right.xpm
+share/galeon/tb_drag_arrow_up.xpm
 share/galeon/themes/Glass/Back.png
 share/galeon/themes/Glass/Forward.png
 share/galeon/themes/Glass/Home.png
@@ -177,36 +126,46 @@ share/galeon/themes/Glass/New.png
 share/galeon/themes/Glass/Refresh.png
 share/galeon/themes/Glass/Stop.png
 share/galeon/themes/Glass/Up.png
-share/galeon/themes/GlassHuge/Back.png
-share/galeon/themes/GlassHuge/Forward.png
-share/galeon/themes/GlassHuge/Home.png
-share/galeon/themes/GlassHuge/New.png
-share/galeon/themes/GlassHuge/Refresh.png
-share/galeon/themes/GlassHuge/Stop.png
-share/galeon/themes/GlassHuge/Up.png
-share/galeon/themes/GlassLarge/Back.png
-share/galeon/themes/GlassLarge/Forward.png
-share/galeon/themes/GlassLarge/Home.png
-share/galeon/themes/GlassLarge/New.png
-share/galeon/themes/GlassLarge/Refresh.png
-share/galeon/themes/GlassLarge/Stop.png
-share/galeon/themes/GlassLarge/Up.png
 share/galeon/themes/Konqueror/Back.png
 share/galeon/themes/Konqueror/Forward.png
 share/galeon/themes/Konqueror/Home.png
 share/galeon/themes/Konqueror/Refresh.png
 share/galeon/themes/Konqueror/Stop.png
+share/galeon/themes/Micro/Back.png
+share/galeon/themes/Micro/Forward.png
+share/galeon/themes/Micro/Home.png
+share/galeon/themes/Micro/New.png
+share/galeon/themes/Micro/Refresh.png
+share/galeon/themes/Micro/Stop.png
+share/galeon/themes/Micro/Up.png
 share/galeon/themes/MozillaModern/Back.png
 share/galeon/themes/MozillaModern/Forward.png
+share/galeon/themes/MozillaModern/Go.png
 share/galeon/themes/MozillaModern/Home.png
 share/galeon/themes/MozillaModern/Print.png
 share/galeon/themes/MozillaModern/Refresh.png
 share/galeon/themes/MozillaModern/Stop.png
+share/galeon/themes/MozillaModern/Up.png
+share/galeon/themes/MozillaModernSmall/Back.png
+share/galeon/themes/MozillaModernSmall/Forward.png
+share/galeon/themes/MozillaModernSmall/Go.png
+share/galeon/themes/MozillaModernSmall/Home.png
+share/galeon/themes/MozillaModernSmall/Print.png
+share/galeon/themes/MozillaModernSmall/Refresh.png
+share/galeon/themes/MozillaModernSmall/Stop.png
+share/galeon/themes/MozillaModernSmall/Up.png
 share/galeon/themes/Netscape/Back.png
 share/galeon/themes/Netscape/Forward.png
 share/galeon/themes/Netscape/Home.png
 share/galeon/themes/Netscape/Refresh.png
 share/galeon/themes/Netscape/Stop.png
+share/galeon/themes/Orion/Back.png
+share/galeon/themes/Orion/Forward.png
+share/galeon/themes/Orion/Home.png
+share/galeon/themes/Orion/New.png
+share/galeon/themes/Orion/Refresh.png
+share/galeon/themes/Orion/Stop.png
+share/galeon/themes/Orion/Up.png
 share/galeon/themes/Plastik/Back.png
 share/galeon/themes/Plastik/Forward.png
 share/galeon/themes/Plastik/Home.png
@@ -221,9 +180,17 @@ share/galeon/themes/PlastikLarge/New.png
 share/galeon/themes/PlastikLarge/Refresh.png
 share/galeon/themes/PlastikLarge/Stop.png
 share/galeon/themes/PlastikLarge/Up.png
+share/galeon/themes/Remembrance/Back.png
+share/galeon/themes/Remembrance/Forward.png
+share/galeon/themes/Remembrance/Home.png
+share/galeon/themes/Remembrance/New.png
+share/galeon/themes/Remembrance/Refresh.png
+share/galeon/themes/Remembrance/Stop.png
+share/galeon/themes/Remembrance/Up.png
 share/galeon/themes/Ska/Back.png
 share/galeon/themes/Ska/Forward.png
 share/galeon/themes/Ska/Home.png
+share/galeon/themes/Ska/New.png
 share/galeon/themes/Ska/Refresh.png
 share/galeon/themes/Ska/Stop.png
 share/galeon/themes/Ska/Up.png
@@ -254,6 +221,7 @@ share/gnome/help/galeon/C/bugs.html
 share/gnome/help/galeon/C/command-line-options.html
 share/gnome/help/galeon/C/compiling-from-source.html
 share/gnome/help/galeon/C/context-menus.html
+share/gnome/help/galeon/C/find.html
 share/gnome/help/galeon/C/full-screen-mode.html
 share/gnome/help/galeon/C/getting-started.html
 share/gnome/help/galeon/C/history.html
@@ -301,8 +269,8 @@ share/locale/sv/LC_MESSAGES/galeon.mo
 share/locale/tr/LC_MESSAGES/galeon.mo
 share/locale/uk/LC_MESSAGES/galeon.mo
 share/locale/wa/LC_MESSAGES/galeon.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/galeon.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
+share/locale/zh_CN/LC_MESSAGES/galeon.mo
+share/locale/zh_TW/LC_MESSAGES/galeon.mo
 share/oaf/GNOME_Galeon_Automation.oaf
 share/pixmaps/galeon.png
 share/sounds/galeon/clicked.wav
@@ -312,15 +280,18 @@ share/sounds/galeon/clicked.wav
 @dirrm share/gnome/help/galeon/C/stylesheet-images
 @dirrm share/gnome/help/galeon/C/fig
 @dirrm share/gnome/help/galeon/C
+@dirrm share/gnome/help/galeon
 @dirrm share/galeon/themes/gnome-large
 @dirrm share/galeon/themes/Ska
+@dirrm share/galeon/themes/Remembrance
 @dirrm share/galeon/themes/PlastikLarge
 @dirrm share/galeon/themes/Plastik
+@dirrm share/galeon/themes/Orion
 @dirrm share/galeon/themes/Netscape
+@dirrm share/galeon/themes/MozillaModernSmall
 @dirrm share/galeon/themes/MozillaModern
+@dirrm share/galeon/themes/Micro
 @dirrm share/galeon/themes/Konqueror
-@dirrm share/galeon/themes/GlassLarge
-@dirrm share/galeon/themes/GlassHuge
 @dirrm share/galeon/themes/Glass
 @dirrm share/galeon/themes
 @dirrm share/galeon/spinners/pipeon
@@ -328,63 +299,6 @@ share/sounds/galeon/clicked.wav
 @dirrm share/galeon/spinners/crashcut
 @dirrm share/galeon/spinners
 @dirrm share/galeon
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Toolbar
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/prefs_dialog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history_dock
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/compact_bookmark_editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Mime
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/Session
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Crash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/prefs_dialog
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/history_dock
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/history
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/compact_bookmark_editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Print
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Mime
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/Session
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Crash
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon
+@unexec %D/bin/gconftool --shutdown
+@unexec /bin/rm -rf %D/etc/gconf/gconf.xml.defaults/apps/galeon
+@unexec /bin/rm -rf %D/etc/gconf/gconf.xml.defaults/schemas/apps/galeon