update galeon to 1.3.20 - "In Soviet Russia focus steals you!"

2005-03-29 19:33:40 +00:00 · 2005-03-29 19:33:40 +00:00 · b2bf75f019
commit b2bf75f019
parent 1fbcac75b8
13 changed files with 318 additions and 553 deletions
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@ -1,63 +1,65 @@
-# $OpenBSD: Makefile,v 1.18 2005/03/13 05:06:18 kurt Exp $
+# $OpenBSD: Makefile,v 1.19 2005/03/29 19:33:40 wilfried Exp $

-BROKEN="requires upgrade to sync with mozilla"
+COMMENT=	"GNOME web browser based on gecko"

-COMMENT=		"GNOME web browser based on gecko"
+V=		1.3.20
+DISTNAME=	galeon-${V}
+PKGNAME=	${DISTNAME}
+CATEGORIES=	www

-V=			1.2.13
-DISTNAME=		galeon-${V}
-PKGNAME=		${DISTNAME}p1
-CATEGORIES=		www
-MOZ=			1.7.5
-
-HOMEPAGE=		http://galeon.sourceforge.net/
+HOMEPAGE=	http://galeon.sourceforge.net/

 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE IIOP ORBit ORBitCosNaming ORBitutil SM X11 Xext \
-			Xi Xinerama audiofile c esd gconf-1 gconf-gtk-1 gdk \
-			gdk_imlib glib gmodule gnome gthread gtk \
-			jpeg m oaf png popt \
-			pthread stdc++ tiff ungif wrap xml z \
+WANTLIB= ORBit-2.0.0 ORBitCosNaming-2.0.0 art_lgpl_2.0.0 atk-1.0.0.0 \
+        audiofile bonobo-2.0.0 bonobo-activation bonoboui-2.0.0 \
+        eel-2.0.0 esd gailutil gconf-2.0.0 gdk-x11-2.0.0.0 \
+        gdk_pixbuf-2.0.0.0 glade-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \
+        gnome-2.0.0 gnome-keyring gnomecanvas-2.0.0 gnomevfs-2.0.0 \
+        gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg \
+        pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
+        popt xml2.0.0 ICE SM X11 Xcursor Xext Xft Xinerama Xrender \
+        c crypto fontconfig freetype m pthread ssl stdc++ z

-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=galeon/}

-MODULES=		devel/gettext gcc3
-MODGCC3_ARCHES=		alpha
-MODGCC3_LANGS=		C++
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}

-BUILD_DEPENDS=		:mozilla-${MOZ}-!gtk2:www/mozilla \
-			:mozilla-devel-${MOZ}-!gtk2:www/mozilla,-devel \
-			:scrollkeeper->=0.3.12:textproc/scrollkeeper
-RUN_DEPENDS=		:scrollkeeper->=0.3.12:textproc/scrollkeeper
-LIB_DEPENDS=		art_lgpl,gnomesupport,gnomeui::x11/gnome/libs \
-			gdk_pixbuf::graphics/gdk-pixbuf \
-			glade,glade-gnome:libglade-*-gnome:devel/libglade,gnome \
-			gnomevfs::x11/gnome/vfs
-LIB_DEPENDS+= 		mozilla/gtkembedmoz,mozilla/gtksuperwin,mozilla/xpcom,mozilla/nspr4,mozilla/plc4,mozilla/plds4:mozilla-${MOZ}-!gtk2:www/mozilla
+MODULES=	devel/gettext gcc3
+MODGCC3_ARCHES=	alpha
+MODGCC3_LANGS=	C++

-CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
-			LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
-			MOZILLA_CONFIG=/usr/local/mozilla/mozilla-config
+BUILD_DEPENDS=	:mozilla-*-gtk2:www/mozilla,gtk2 \
+		:mozilla-devel-*-gtk2:www/mozilla,-devel,gtk2 \
+ 		:pkgconfig-*:devel/pkgconfig \
+		:p5-XML-Parser-*:textproc/p5-XML-Parser \
+		:scrollkeeper->=0.3.12:textproc/scrollkeeper
+LIB_DEPENDS= 	gnomeui-2.0::x11/gnome/libgnomeui \
+		nautilus::x11/gnome/nautilus \
+		mozilla/gtkembedmoz,mozilla/xpcom,mozilla/plds4,mozilla/plc4,mozilla/nspr4:mozilla-*-gtk2:www/mozilla,gtk2

-USE_X11=		Yes
-USE_GMAKE=		Yes
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--disable-werror \
-			--disable-scrollkeeper-update \
-			--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/galeon \
-			--with-mozilla-snapshot=${MOZ} \
-			--with-mozilla-home=${LOCALBASE}/mozilla \
-			--with-mozilla-libs=${LOCALBASE}/mozilla/lib \
-			--with-mozilla-includes=${LOCALBASE}/mozilla/include
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+		MOZILLA_CONFIG=/usr/local/mozilla/mozilla-config

-WRKDIST=		${WRKDIR}/galeon-${V}/
+USE_X11=	Yes
+USE_GMAKE=	Yes
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/galeon \
+		--disable-schemas-install \
+		--enable-nautilus-view \
+		--disable-gtkhtml
+
+WRKDIST=	${WRKDIR}/galeon-${V}/
+
+post-patch:
+	@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update

 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/schemas/galeon
-	${INSTALL_DATA} ${WRKSRC}/galeon.schemas ${PREFIX}/share/schemas/galeon/
+	@mv -f ${PREFIX}/bin/galeon ${PREFIX}/bin/galeon-bin
+	${INSTALL_SCRIPT} ${FILESDIR}/galeon ${PREFIX}/bin
+	@perl -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g;' ${PREFIX}/bin/galeon

 .include <bsd.port.mk>
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@ -1,4 +1,4 @@
-MD5 (galeon-1.2.13.tar.gz) = 62f0c497b8165fc567f8d2016b40a319
-RMD160 (galeon-1.2.13.tar.gz) = 9318b3c9465b5a9d18bcedf19a951228e319d57c
-SHA1 (galeon-1.2.13.tar.gz) = 0282ec0f714b83965fb3b242b9161c76d88fd49e
-SIZE (galeon-1.2.13.tar.gz) = 4220496
+MD5 (galeon-1.3.20.tar.gz) = 4c35320eb1e8980e896e7571f3f67a2c
+RMD160 (galeon-1.3.20.tar.gz) = 1a7fec5fd12a9a447cfc81d3a730cb10ca083526
+SHA1 (galeon-1.3.20.tar.gz) = be45ee96ff4b2b36b54391b41fd863023564c310
+SIZE (galeon-1.3.20.tar.gz) = 5730168
--- a/www/galeon/files/galeon
+++ b/www/galeon/files/galeon
@ -0,0 +1,20 @@
+:
+
+MOZILLA_HOME=%%LOCALBASE%%/mozilla
+
+if [ -z "$MOZ_PLUGIN_PATH" ]; then
+  MOZ_PLUGIN_PATH=~/.mozilla/plugins/
+  export MOZ_PLUGIN_PATH
+fi
+
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+exec "%%LOCALBASE%%/bin/galeon-bin" "$@"
--- a/www/galeon/patches/patch-Makefile_in
+++ b/www/galeon/patches/patch-Makefile_in
@ -1,11 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2004/01/18 10:49:52 wilfried Exp $
--- Makefile.in.orig	2003-11-23 19:20:13.000000000 +0100
-+++ Makefile.in	2003-12-12 16:54:12.000000000 +0100
-@@ -857,7 +857,6 @@ uninstall-info: uninstall-info-recursive
- @INTLTOOL_OAF_RULE@
- 
- install-schemas: galeon.schemas
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-1 --makefile-install-rule $(SCHEMAS_FILE)
- 
- @INSTALL_SCHEMAS_TRUE@install-data-local: install-schemas
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/www/galeon/patches/patch-configure
+++ b/www/galeon/patches/patch-configure
@ -1,67 +0,0 @@
-$OpenBSD: patch-configure,v 1.5 2004/01/18 10:49:03 wilfried Exp $
--- configure.orig	2003-11-23 19:20:10.000000000 +0100
-+++ configure	2004-01-18 11:30:53.000000000 +0100
-@@ -11755,6 +11755,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
-+#include <X11/Xlib.h>
- #include <X11/extensions/Xinerama.h>
- _ACEOF
- rm -f conftest.$ac_objext
-@@ -11790,6 +11791,7 @@ _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <X11/Xlib.h>
- #include <X11/extensions/Xinerama.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-@@ -11886,6 +11888,10 @@ USE_PTHREADS=
- _PTHREAD_CFLAGS=""
- _PTHREAD_LDFLAGS=""
- case "$OS_ARCH" in
-+	OpenBSD)
-+		USE_PTHREADS=1
-+		_PTHREAD_CFLAGS="-pthread -D_THREAD_SAFE"
-+		_PTHREAD_LDFLAGS="";;
- 	NetBSD)
- 		;;
- 	FreeBSD)
-@@ -12387,9 +12393,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
-CC="$_save_cc"
-
-LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
-+LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin $GTK_LIBS"
- echo "$as_me:$LINENO: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
- echo $ECHO_N "checking for gdk_superwin_get_type in -lgtksuperwin... $ECHO_C" >&6
- if test "${ac_cv_lib_gtksuperwin_gdk_superwin_get_type+set}" = set; then
-@@ -12449,14 +12453,14 @@ if test $ac_cv_lib_gtksuperwin_gdk_super
- fi
- 
- 
-LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs $_mozilla_gtk_super_win_libs"
-+LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs $_mozilla_gtk_super_win_libs $GTK_LIBS"
- echo "$as_me:$LINENO: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
- echo $ECHO_N "checking for gtk_moz_embed_get_type in -lgtkembedmoz... $ECHO_C" >&6
- if test "${ac_cv_lib_gtkembedmoz_gtk_moz_embed_get_type+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgtkembedmoz  $LIBS"
-+LIBS="-lgtkembedmoz $_PTHREAD_LDFLAGS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -12639,6 +12643,8 @@ if test "${with_mozilla_snapshot+set}" =
- 			MOZILLA_SNAPSHOT=12
- 		    elif test "$_moz_snap" = "1.6b" ; then
- 			MOZILLA_SNAPSHOT=13
-+		    elif test "$_moz_snap" = "1.6" ; then
-+			MOZILLA_SNAPSHOT=14
- 		    elif test "$_moz_snap" = "trunk" ; then
- 			MOZILLA_SNAPSHOT=13
- 		    else
--- a/www/galeon/patches/patch-galeon-config-tool_in
+++ b/www/galeon/patches/patch-galeon-config-tool_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-galeon-config-tool_in,v 1.2 2004/01/18 10:49:52 wilfried Exp $
--- galeon-config-tool.in.orig	2002-03-14 08:37:24.000000000 +0100
-+++ galeon-config-tool.in	2003-12-12 16:54:12.000000000 +0100
+$OpenBSD: patch-galeon-config-tool_in,v 1.3 2005/03/29 19:33:40 wilfried Exp $
+--- galeon-config-tool.in.orig	Thu Mar 14 08:40:24 2002
+++ galeon-config-tool.in	Tue Jan 18 21:40:23 2005
@@ -4,7 +4,7 @@ prefix=@prefix@
 
 clean () {
--- a/www/galeon/patches/patch-ltmain_sh
+++ b/www/galeon/patches/patch-ltmain_sh
@ -1,62 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2004/01/18 10:49:52 wilfried Exp $
--- ltmain.sh.orig	2003-02-14 19:32:56.000000000 +0100
-+++ ltmain.sh	2003-12-12 16:54:12.000000000 +0100
-@@ -1071,6 +1071,17 @@ compiler."
- 	continue
- 	;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -4524,40 +4535,6 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = ":" && exit 0
- 
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      echo "   $libdir"
-    done
-    echo
-    echo "If you ever happen to want to link against installed libraries"
-    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    echo
-    echo "See any operating system documentation about shared libraries for"
-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    echo "----------------------------------------------------------------------"
-     exit 0
-     ;;
- 
--- a/www/galeon/patches/patch-sounds_Makefile_in
+++ b/www/galeon/patches/patch-sounds_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-sounds_Makefile_in,v 1.1 2005/03/29 19:33:40 wilfried Exp $
+--- sounds/Makefile.in.orig	Sun Aug  8 22:12:13 2004
+++ sounds/Makefile.in	Tue Jan 18 23:22:08 2005
+@@ -232,7 +232,7 @@ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ galeon_SOUNDS = clicked.wav
+-soundlistdir = $(sysconfdir)/sound/events
+soundlistdir = $(prefix)/share/examples/galeon/sound/events
+ soundlist_in_files = galeon.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+ EXTRA_DIST = $(galeon_SOUNDS) $(soundlist_in_files)
--- a/www/galeon/patches/patch-src_embed_c
+++ b/www/galeon/patches/patch-src_embed_c
@ -1,11 +0,0 @@
-$OpenBSD: patch-src_embed_c,v 1.3 2004/01/18 10:49:52 wilfried Exp $
--- src/embed.c.orig	2003-11-23 19:39:16.000000000 +0100
-+++ src/embed.c	2003-12-12 16:54:12.000000000 +0100
-@@ -748,6 +748,7 @@ read_mozilla_version (void)
- 	gchar *preffile;
- 	FILE *f;
- 
-+	return g_strdup (MOZILLA_VERSION);
- 	preffile = g_strconcat (getenv ("MOZILLA_FIVE_HOME"),
- 				"/defaults/pref/all.js", NULL);
- 	f = fopen (preffile, "r");
--- a/www/galeon/patches/patch-src_mime_c
+++ b/www/galeon/patches/patch-src_mime_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_mime_c,v 1.2 2004/01/18 10:49:52 wilfried Exp $
--- src/mime.c.orig	2002-12-01 17:44:50.000000000 +0100
-+++ src/mime.c	2003-12-12 16:54:12.000000000 +0100
-@@ -202,7 +202,7 @@ void mime_db_save (void)
- 
- 		/* fill out fields */
- 		xmlSetProp (mime_node, "name", aMimeItem->name);
-		snprintf (buffer, 5, "%d", aMimeItem->action);
-+		snprintf (buffer, 3, "%d", aMimeItem->action);
- 		xmlSetProp (mime_node, "action", buffer);
- 		xmlSetProp (mime_node, "helper", aMimeItem->helperApp);
- 		snprintf (buffer, 3, "%d", aMimeItem->terminalHelper);
--- a/www/galeon/patches/patch-src_mozilla_TOCProtocolHandler_cpp
+++ b/www/galeon/patches/patch-src_mozilla_TOCProtocolHandler_cpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_mozilla_TOCProtocolHandler_cpp,v 1.2 2004/01/18 10:49:52 wilfried Exp $
--- src/mozilla/TOCProtocolHandler.cpp.orig	2003-06-14 18:44:50.000000000 +0200
-+++ src/mozilla/TOCProtocolHandler.cpp	2003-12-12 16:54:12.000000000 +0100
-@@ -367,7 +367,7 @@ NS_METHOD GTOCProtocolHandler::CreateHel
- 	nsresult rv;
- 
- 	struct dirent **namelist;
-	int n = scandir (SHARE_DIR"/../gnome/help", &namelist, select,
-+	int n = scandir (SHARE_DIR"/../gnome/help", &namelist, (int (*)(struct dirent *))select,
- 			 alphasort);
- 	if (n<0) return NS_ERROR_FAILURE;
- 
--- a/www/galeon/patches/patch-src_mozilla_mozilla_cpp
+++ b/www/galeon/patches/patch-src_mozilla_mozilla_cpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_mozilla_mozilla_cpp,v 1.2 2004/01/18 10:49:52 wilfried Exp $
--- src/mozilla/mozilla.cpp.orig	2003-11-01 20:57:15.000000000 +0100
-+++ src/mozilla/mozilla.cpp	2003-12-12 16:54:12.000000000 +0100
-@@ -854,7 +854,7 @@ struct nsKeyConverter {
- };
- 
- /* From mozilla/widget/src/gtk/nsGtkEventHandler.cpp */
-struct nsKeyConverter nsKeycodes[] = {
-+static struct nsKeyConverter nsKeycodes[] = {
- 
- 	{ NS_VK_CANCEL,     GDK_Cancel },
-   	{ NS_VK_BACK,       GDK_BackSpace },
--- a/www/galeon/pkg/PLIST
+++ b/www/galeon/pkg/PLIST
@ -1,67 +1,65 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/10/17 22:46:06 espie Exp $
+@comment $OpenBSD: PLIST,v 1.7 2005/03/29 19:33:40 wilfried Exp $
 bin/galeon
 bin/galeon-bin
 bin/galeon-config-tool
-lib/galeon/
-lib/galeon/components/
-lib/galeon/components/libgaleon-xpcom.la
-lib/galeon/components/libgaleon-xpcom.so
+lib/bonobo/
+lib/bonobo/servers/
+lib/bonobo/servers/GNOME_Galeon_Automation.server
+lib/bonobo/servers/GNOME_Galeon_NautilusView.server
@man man/man1/galeon.1
+share/applications/
+share/applications/galeon.desktop
+share/examples/galeon/
+share/examples/galeon/sound/
+share/examples/galeon/sound/events/
+share/examples/galeon/sound/events/galeon.soundlist
+@sample ${SYSCONFDIR}/sound/events/galeon.soundlist
 share/galeon/
-share/galeon/CloseTab.png
 share/galeon/FAQ.html
-share/galeon/Fullscreen.png
-share/galeon/Insecure.png
-share/galeon/Secure.png
 share/galeon/about_logo.png
 share/galeon/autoscroll.xpm
-share/galeon/babelfish.png
+share/galeon/bookmarks-editor-small.glade
+share/galeon/bookmarks-editor.glade
 share/galeon/bookmarks.glade
-share/galeon/bookmarks.png
 share/galeon/bug.png
-share/galeon/crash.xpm
+share/galeon/certificate-dialogs.glade
 share/galeon/debian.png
-share/galeon/default.png
-share/galeon/default_open.png
-share/galeon/delete.xpm
-share/galeon/dir.png
-share/galeon/dir_open.png
-share/galeon/download.png
-share/galeon/drag-url-icon.png
+share/galeon/default-bookmarks.xbel
+share/galeon/default-prefs.js
 share/galeon/fetch_favicon.xpm
-share/galeon/fetch_favicon_small.xpm
-share/galeon/fonts.png
 share/galeon/freshmeat.png
-share/galeon/galeon-composite.png
-share/galeon/galeon-watermark.png
+share/galeon/galeon-bookmark-alias-mark.png
+share/galeon/galeon-default.png
+share/galeon/galeon-download.png
+share/galeon/galeon-egg-ui-toolbar.xml
+share/galeon/galeon-egg-ui.xml
+share/galeon/galeon-entry.png
+share/galeon/galeon-filter.png
+share/galeon/galeon-folder.png
+share/galeon/galeon-history.png
+share/galeon/galeon-insecure.png
+share/galeon/galeon-popup-blocked.png
+share/galeon/galeon-prefs-fonts.png
+share/galeon/galeon-prefs-general.png
+share/galeon/galeon-prefs-language.png
+share/galeon/galeon-prefs-mouse.png
+share/galeon/galeon-prefs-network.png
+share/galeon/galeon-prefs-privacy.png
+share/galeon/galeon-prefs-tabs.png
+share/galeon/galeon-prefs-web-content.png
+share/galeon/galeon-secure.png
+share/galeon/galeon-separator.png
+share/galeon/galeon-tab-loading.gif
 share/galeon/galeon.glade
 share/galeon/galeon.png
-share/galeon/general.png
-share/galeon/gnome-error.xpm
-share/galeon/gnome-question.xpm
-share/galeon/gnome-warning.xpm
-share/galeon/gnome_icons.png
+share/galeon/gnu.png
 share/galeon/google.png
 share/galeon/google_groups.png
 share/galeon/google_images.png
-share/galeon/harddrive.png
-share/galeon/history.png
-share/galeon/i-bookmark.png
-share/galeon/i-bookmark.xpm
+share/galeon/hand-open.png
 share/galeon/imdb_movies.png
-share/galeon/js-all.xpm
-share/galeon/js-error.xpm
-share/galeon/js-info.xpm
-share/galeon/js-warning.xpm
-share/galeon/link.xpm
 share/galeon/logo.png
-share/galeon/mime.png
-share/galeon/mime.xpm
-share/galeon/mini_find.xpm
-share/galeon/mouse.png
 share/galeon/myportal.css
-share/galeon/nautilus_icons.png
-share/galeon/network.png
 share/galeon/new_alias.xpm
 share/galeon/new_alias_small.xpm
 share/galeon/new_folder.xpm
@ -70,294 +68,214 @@ share/galeon/new_item.xpm
 share/galeon/new_item_small.xpm
 share/galeon/new_separator.xpm
 share/galeon/new_separator_small.xpm
-share/galeon/preferences.glade
-share/galeon/print-preview.glade
+share/galeon/prefs-dialog.glade
 share/galeon/print.glade
-share/galeon/programs.png
-share/galeon/prompts.glade
 share/galeon/rpm.png
-share/galeon/security.png
 share/galeon/slack.png
-share/galeon/small-close.xpm
-share/galeon/small-detach.xpm
-share/galeon/small-menu.xpm
 share/galeon/smart-bm-fold.png
 share/galeon/smart-bm-unfold.png
-share/galeon/spinners/
-share/galeon/spinners/crashcut/
-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/
-share/galeon/spinners/galeon/001.png
-share/galeon/spinners/galeon/002.png
-share/galeon/spinners/galeon/003.png
-share/galeon/spinners/galeon/004.png
-share/galeon/spinners/galeon/005.png
-share/galeon/spinners/galeon/006.png
-share/galeon/spinners/galeon/007.png
-share/galeon/spinners/galeon/008.png
-share/galeon/spinners/galeon/009.png
-share/galeon/spinners/galeon/010.png
-share/galeon/spinners/galeon/011.png
-share/galeon/spinners/galeon/012.png
-share/galeon/spinners/galeon/013.png
-share/galeon/spinners/galeon/014.png
-share/galeon/spinners/galeon/015.png
-share/galeon/spinners/galeon/016.png
-share/galeon/spinners/galeon/017.png
-share/galeon/spinners/galeon/018.png
-share/galeon/spinners/galeon/019.png
-share/galeon/spinners/galeon/020.png
-share/galeon/spinners/galeon/021.png
-share/galeon/spinners/galeon/022.png
-share/galeon/spinners/galeon/023.png
-share/galeon/spinners/galeon/024.png
-share/galeon/spinners/galeon/025.png
-share/galeon/spinners/galeon/026.png
-share/galeon/spinners/galeon/027.png
-share/galeon/spinners/galeon/rest.png
-share/galeon/spinners/pipeon/
-share/galeon/spinners/pipeon/001.png
-share/galeon/spinners/pipeon/002.png
-share/galeon/spinners/pipeon/003.png
-share/galeon/spinners/pipeon/004.png
-share/galeon/spinners/pipeon/005.png
-share/galeon/spinners/pipeon/006.png
-share/galeon/spinners/pipeon/007.png
-share/galeon/spinners/pipeon/008.png
-share/galeon/spinners/pipeon/009.png
-share/galeon/spinners/pipeon/010.png
-share/galeon/spinners/pipeon/011.png
-share/galeon/spinners/pipeon/012.png
-share/galeon/spinners/pipeon/013.png
-share/galeon/spinners/pipeon/014.png
-share/galeon/spinners/pipeon/rest.png
-share/galeon/stock_trash.xpm
 share/galeon/stocks.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/
-share/galeon/themes/Aquatic/
-share/galeon/themes/Aquatic/Back-prelight.png
-share/galeon/themes/Aquatic/Back.png
-share/galeon/themes/Aquatic/Bookmarks-prelight.png
-share/galeon/themes/Aquatic/Bookmarks.png
-share/galeon/themes/Aquatic/Forward-prelight.png
-share/galeon/themes/Aquatic/Forward.png
-share/galeon/themes/Aquatic/Home-prelight.png
-share/galeon/themes/Aquatic/Home.png
-share/galeon/themes/Aquatic/New-prelight.png
-share/galeon/themes/Aquatic/New.png
-share/galeon/themes/Aquatic/Refresh-prelight.png
-share/galeon/themes/Aquatic/Refresh.png
-share/galeon/themes/Aquatic/Stop-prelight.png
-share/galeon/themes/Aquatic/Stop.png
-share/galeon/themes/Aquatic/Up-prelight.png
-share/galeon/themes/Aquatic/Up.png
-share/galeon/themes/GnomeLarge/
-share/galeon/themes/GnomeLarge/Back.png
-share/galeon/themes/GnomeLarge/Forward.png
-share/galeon/themes/GnomeLarge/Go.png
-share/galeon/themes/GnomeLarge/Home.png
-share/galeon/themes/GnomeLarge/New.png
-share/galeon/themes/GnomeLarge/Refresh.png
-share/galeon/themes/GnomeLarge/Stop.png
-share/galeon/themes/GnomeLarge/Up.png
-share/galeon/themes/Micro/
-share/galeon/themes/Micro/Back-prelight.png
-share/galeon/themes/Micro/Back.png
-share/galeon/themes/Micro/Forward-prelight.png
-share/galeon/themes/Micro/Forward.png
-share/galeon/themes/Micro/Home-prelight.png
-share/galeon/themes/Micro/Home.png
-share/galeon/themes/Micro/New-prelight.png
-share/galeon/themes/Micro/New.png
-share/galeon/themes/Micro/Refresh-prelight.png
-share/galeon/themes/Micro/Refresh.png
-share/galeon/themes/Micro/Stop-prelight.png
-share/galeon/themes/Micro/Stop.png
-share/galeon/themes/Micro/Up-prelight.png
-share/galeon/themes/Micro/Up.png
-share/galeon/themes/Remembrance/
-share/galeon/themes/Remembrance/Back-prelight.png
-share/galeon/themes/Remembrance/Back.png
-share/galeon/themes/Remembrance/Forward-prelight.png
-share/galeon/themes/Remembrance/Forward.png
-share/galeon/themes/Remembrance/Go-prelight.png
-share/galeon/themes/Remembrance/Go.png
-share/galeon/themes/Remembrance/Home-prelight.png
-share/galeon/themes/Remembrance/Home.png
-share/galeon/themes/Remembrance/New-prelight.png
-share/galeon/themes/Remembrance/New.png
-share/galeon/themes/Remembrance/Print-prelight.png
-share/galeon/themes/Remembrance/Print.png
-share/galeon/themes/Remembrance/Refresh-prelight.png
-share/galeon/themes/Remembrance/Refresh.png
-share/galeon/themes/Remembrance/Stop-prelight.png
-share/galeon/themes/Remembrance/Stop.png
-share/galeon/themes/Remembrance/Up-prelight.png
-share/galeon/themes/Remembrance/Up.png
-share/galeon/themes/Remembrance/empty-prelight.png
-share/galeon/themes/Remembrance/empty.png
-share/galeon/toc.css
-share/galeon/toolbars.png
-share/galeon/windows.png
 share/gnome/
-share/gnome/apps/
-share/gnome/apps/Internet/
-share/gnome/apps/Internet/galeon.desktop
+share/gnome-2.0/
+share/gnome-2.0/ui/
+share/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
+share/gnome-2.0/ui/nautilus-galeon-view-ui.xml
 share/gnome/help/
-share/gnome/help/galeon-manual/
-share/gnome/help/galeon-manual/C/
-share/gnome/help/galeon-manual/C/aboutbook.html
-share/gnome/help/galeon-manual/C/apx-authors.sgml
-share/gnome/help/galeon-manual/C/apx-bugs.sgml
-share/gnome/help/galeon-manual/C/apx-command-line.sgml
-share/gnome/help/galeon-manual/C/apx-compiling.sgml
-share/gnome/help/galeon-manual/C/apx-troubleshooting.sgml
-share/gnome/help/galeon-manual/C/authors.html
-share/gnome/help/galeon-manual/C/bookmarks-aliases.html
-share/gnome/help/galeon-manual/C/bookmarks-autobookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks-context-menus.html
-share/gnome/help/galeon-manual/C/bookmarks-importing.html
-share/gnome/help/galeon-manual/C/bookmarks-my-portal.html
-share/gnome/help/galeon-manual/C/bookmarks-nicks.html
-share/gnome/help/galeon-manual/C/bookmarks-smart-bookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks-toolbars.html
-share/gnome/help/galeon-manual/C/bookmarks-with-images.html
-share/gnome/help/galeon-manual/C/bookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks.sgml
-share/gnome/help/galeon-manual/C/browser-window.html
-share/gnome/help/galeon-manual/C/browser-window.sgml
-share/gnome/help/galeon-manual/C/bugs.html
-share/gnome/help/galeon-manual/C/command-line-options.html
-share/gnome/help/galeon-manual/C/compiling-from-source.html
-share/gnome/help/galeon-manual/C/figures/
-share/gnome/help/galeon-manual/C/figures/bookmarks-editor.png
-share/gnome/help/galeon-manual/C/figures/browser-window.png
-share/gnome/help/galeon-manual/C/figures/find-dialog.png
-share/gnome/help/galeon-manual/C/figures/gesture-back.png
-share/gnome/help/galeon-manual/C/figures/gesture-clone-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-clone-window.png
-share/gnome/help/galeon-manual/C/figures/gesture-close-2.png
-share/gnome/help/galeon-manual/C/figures/gesture-close.png
-share/gnome/help/galeon-manual/C/figures/gesture-contents.png
-share/gnome/help/galeon-manual/C/figures/gesture-forward.png
-share/gnome/help/galeon-manual/C/figures/gesture-fullscreen.png
-share/gnome/help/galeon-manual/C/figures/gesture-homepage.png
-share/gnome/help/galeon-manual/C/figures/gesture-new-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-new-window.png
-share/gnome/help/galeon-manual/C/figures/gesture-next-link.png
-share/gnome/help/galeon-manual/C/figures/gesture-next-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-prev-link.png
-share/gnome/help/galeon-manual/C/figures/gesture-prev-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-reload-bypass.png
-share/gnome/help/galeon-manual/C/figures/gesture-reload.png
-share/gnome/help/galeon-manual/C/figures/gesture-stop.png
-share/gnome/help/galeon-manual/C/figures/gesture-up.png
-share/gnome/help/galeon-manual/C/figures/gesture-view-source.png
-share/gnome/help/galeon-manual/C/figures/othertools-history.png
-share/gnome/help/galeon-manual/C/figures/othertools-pdm.png
-share/gnome/help/galeon-manual/C/figures/tabbed-browsing.png
-share/gnome/help/galeon-manual/C/figures/toolbars-bookmarks.png
-share/gnome/help/galeon-manual/C/figures/toolbars-main.png
-share/gnome/help/galeon-manual/C/find.html
-share/gnome/help/galeon-manual/C/full-screen-mode.html
-share/gnome/help/galeon-manual/C/galeon-manual.sgml
-share/gnome/help/galeon-manual/C/getting-started.html
-share/gnome/help/galeon-manual/C/getting-started.sgml
-share/gnome/help/galeon-manual/C/history.html
-share/gnome/help/galeon-manual/C/index.html
-share/gnome/help/galeon-manual/C/introduction.html
-share/gnome/help/galeon-manual/C/ln26.html
-share/gnome/help/galeon-manual/C/menubar.html
-share/gnome/help/galeon-manual/C/mouse-gestures.html
-share/gnome/help/galeon-manual/C/other-tools.html
-share/gnome/help/galeon-manual/C/other-tools.sgml
-share/gnome/help/galeon-manual/C/plugins.html
-share/gnome/help/galeon-manual/C/plugins.sgml
-share/gnome/help/galeon-manual/C/preface.sgml
-share/gnome/help/galeon-manual/C/preferences.html
-share/gnome/help/galeon-manual/C/preferences.sgml
-share/gnome/help/galeon-manual/C/prefs-advanced.html
-share/gnome/help/galeon-manual/C/prefs-gnome-url-handlers.html
-share/gnome/help/galeon-manual/C/prefs-handlers.html
-share/gnome/help/galeon-manual/C/prefs-rendering.html
-share/gnome/help/galeon-manual/C/prefs-user-interface.html
-share/gnome/help/galeon-manual/C/statusbar.html
-share/gnome/help/galeon-manual/C/stylesheet-images/
-share/gnome/help/galeon-manual/C/tabbed-browsing.html
-share/gnome/help/galeon-manual/C/toolbar.html
-share/gnome/ui/
-share/gnome/ui/nautilus-galeon-view-ui.xml
-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/el/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/gnome/help/galeon/
+share/gnome/help/galeon/C/
+share/gnome/help/galeon/C/apx-authors.xml
+share/gnome/help/galeon/C/apx-bugs.xml
+share/gnome/help/galeon/C/apx-command-line.xml
+share/gnome/help/galeon/C/apx-compiling.xml
+share/gnome/help/galeon/C/apx-keyboard-shortcuts.xml
+share/gnome/help/galeon/C/apx-mouse-gestures.xml
+share/gnome/help/galeon/C/apx-troubleshooting.xml
+share/gnome/help/galeon/C/bookmarks.xml
+share/gnome/help/galeon/C/browser-window.xml
+share/gnome/help/galeon/C/figures/
+share/gnome/help/galeon/C/figures/bookmarks-editor.png
+share/gnome/help/galeon/C/figures/browser-window.png
+share/gnome/help/galeon/C/figures/find-dialog.png
+share/gnome/help/galeon/C/figures/gesture-back.png
+share/gnome/help/galeon/C/figures/gesture-clone-tab.png
+share/gnome/help/galeon/C/figures/gesture-clone-window.png
+share/gnome/help/galeon/C/figures/gesture-close-2.png
+share/gnome/help/galeon/C/figures/gesture-close.png
+share/gnome/help/galeon/C/figures/gesture-contents.png
+share/gnome/help/galeon/C/figures/gesture-forward.png
+share/gnome/help/galeon/C/figures/gesture-fullscreen.png
+share/gnome/help/galeon/C/figures/gesture-homepage.png
+share/gnome/help/galeon/C/figures/gesture-new-tab.png
+share/gnome/help/galeon/C/figures/gesture-new-window.png
+share/gnome/help/galeon/C/figures/gesture-next-link.png
+share/gnome/help/galeon/C/figures/gesture-next-tab.png
+share/gnome/help/galeon/C/figures/gesture-prev-link.png
+share/gnome/help/galeon/C/figures/gesture-prev-tab.png
+share/gnome/help/galeon/C/figures/gesture-reload-bypass.png
+share/gnome/help/galeon/C/figures/gesture-reload.png
+share/gnome/help/galeon/C/figures/gesture-stop.png
+share/gnome/help/galeon/C/figures/gesture-up.png
+share/gnome/help/galeon/C/figures/gesture-view-source.png
+share/gnome/help/galeon/C/figures/othertools-history.png
+share/gnome/help/galeon/C/figures/othertools-pdm.png
+share/gnome/help/galeon/C/figures/othertools-toolbar-editor.png
+share/gnome/help/galeon/C/figures/statusbar.png
+share/gnome/help/galeon/C/figures/tabbed-browsing.png
+share/gnome/help/galeon/C/figures/toolbars-bookmarks.png
+share/gnome/help/galeon/C/figures/toolbars-main.png
+share/gnome/help/galeon/C/galeon.xml
+share/gnome/help/galeon/C/getting-started.xml
+share/gnome/help/galeon/C/other-tools.xml
+share/gnome/help/galeon/C/plugins.xml
+share/gnome/help/galeon/C/preface.xml
+share/gnome/help/galeon/C/preferences.xml
+share/gnome/help/galeon/es/
+share/gnome/help/galeon/es/apx-authors.xml
+share/gnome/help/galeon/es/apx-bugs.xml
+share/gnome/help/galeon/es/apx-command-line.xml
+share/gnome/help/galeon/es/apx-compiling.xml
+share/gnome/help/galeon/es/apx-keyboard-shortcuts.xml
+share/gnome/help/galeon/es/apx-mouse-gestures.xml
+share/gnome/help/galeon/es/apx-troubleshooting.xml
+share/gnome/help/galeon/es/bookmarks.xml
+share/gnome/help/galeon/es/browser-window.xml
+share/gnome/help/galeon/es/figures/
+share/gnome/help/galeon/es/figures/bookmarks-editor.png
+share/gnome/help/galeon/es/figures/browser-window.png
+share/gnome/help/galeon/es/figures/find-dialog.png
+share/gnome/help/galeon/es/figures/gesture-back.png
+share/gnome/help/galeon/es/figures/gesture-clone-tab.png
+share/gnome/help/galeon/es/figures/gesture-clone-window.png
+share/gnome/help/galeon/es/figures/gesture-close-2.png
+share/gnome/help/galeon/es/figures/gesture-close.png
+share/gnome/help/galeon/es/figures/gesture-contents.png
+share/gnome/help/galeon/es/figures/gesture-forward.png
+share/gnome/help/galeon/es/figures/gesture-fullscreen.png
+share/gnome/help/galeon/es/figures/gesture-homepage.png
+share/gnome/help/galeon/es/figures/gesture-new-tab.png
+share/gnome/help/galeon/es/figures/gesture-new-window.png
+share/gnome/help/galeon/es/figures/gesture-next-link.png
+share/gnome/help/galeon/es/figures/gesture-next-tab.png
+share/gnome/help/galeon/es/figures/gesture-prev-link.png
+share/gnome/help/galeon/es/figures/gesture-prev-tab.png
+share/gnome/help/galeon/es/figures/gesture-reload-bypass.png
+share/gnome/help/galeon/es/figures/gesture-reload.png
+share/gnome/help/galeon/es/figures/gesture-stop.png
+share/gnome/help/galeon/es/figures/gesture-up.png
+share/gnome/help/galeon/es/figures/gesture-view-source.png
+share/gnome/help/galeon/es/figures/othertools-history.png
+share/gnome/help/galeon/es/figures/othertools-pdm.png
+share/gnome/help/galeon/es/figures/othertools-toolbar-editor.png
+share/gnome/help/galeon/es/figures/statusbar.png
+share/gnome/help/galeon/es/figures/tabbed-browsing.png
+share/gnome/help/galeon/es/figures/toolbars-bookmarks.png
+share/gnome/help/galeon/es/figures/toolbars-main.png
+share/gnome/help/galeon/es/galeon.xml
+share/gnome/help/galeon/es/getting-started.xml
+share/gnome/help/galeon/es/other-tools.xml
+share/gnome/help/galeon/es/plugins.xml
+share/gnome/help/galeon/es/preface.xml
+share/gnome/help/galeon/es/preferences.xml
+share/locale/am/
+share/locale/am/LC_MESSAGES/
+share/locale/am/LC_MESSAGES/galeon-2.0.mo
+share/locale/az/
+share/locale/az/LC_MESSAGES/
+share/locale/az/LC_MESSAGES/galeon-2.0.mo
+share/locale/be/
+share/locale/be/LC_MESSAGES/
+share/locale/be/LC_MESSAGES/galeon-2.0.mo
+share/locale/bg/LC_MESSAGES/galeon-2.0.mo
+share/locale/bs/
+share/locale/bs/LC_MESSAGES/
+share/locale/bs/LC_MESSAGES/galeon-2.0.mo
+share/locale/ca/
+share/locale/ca/LC_MESSAGES/
+share/locale/ca/LC_MESSAGES/galeon-2.0.mo
+share/locale/cs/LC_MESSAGES/galeon-2.0.mo
+share/locale/da/LC_MESSAGES/galeon-2.0.mo
+share/locale/de/LC_MESSAGES/galeon-2.0.mo
+share/locale/el/LC_MESSAGES/galeon-2.0.mo
+share/locale/en_CA/
+share/locale/en_CA/LC_MESSAGES/
+share/locale/en_CA/LC_MESSAGES/galeon-2.0.mo
+share/locale/en_GB/
+share/locale/en_GB/LC_MESSAGES/
+share/locale/en_GB/LC_MESSAGES/galeon-2.0.mo
+share/locale/es/LC_MESSAGES/galeon-2.0.mo
+share/locale/et/LC_MESSAGES/galeon-2.0.mo
+share/locale/eu/
+share/locale/eu/LC_MESSAGES/
+share/locale/eu/LC_MESSAGES/galeon-2.0.mo
+share/locale/fi/LC_MESSAGES/galeon-2.0.mo
+share/locale/fr/LC_MESSAGES/galeon-2.0.mo
+share/locale/ga/
+share/locale/ga/LC_MESSAGES/
+share/locale/ga/LC_MESSAGES/galeon-2.0.mo
+share/locale/gl/LC_MESSAGES/galeon-2.0.mo
+share/locale/hr/LC_MESSAGES/galeon-2.0.mo
+share/locale/hu/LC_MESSAGES/galeon-2.0.mo
+share/locale/it/LC_MESSAGES/galeon-2.0.mo
+share/locale/ja/LC_MESSAGES/galeon-2.0.mo
+share/locale/ko/LC_MESSAGES/galeon-2.0.mo
 share/locale/lt/
 share/locale/lt/LC_MESSAGES/
-share/locale/lt/LC_MESSAGES/galeon.mo
-share/locale/lv/LC_MESSAGES/galeon.mo
+share/locale/lt/LC_MESSAGES/galeon-2.0.mo
+share/locale/lv/LC_MESSAGES/galeon-2.0.mo
+share/locale/mk/
+share/locale/mk/LC_MESSAGES/
+share/locale/mk/LC_MESSAGES/galeon-2.0.mo
+share/locale/ml/
+share/locale/ml/LC_MESSAGES/
+share/locale/ml/LC_MESSAGES/galeon-2.0.mo
+share/locale/mn/
+share/locale/mn/LC_MESSAGES/
+share/locale/mn/LC_MESSAGES/galeon-2.0.mo
 share/locale/ms/
 share/locale/ms/LC_MESSAGES/
-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/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/sr/LC_MESSAGES/galeon.mo
-share/locale/sr@Latn/LC_MESSAGES/galeon.mo
-share/locale/sv/LC_MESSAGES/galeon.mo
+share/locale/ms/LC_MESSAGES/galeon-2.0.mo
+share/locale/nb/LC_MESSAGES/galeon-2.0.mo
+share/locale/nl/LC_MESSAGES/galeon-2.0.mo
+share/locale/nn/LC_MESSAGES/galeon-2.0.mo
+share/locale/no/LC_MESSAGES/galeon-2.0.mo
+share/locale/pa/
+share/locale/pa/LC_MESSAGES/
+share/locale/pa/LC_MESSAGES/galeon-2.0.mo
+share/locale/pl/LC_MESSAGES/galeon-2.0.mo
+share/locale/pt/LC_MESSAGES/galeon-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
+share/locale/ro/LC_MESSAGES/galeon-2.0.mo
+share/locale/ru/LC_MESSAGES/galeon-2.0.mo
+share/locale/sk/LC_MESSAGES/galeon-2.0.mo
+share/locale/sl/LC_MESSAGES/galeon-2.0.mo
+share/locale/sq/
+share/locale/sq/LC_MESSAGES/
+share/locale/sq/LC_MESSAGES/galeon-2.0.mo
+share/locale/sr/
+share/locale/sr/LC_MESSAGES/
+share/locale/sr/LC_MESSAGES/galeon-2.0.mo
+share/locale/sr@Latn/
+share/locale/sr@Latn/LC_MESSAGES/
+share/locale/sr@Latn/LC_MESSAGES/galeon-2.0.mo
+share/locale/sv/LC_MESSAGES/galeon-2.0.mo
 share/locale/ta/
 share/locale/ta/LC_MESSAGES/
-share/locale/ta/LC_MESSAGES/galeon.mo
-share/locale/tr/LC_MESSAGES/galeon.mo
-share/locale/uk/LC_MESSAGES/galeon.mo
-share/locale/vi/LC_MESSAGES/galeon.mo
+share/locale/ta/LC_MESSAGES/galeon-2.0.mo
+share/locale/tr/LC_MESSAGES/galeon-2.0.mo
+share/locale/uk/LC_MESSAGES/galeon-2.0.mo
+share/locale/vi/
+share/locale/vi/LC_MESSAGES/
+share/locale/vi/LC_MESSAGES/galeon-2.0.mo
 share/locale/wa/
 share/locale/wa/LC_MESSAGES/
-share/locale/wa/LC_MESSAGES/galeon.mo
-share/locale/zh_CN/LC_MESSAGES/galeon.mo
-share/locale/zh_TW/LC_MESSAGES/galeon.mo
-share/oaf/
-share/oaf/GNOME_Galeon_Automation.oaf
-share/oaf/GNOME_Galeon_NautilusView.oaf
+share/locale/wa/LC_MESSAGES/galeon-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
+share/omf/
 share/omf/galeon/
-share/omf/galeon/galeon-manual-C.omf
+share/omf/galeon/galeon-C.omf
+share/omf/galeon/galeon-es.omf
+share/pixmaps/
 share/pixmaps/galeon.png
 share/schemas/
 share/schemas/galeon/
@ -365,6 +283,6 @@ share/schemas/galeon/galeon.schemas
 share/sounds/
 share/sounds/galeon/
 share/sounds/galeon/clicked.wav
-@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-1 --get-default-source` %D/bin/gconftool-1 --makefile-install-rule %D/share/schemas/galeon/*.schemas > /dev/null
@exec %D/bin/scrollkeeper-update -q
@unexec %D/bin/scrollkeeper-update -q
+@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/galeon/*.schemas > /dev/null