Update galeon to 0.12

Changes from Release Notes
	- Java console
	- full toolbar themability with a lot of cool themes
	- separate handling of normal and bookmarks toolbar visibility
	- ability to hide/show smartbookmarks entries
	- optional smart bookmarks history
	- optional smart bookmarks go button
	- improved protocols handling - lot of bugfixes

9 files changed, 309 insertions, 153 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index eb25d65d031..debbe77432f 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2001/08/27 19:19:27 tron Exp $
+# $NetBSD: Makefile,v 1.9 2001/08/29 14:02:28 taya Exp $
 
-DISTNAME=	galeon-0.11.5
+DISTNAME=	galeon-0.12
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}
 
@@ -37,6 +37,9 @@ LDFLAGS+=	-export-dynamic
 pre-configure:
 	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && ${TOUCH} aclocal.m4)
 
+pre-install:
+	${X11BASE}/bin/gconftool --shutdown
+
 post-install:
 	${SED} -e "s,@PREFIX@,${PREFIX},g" ${FILESDIR}/galeon.in > ${PREFIX}/bin/galeon
 	${CHOWN} ${BINOWN} ${PREFIX}/bin/galeon
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index 60af3afc6ff..363b11c9275 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2001/08/28 12:13:10 tron Exp $
+$NetBSD: distinfo,v 1.7 2001/08/29 14:02:28 taya Exp $
 
-SHA1 (galeon-0.11.5.tar.gz) = 694118065888ac120e420c50a1bf55164ea9d691
-Size (galeon-0.11.5.tar.gz) = 2153500 bytes
-SHA1 (patch-aa) = c68f372709a177cb4db2a7b1185c31b0292de148
-SHA1 (patch-ab) = 87a16754f2e259e4f3bda95cc163f2a9f666e364
-SHA1 (patch-ac) = 12aadc731c315989e3358b828f20dd4851918819
-SHA1 (patch-ad) = 39aefe2ac5189294e5de310a31a3c6ba5c2af6c9
+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
diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa
index f3bfc8dd9ff..2cd2bdf0db3 100644
--- a/www/galeon/patches/patch-aa
+++ b/www/galeon/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2001/08/21 20:09:59 tron Exp $
+$NetBSD: patch-aa,v 1.4 2001/08/29 14:02:28 taya Exp $
 
---- configure.in.orig	Wed Aug 15 22:45:28 2001
-+++ configure.in	Wed Aug 15 22:47:16 2001
-@@ -174,10 +174,10 @@
+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
@@ -16,7 +17,7 @@ $NetBSD: patch-aa,v 1.3 2001/08/21 20:09:59 tron Exp $
  
  _mozilla_all_nspr_flags="$_mozilla_nspr_libs $_mozilla_plc_libs $_mozilla_plds_libs"
  
-@@ -204,7 +204,7 @@
+@@ -235,7 +235,7 @@
  
  dnl gtk superwin library
  LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
diff --git a/www/galeon/patches/patch-ab b/www/galeon/patches/patch-ab
index a7b112f0e10..8d41b5b1bce 100644
--- a/www/galeon/patches/patch-ab
+++ b/www/galeon/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2001/08/21 20:09:59 tron Exp $
+$NetBSD: patch-ab,v 1.3 2001/08/29 14:02:29 taya Exp $
 
---- src/MyportalProtocolHandler.cpp.orig	Wed Aug 15 22:47:48 2001
-+++ src/MyportalProtocolHandler.cpp	Wed Aug 15 22:48:56 2001
-@@ -125,9 +125,9 @@
+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 @@
  	nsresult rv = NS_OK;
  	nsCOMPtr <nsIURI> newUri;
  
diff --git a/www/galeon/patches/patch-ac b/www/galeon/patches/patch-ac
index 76913ce527a..cd27675f7d9 100644
--- a/www/galeon/patches/patch-ac
+++ b/www/galeon/patches/patch-ac
@@ -1,8 +1,9 @@
-$NetBSD: patch-ac,v 1.1 2001/08/21 20:09:59 tron Exp $
+$NetBSD: patch-ac,v 1.2 2001/08/29 14:02:29 taya Exp $
 
---- src/mozilla.cpp.orig	Thu Aug 16 18:03:34 2001
-+++ src/mozilla.cpp	Thu Aug 16 19:21:01 2001
-@@ -1046,6 +1046,28 @@
+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
   */
@@ -31,7 +32,7 @@ $NetBSD: patch-ac,v 1.1 2001/08/21 20:09:59 tron Exp $
  extern "C" PRUnichar *
  mozilla_locale_to_unicode (const gchar *locStr)
  {
-@@ -1060,7 +1082,9 @@
+@@ -1131,7 +1153,9 @@
  	}
  
  	/* count the number of wide characters which will be produced */
@@ -42,7 +43,7 @@ $NetBSD: patch-ac,v 1.1 2001/08/21 20:09:59 tron Exp $
  	if (count == -1)
  	{
  		/* hmm, shouldnt happen but fallback to utf8 */
-@@ -1070,7 +1094,7 @@
+@@ -1141,7 +1165,7 @@
  
  	/* allocate and decode */
  	wide = g_new0 (wchar_t, count + 1);
diff --git a/www/galeon/patches/patch-ad b/www/galeon/patches/patch-ad
deleted file mode 100644
index 7da651e3f65..00000000000
--- a/www/galeon/patches/patch-ad
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2001/08/28 12:13:11 tron Exp $
-
---- aclocal.m4.orig	Sun Aug 12 12:49:07 2001
-+++ aclocal.m4	Tue Aug 28 14:06:56 2001
-@@ -134,53 +134,32 @@
- dnl AC_SUBST itself to avoid automake putting 
- dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
- dnl in all the Makefile.in's
--XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_OAF_RULE@%[$]XML_I18N_MERGE_OAF_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
-+AC_SUBST(XML_I18N_MERGE_OAF_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_KEYS_RULE@%[$]XML_I18N_MERGE_KEYS_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
-+AC_SUBST(XML_I18N_MERGE_KEYS_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_DESKTOP_RULE@%[$]XML_I18N_MERGE_DESKTOP_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
-+AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.directory'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_DIRECTORY_RULE@%[$]XML_I18N_MERGE_DIRECTORY_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.directory'
-+AC_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.soundlist'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_SOUNDLIST_RULE@%[$]XML_I18N_MERGE_SOUNDLIST_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.soundlist'
-+AC_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.pong'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_PONG_RULE@%[$]XML_I18N_MERGE_PONG_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.pong'
-+AC_SUBST(XML_I18N_MERGE_PONG_RULE)
- 
- dnl same deal
--XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.xml'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_XML_RULE@%[$]XML_I18N_MERGE_XML_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_XML_RULE='\%.xml : \%.xml.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.xml'
-+AC_SUBST(XML_I18N_MERGE_XML_RULE)
- 
- # Always use our own xml-i18n-tools.
- XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
-@@ -193,11 +172,8 @@
- AC_SUBST(XML_I18N_UPDATE)dnl
- 
- dnl same deal
--XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
--	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.soundlist'
--AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
--s%@XML_I18N_MERGE_SOUNDLIST_RULE@%[$]XML_I18N_MERGE_SOUNDLIST_RULE%g
--AC_DIVERT_POP()dnl
-+XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.soundlist'
-+AC_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
- 
- AC_PATH_PROG(XML_I18N_TOOLS_PERL, perl)
- if test -z "$XML_I18N_TOOLS_PERL"; then
diff --git a/www/galeon/patches/patch-ae b/www/galeon/patches/patch-ae
new file mode 100644
index 00000000000..5faf8f0b86a
--- /dev/null
+++ b/www/galeon/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2001/08/29 14:02:29 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 @@
+ 
+ 	if (!preview)
+ 	{
+-		result = print->Print (DOMWindow, options, NULL);
++		result = print->Print (DOMWindow, options, (nsIPrintListener *)NULL);
+ 	}
+ 	else
+ 	{
diff --git a/www/galeon/patches/patch-af b/www/galeon/patches/patch-af
new file mode 100644
index 00000000000..b3bf1549d22
--- /dev/null
+++ b/www/galeon/patches/patch-af
@@ -0,0 +1,14 @@
+$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 81d4a363dd5..ab306445b5a 100644
--- a/www/galeon/pkg/PLIST
+++ b/www/galeon/pkg/PLIST
@@ -1,17 +1,70 @@
-@comment $NetBSD: PLIST,v 1.4 2001/08/21 20:09:59 tron Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/08/29 14:02:29 taya Exp $
 bin/galeon
 bin/galeon-bin
-@exec mkdir %D/lib/galeon
+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
 etc/sound/events/galeon.soundlist
 man/man1/galeon.1
-share/galeon/Back.png
-share/galeon/Forward.png
-share/galeon/Go.png
-share/galeon/Home.png
-share/galeon/New.png
-share/galeon/Refresh.png
-share/galeon/Stop.png
-share/galeon/Up.png
 share/galeon/about_logo.png
 share/galeon/babelfish.png
 share/galeon/bookmarks.glade
@@ -58,6 +111,20 @@ share/galeon/rpm.png
 share/galeon/small-close.xpm
 share/galeon/small-detach.xpm
 share/galeon/small-menu.xpm
+share/galeon/smart-bm-tray.xpm
+share/galeon/spinners/crashcut/001.png
+share/galeon/spinners/crashcut/002.png
+share/galeon/spinners/crashcut/003.png
+share/galeon/spinners/crashcut/004.png
+share/galeon/spinners/crashcut/005.png
+share/galeon/spinners/crashcut/006.png
+share/galeon/spinners/crashcut/007.png
+share/galeon/spinners/crashcut/008.png
+share/galeon/spinners/crashcut/009.png
+share/galeon/spinners/crashcut/010.png
+share/galeon/spinners/crashcut/011.png
+share/galeon/spinners/crashcut/012.png
+share/galeon/spinners/crashcut/rest.png
 share/galeon/spinners/galeon/001.png
 share/galeon/spinners/galeon/002.png
 share/galeon/spinners/galeon/003.png
@@ -103,6 +170,71 @@ share/galeon/spinners/pipeon/014.png
 share/galeon/spinners/pipeon/rest.png
 share/galeon/stop.png
 share/galeon/tabs.png
+share/galeon/themes/Glass/Back.png
+share/galeon/themes/Glass/Forward.png
+share/galeon/themes/Glass/Home.png
+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/MozillaModern/Back.png
+share/galeon/themes/MozillaModern/Forward.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/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/Plastik/Back.png
+share/galeon/themes/Plastik/Forward.png
+share/galeon/themes/Plastik/Home.png
+share/galeon/themes/Plastik/New.png
+share/galeon/themes/Plastik/Refresh.png
+share/galeon/themes/Plastik/Stop.png
+share/galeon/themes/Plastik/Up.png
+share/galeon/themes/PlastikLarge/Back.png
+share/galeon/themes/PlastikLarge/Forward.png
+share/galeon/themes/PlastikLarge/Home.png
+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/Ska/Back.png
+share/galeon/themes/Ska/Forward.png
+share/galeon/themes/Ska/Home.png
+share/galeon/themes/Ska/Refresh.png
+share/galeon/themes/Ska/Stop.png
+share/galeon/themes/Ska/Up.png
+share/galeon/themes/gnome-large/Back.png
+share/galeon/themes/gnome-large/Forward.png
+share/galeon/themes/gnome-large/Go.png
+share/galeon/themes/gnome-large/Home.png
+share/galeon/themes/gnome-large/New.png
+share/galeon/themes/gnome-large/Refresh.png
+share/galeon/themes/gnome-large/Stop.png
+share/galeon/themes/gnome-large/Up.png
 share/galeon/toolbars.png
 share/galeon/windows.png
 share/gnome/apps/Internet/galeon.desktop
@@ -138,46 +270,121 @@ share/gnome/help/galeon/C/prefs-user-interface.html
 share/gnome/help/galeon/C/statusbar.html
 share/gnome/help/galeon/C/tabbed-browsing.html
 share/gnome/help/galeon/C/toolbar.html
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/galeon.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/galeon.mo
-share/oaf/galeon.oaf
+share/locale/az/LC_MESSAGES/galeon.mo
+share/locale/bg/LC_MESSAGES/galeon.mo
+share/locale/ca/LC_MESSAGES/galeon.mo
+share/locale/cs/LC_MESSAGES/galeon.mo
+share/locale/da/LC_MESSAGES/galeon.mo
+share/locale/de/LC_MESSAGES/galeon.mo
+share/locale/es/LC_MESSAGES/galeon.mo
+share/locale/et/LC_MESSAGES/galeon.mo
+share/locale/fi/LC_MESSAGES/galeon.mo
+share/locale/fr/LC_MESSAGES/galeon.mo
+share/locale/gl/LC_MESSAGES/galeon.mo
+share/locale/hr/LC_MESSAGES/galeon.mo
+share/locale/hu/LC_MESSAGES/galeon.mo
+share/locale/it/LC_MESSAGES/galeon.mo
+share/locale/ja/LC_MESSAGES/galeon.mo
+share/locale/ko/LC_MESSAGES/galeon.mo
+share/locale/lt/LC_MESSAGES/galeon.mo
+share/locale/ms/LC_MESSAGES/galeon.mo
+share/locale/nl/LC_MESSAGES/galeon.mo
+share/locale/nn/LC_MESSAGES/galeon.mo
+share/locale/no/LC_MESSAGES/galeon.mo
+share/locale/pl/LC_MESSAGES/galeon.mo
+share/locale/pt_BR/LC_MESSAGES/galeon.mo
+share/locale/ro/LC_MESSAGES/galeon.mo
+share/locale/ru/LC_MESSAGES/galeon.mo
+share/locale/sk/LC_MESSAGES/galeon.mo
+share/locale/sl/LC_MESSAGES/galeon.mo
+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/oaf/GNOME_Galeon_Automation.oaf
 share/pixmaps/galeon.png
 share/sounds/galeon/clicked.wav
-@dirrm lib/galeon
+@exec %D/bin/gconftool --shutdown
+@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults %D/bin/gconftool --makefile-install-rule %D/etc/gconf/schemas/galeon.schemas
 @dirrm share/sounds/galeon
 @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/PlastikLarge
+@dirrm share/galeon/themes/Plastik
+@dirrm share/galeon/themes/Netscape
+@dirrm share/galeon/themes/MozillaModern
+@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
 @dirrm share/galeon/spinners/galeon
+@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