--- /dev/null
+--- nautils-1.0.6.orig/acinclude.m4 Thu Jan 1 01:00:00 1970
++++ nautilus-1.0.6/acinclude.m4 Tue Nov 13 11:22:16 2001
+@@ -0,0 +1,390 @@
++AC_DEFUN(AM_PATH_GNOME,
++[dnl
++dnl Get the cflags and libraries from the gnome-config script
++dnl
++AC_ARG_WITH(gnome-prefix,[ --with-gnome-prefix=PFX Prefix where GNOME is installed (optional)],
++ gnome_config_prefix="$withval", gnome_config_prefix="")
++AC_ARG_WITH(gnome-exec-prefix,[ --with-gnome-exec-prefix=PFX Exec prefix where GNOME is installed (optional)],
++ gnome_config_exec_prefix="$withval", gnome_config_exec_prefix="")
++
++ if test x$gnome_config_exec_prefix != x ; then
++ gnome_config_args="$gnome_config_args --exec-prefix=$gnome_config_exec_prefix"
++ if test x${GNOME_CONFIG+set} != xset ; then
++ GNOME_CONFIG=$gnome_config_exec_prefix/bin/gnome-config
++ fi
++ fi
++ if test x$gnome_config_prefix != x ; then
++ gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix"
++ if test x${GNOME_CONFIG+set} != xset ; then
++ GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config
++ fi
++ fi
++
++ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
++ min_gnome_version=ifelse([$1], , 1.1.0, $1)
++
++ AC_MSG_CHECKING(for GNOME - version >= $min_gnome_version)
++ no_gnome=""
++ if test "$GNOME_CONFIG" = "no" ; then
++ no_gnome=yes
++ else
++ GNOME_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnome`"
++ GNOME_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnome`"
++ GNOMEUI_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnomeui`"
++ GNOMEUI_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnomeui`"
++
++ gnome_config_major_version=`$GNOME_CONFIG $gnome_config_args --version | \
++ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
++ gnome_config_minor_version=`$GNOME_CONFIG $gnome_config_args --version | \
++ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
++ gnome_config_micro_version=`$GNOME_CONFIG $gnome_config_args --version | \
++ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
++ needed_major_version=`echo $min_gnome_version | \
++ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
++ needed_minor_version=`echo $min_gnome_version | \
++ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
++ needed_micro_version=`echo $min_gnome_version | \
++ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
++
++ if test $gnome_config_major_version -lt $needed_major_version; then
++ ifelse([$3], , :, [$3])
++ no_gnome=yes
++ elif test $gnome_config_major_version = $needed_major_version; then
++ if test -n "$needed_minor_version" -a $gnome_config_minor_version -lt $needed_minor_version; then
++ ifelse([$3], , :, [$3])
++ no_gnome=yes
++ elif test -n "$needed_minor_version" -a $gnome_config_minor_version = $needed_minor_version; then
++ if test -n "$needed_micro_version" -a $gnome_config_micro_version -lt $needed_micro_version; then
++ ifelse([$3], , :, [$3])
++ no_gnome=yes
++ fi
++ fi
++ fi
++ fi
++ AC_SUBST(GNOME_CFLAGS)
++ AC_SUBST(GNOME_LIBS)
++ AC_SUBST(GNOMEUI_CFLAGS)
++ AC_SUBST(GNOMEUI_LIBS)
++
++ if test "x$no_gnome" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$GNOME_CONFIG" = "no" ; then
++ echo "*** The gnome-config script installed by GNOME could not be found"
++ echo "*** If GNOME was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the GNOME_CONFIG environment variable to the"
++ echo "*** full path to gnome-config."
++ else
++ :
++ fi
++ GNOME_CFLAGS=""
++ GNOME_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++
++ tmp_gnome_libdir=`$GNOME_CONFIG $gnome_config_args --libdir`
++ if test -n "$4"; then
++ AC_MSG_CHECKING([for additional GNOME modules])
++ fi
++ for module in $4 ""; do
++ gnome_m4_notfound=no
++ if test "$module" = zvt; then
++ ZVT_LIBS="`$GNOME_CONFIG $gnome_config_args --libs zvt`"
++ AC_SUBST(ZVT_LIBS)
++ elif test "$module" = gtk; then
++ GTK_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gtk`"
++ GTK_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gtk`"
++ AC_SUBST(GTK_CFLAGS)
++ AC_SUBST(GTK_LIBS)
++ elif test "$module" = "glib"; then
++ GLIB_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags glib`"
++ GLIB_LIBS="`$GNOME_CONFIG $gnome_config_args --libs glib`"
++ AC_SUBST(GLIB_CFLAGS)
++ AC_SUBST(GLIB_LIBS)
++ elif test "$module" = "oaf"; then
++ OAF_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags oaf`"
++ OAF_LIBS="`$GNOME_CONFIG $gnome_config_args --libs oaf`"
++ AC_SUBST(OAF_CFLAGS)
++ AC_SUBST(OAF_LIBS)
++ elif test "$module" = "gnorba"; then
++ GNORBA_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnorba`"
++ GNORBA_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnorba`"
++ AC_SUBST(GNORBA_CFLAGS)
++ AC_SUBST(GNORBA_LIBS)
++ elif test -n "$module"; then
++ if $GNOME_CONFIG $gnome_config_args --cflags $module >/dev/null 2>&1; then
++ tmp_bsnom=`echo $module | tr a-z A-Z`
++ eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\"
++ eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\"
++ else
++ AC_MSG_RESULT([*** $module library is not installed])
++ ifelse([$3], , :, [$3])
++ gnome_m4_notfound=yes
++ fi
++ fi
++ if test "$gnome_m4_notfound" = no; then
++ echo $ac_n " $module" 1>&6
++ fi
++ done
++ if test -n "$4"; then
++ AC_MSG_RESULT([])
++ fi
++])
++
++dnl ===========================================================================
++
++dnl NAUTILUS_VERSION_CANON(version)
++dnl 1
++
++AC_DEFUN(NAUTILUS_VERSION_CANON, [`
++
++ dnl Assumes that there are no more than 999 revisions at a level,
++ dnl no more than three levels of revision.
++ dnl
++ dnl Any more than that, and test starts messing up the numeric
++ dnl comparisons because its integers overflow, and there's no
++ dnl way to do string comparisons in the shell. Grr.
++ dnl
++ dnl Must come up with some way to fix this.
++
++ echo "$1" |
++ tr . '\012' |
++ sed -e 's/^/000/' -e 's/^.*\(...\)/\1/' |
++ tr -d '\012' |
++ sed 's/$/000000000/
++ s/^\(.........\).*/\1/'
++`])
++
++dnl NAUTILUS_VERSION_INSIST(package, get-version-cmd, operator, want-version-var)
++dnl 1 2 3 4
++
++AC_DEFUN(NAUTILUS_VERSION_INSIST, [
++ ez_want_version=[$]$4
++
++ case "$3" in
++ ">") ez_operator=-gt ;;
++ ">=") ez_operator=-ge ;;
++ "<") ez_operator=-lt ;;
++ "<=") ez_operator=-le ;;
++ "=") ez_operator=-eq ;;
++ "!=") ez_operator=-ne ;;
++ *) AC_ERROR(Unknown operator $3 in configure script) ;;
++ esac
++
++ AC_MSG_CHECKING(for $1 $3 [$ez_want_version])
++
++ if ez_installed_version="`$2`"
++ then
++ AC_MSG_RESULT([$ez_installed_version])
++ else
++ AC_ERROR($2 failed)
++ fi
++
++ if test "NAUTILUS_VERSION_CANON([$ez_installed_version])" "$ez_operator" \
++ "NAUTILUS_VERSION_CANON([$ez_want_version])"
++ then
++ :
++ AC_SUBST($4)
++ else
++ AC_ERROR($1 version [$ez_want_version] is required.)
++ fi
++])
++
++dnl NAUTILUS_PATH_FREETYPE2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for FreeType2, and define FREETYPE2_CFLAGS and FREETYPE2_LIBS
++dnl
++dnl Shamelessly cut-n-pasted from AM_PATH_LIBART
++dnl
++AC_DEFUN(NAUTILUS_PATH_FREETYPE2,
++[dnl
++dnl Get the cflags and libraries from the freetype-config script
++dnl
++AC_ARG_WITH(freetype2-prefix,[ --with-freetype2-prefix=PFX Prefix where FREETYPE2 is installed (optional)],
++ freetype2_prefix="$withval", freetype2_prefix="")
++AC_ARG_WITH(freetype2-exec-prefix,[ --with-freetype2-exec-prefix=PFX Exec prefix where FREETYPE2 is installed (optional)],
++ freetype2_exec_prefix="$withval", freetype2_exec_prefix="")
++AC_ARG_ENABLE(freetype2test, [ --disable-freetype2test Do not try to compile and run a test FREETYPE2 program],
++ , enable_freetype2test=yes)
++
++ if test x$freetype2_exec_prefix != x ; then
++ freetype2_args="$freetype2_args --exec-prefix=$freetype2_exec_prefix"
++ if test x${FREETYPE2_CONFIG+set} != xset ; then
++ FREETYPE2_CONFIG=$freetype2_exec_prefix/bin/freetype-config
++ fi
++ fi
++ if test x$freetype2_prefix != x ; then
++ freetype2_args="$freetype2_args --prefix=$freetype2_prefix"
++ if test x${FREETYPE2_CONFIG+set} != xset ; then
++ FREETYPE2_CONFIG=$freetype2_prefix/bin/freetype-config
++ fi
++ fi
++
++ AC_PATH_PROG(FREETYPE2_CONFIG, freetype-config, no)
++ min_freetype2_version=ifelse([$1], ,0.2.5,$1)
++ AC_MSG_CHECKING(for FREETYPE2 - version >= $min_freetype2_version)
++ no_freetype2=""
++ if test "$FREETYPE2_CONFIG" = "no" ; then
++ no_freetype2=yes
++ else
++ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG $freetype2conf_args --cflags`
++ FREETYPE2_LIBS=`$FREETYPE2_CONFIG $freetype2conf_args --libs`
++
++ freetype2_major_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
++ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\1/'`
++ freetype2_minor_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
++ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\2/'`
++ freetype2_micro_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
++ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\3/'`
++
++ if test "x$enable_freetype2test" = "xyes" ; then
++ ac_save_CFLAGS="$CFLAGS"
++ ac_save_LIBS="$LIBS"
++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++ LIBS="$LIBS $FREETYPE2_LIBS"
++dnl
++dnl Now check if the installed FREETYPE2 is sufficiently new. (Also sanity
++dnl checks the results of freetype-config to some extent
++dnl
++ rm -f conf.freetype2test
++ AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <freetype/freetype.h>
++
++char*
++my_strdup (char *str)
++{
++ char *new_str;
++
++ if (str)
++ {
++ new_str = malloc ((strlen (str) + 1) * sizeof(char));
++ strcpy (new_str, str);
++ }
++ else
++ new_str = NULL;
++
++ return new_str;
++}
++
++int main ()
++{
++ int major, minor, micro;
++ char *tmp_version;
++
++ system ("touch conf.freetype2test");
++
++ /* HP/UX 9 (%@#!) writes to sscanf strings */
++ tmp_version = my_strdup("$min_freetype2_version");
++ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
++ printf("%s, bad version string\n", "$min_freetype2_version");
++ exit(1);
++ }
++
++ if (($freetype2_major_version > major) ||
++ (($freetype2_major_version == major) && ($freetype2_minor_version > minor)) ||
++ (($freetype2_major_version == major) && ($freetype2_minor_version == minor) && ($freetype2_micro_version >= micro)))
++ {
++ return 0;
++ }
++ else
++ {
++ printf("\n");
++ printf("*** \n");
++ printf("*** 'freetype-config --version' returned %d.%d.%d, but the minimum version\n", $freetype2_major_version, $freetype2_minor_version, $freetype2_micro_version);
++ printf("*** of FREETYPE2 required is %d.%d.%d. If freetype-config is correct, then it is\n", major, minor, micro);
++ printf("*** best to upgrade to the required version.\n");
++ printf("*** If freetype-config was wrong, set the environment variable FREETYPE2_CONFIG\n");
++ printf("*** to point to the correct copy of freetype-config, and remove the file\n");
++ printf("*** config.cache before re-running configure\n");
++ printf("*** \n");
++
++ return 1;
++ }
++}
++
++],, no_freetype2=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ if test "x$no_freetype2" = x ; then
++ AC_MSG_RESULT(yes)
++ ifelse([$2], , :, [$2])
++ else
++ AC_MSG_RESULT(no)
++ if test "$FREETYPE2_CONFIG" = "no" ; then
++ echo "*** The freetype-config script installed by FREETYPE2 could not be found"
++ echo "*** If FREETYPE2 was installed in PREFIX, make sure PREFIX/bin is in"
++ echo "*** your path, or set the FREETYPE2_CONFIG environment variable to the"
++ echo "*** full path to freetype-config."
++ else
++ if test -f conf.freetype2test ; then
++ :
++ else
++ echo "*** Could not run FREETYPE2 test program, checking why..."
++ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
++ LIBS="$LIBS $FREETYPE2_LIBS"
++ AC_TRY_LINK([
++#include <stdio.h>
++#include <freetype/freetype.h>
++], [ return 0; ],
++ [ echo "*** The test program compiled, but did not run. This usually means"
++ echo "*** that the run-time linker is not finding FREETYPE2 or finding the wrong"
++ echo "*** version of FREETYPE2. If it is not finding FREETYPE2, you'll need to set your"
++ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++ echo "*** to the installed location Also, make sure you have run ldconfig if that"
++ echo "*** is required on your system"
++ echo "***"
++ echo "*** If you have an old version installed, it is best to remove it, although"
++ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++ [ echo "*** The test program failed to compile or link. See the file config.log for the"
++ echo "*** exact error that occured. This usually means FREETYPE2 was incorrectly installed"
++ echo "*** or that you have moved FREETYPE2 since it was installed. In the latter case, you"
++ echo "*** may want to edit the freetype-config script: $FREETYPE2_CONFIG" ])
++ CFLAGS="$ac_save_CFLAGS"
++ LIBS="$ac_save_LIBS"
++ fi
++ fi
++ FREETYPE2_CFLAGS=""
++ FREETYPE2_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(FREETYPE2_CFLAGS)
++ AC_SUBST(FREETYPE2_LIBS)
++ rm -f conf.freetype2test
++])
++
++dnl AM_GCONF_SOURCE
++dnl Define GCONF_SCHEMA_CONFIG_SOURCE
++dnl
++AC_DEFUN(AM_GCONF_SOURCE,
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
++
++ AC_ARG_WITH(gconf-source,
++ [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
++
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT("Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation")
++
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR=$sysconfdir/gconf/schemas/
++ else
++ GCONF_SCHEMA_FILE_DIR=$GCONF_SCHEMA_FILE_DIR
++ fi
++
++ AC_ARG_WITH(gconf-schema-file-dir,
++ [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT("Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files")
++])
++
--- /dev/null
+diff -Nur nautilus-1.0.6.orig/Makefile.am nautilus-1.0.6/Makefile.am
+--- nautilus-1.0.6.orig/Makefile.am Tue Nov 13 11:26:25 2001
++++ nautilus-1.0.6/Makefile.am Tue Nov 13 11:29:06 2001
+@@ -1,6 +1,7 @@
+ include $(top_srcdir)/Makefile.shared
+
+-@XML_I18N_MERGE_DESKTOP_RULE@
++@XML_I18N_MERGE_DESKTOP_RULE1@
++@XML_I18N_MERGE_DESKTOP_RULE2@
+
+ DESKTOP_IN_FILES=nautilus.desktop.in nautilus-help.desktop.in
+ DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
+diff -Nur nautilus-1.0.6.orig/components/adapter/Makefile.am nautilus-1.0.6/components/adapter/Makefile.am
+--- nautilus-1.0.6.orig/components/adapter/Makefile.am Sat Sep 1 00:19:05 2001
++++ nautilus-1.0.6/components/adapter/Makefile.am Tue Nov 13 11:32:04 2001
+@@ -14,7 +14,8 @@
+
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ bin_PROGRAMS = \
+ nautilus-adapter \
+diff -Nur nautilus-1.0.6.orig/components/hardware/Makefile.am nautilus-1.0.6/components/hardware/Makefile.am
+--- nautilus-1.0.6.orig/components/hardware/Makefile.am Fri May 4 05:12:42 2001
++++ nautilus-1.0.6/components/hardware/Makefile.am Tue Nov 13 11:32:17 2001
+@@ -17,7 +17,8 @@
+
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ bin_PROGRAMS = \
+ nautilus-hardware-view
+diff -Nur nautilus-1.0.6.orig/components/help/Makefile.am nautilus-1.0.6/components/help/Makefile.am
+--- nautilus-1.0.6.orig/components/help/Makefile.am Thu Nov 8 02:52:08 2001
++++ nautilus-1.0.6/components/help/Makefile.am Tue Nov 13 11:32:41 2001
+@@ -62,7 +62,8 @@
+ $(NULL)
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+
+ EXTRA_DIST=pages.map $(oaf_in_files) $(oaf_DATA) $(modulesconf_DATA) $(hyperbola_DATA) $(ui_DATA)
+diff -Nur nautilus-1.0.6.orig/components/history/Makefile.am nautilus-1.0.6/components/history/Makefile.am
+--- nautilus-1.0.6.orig/components/history/Makefile.am Fri May 4 05:14:26 2001
++++ nautilus-1.0.6/components/history/Makefile.am Tue Nov 13 11:32:55 2001
+@@ -24,7 +24,8 @@
+
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST=$(oaf_DATA) $(oaf_in_files)
+
+diff -Nur nautilus-1.0.6.orig/components/image-viewer/Makefile.am nautilus-1.0.6/components/image-viewer/Makefile.am
+--- nautilus-1.0.6.orig/components/image-viewer/Makefile.am Sat Sep 1 00:19:05 2001
++++ nautilus-1.0.6/components/image-viewer/Makefile.am Tue Nov 13 11:33:20 2001
+@@ -26,6 +26,7 @@
+
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST=$(oaf_DATA) $(oaf_in_files)
+diff -Nur nautilus-1.0.6.orig/components/loser/content/Makefile.am nautilus-1.0.6/components/loser/content/Makefile.am
+--- nautilus-1.0.6.orig/components/loser/content/Makefile.am Sat Sep 1 00:19:06 2001
++++ nautilus-1.0.6/components/loser/content/Makefile.am Tue Nov 13 11:33:43 2001
+@@ -31,6 +31,7 @@
+ $(NULL)
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA)
+diff -Nur nautilus-1.0.6.orig/components/loser/sidebar/Makefile.am nautilus-1.0.6/components/loser/sidebar/Makefile.am
+--- nautilus-1.0.6.orig/components/loser/sidebar/Makefile.am Sat Sep 1 00:19:06 2001
++++ nautilus-1.0.6/components/loser/sidebar/Makefile.am Tue Nov 13 11:33:57 2001
+@@ -31,6 +31,7 @@
+ $(NULL)
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA)
+diff -Nur nautilus-1.0.6.orig/components/mozilla/Makefile.am nautilus-1.0.6/components/mozilla/Makefile.am
+--- nautilus-1.0.6.orig/components/mozilla/Makefile.am Tue Oct 9 23:09:16 2001
++++ nautilus-1.0.6/components/mozilla/Makefile.am Tue Nov 13 11:36:32 2001
+@@ -55,7 +55,8 @@
+
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ uidir = $(datadir)/gnome/ui
+ ui_DATA = \
+diff -Nur nautilus-1.0.6.orig/components/music/Makefile.am nautilus-1.0.6/components/music/Makefile.am
+--- nautilus-1.0.6.orig/components/music/Makefile.am Wed Aug 15 20:55:16 2001
++++ nautilus-1.0.6/components/music/Makefile.am Tue Nov 13 11:34:11 2001
+@@ -70,7 +70,8 @@
+
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(platform_source) \
+ configure.c \
+diff -Nur nautilus-1.0.6.orig/components/news/Makefile.am nautilus-1.0.6/components/news/Makefile.am
+--- nautilus-1.0.6.orig/components/news/Makefile.am Sun Aug 26 21:01:10 2001
++++ nautilus-1.0.6/components/news/Makefile.am Tue Nov 13 11:34:29 2001
+@@ -32,7 +32,8 @@
+ $(NULL)
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST= \
+ $(nautilus_DATA) \
+diff -Nur nautilus-1.0.6.orig/components/notes/Makefile.am nautilus-1.0.6/components/notes/Makefile.am
+--- nautilus-1.0.6.orig/components/notes/Makefile.am Fri May 4 05:14:30 2001
++++ nautilus-1.0.6/components/notes/Makefile.am Tue Nov 13 11:34:39 2001
+@@ -23,7 +23,8 @@
+ $(NULL)
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST= \
+ $(oaf_DATA)\
+diff -Nur nautilus-1.0.6.orig/components/sample/Makefile.am nautilus-1.0.6/components/sample/Makefile.am
+--- nautilus-1.0.6.orig/components/sample/Makefile.am Sat Sep 1 00:19:07 2001
++++ nautilus-1.0.6/components/sample/Makefile.am Tue Nov 13 11:34:53 2001
+@@ -38,6 +38,7 @@
+ $(NULL)
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA)
+diff -Nur nautilus-1.0.6.orig/components/text/Makefile.am nautilus-1.0.6/components/text/Makefile.am
+--- nautilus-1.0.6.orig/components/text/Makefile.am Fri May 4 05:14:31 2001
++++ nautilus-1.0.6/components/text/Makefile.am Tue Nov 13 11:35:07 2001
+@@ -33,7 +33,8 @@
+ $(NULL)
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA)
+
+diff -Nur nautilus-1.0.6.orig/components/throbber/Makefile.am nautilus-1.0.6/components/throbber/Makefile.am
+--- nautilus-1.0.6.orig/components/throbber/Makefile.am Wed Jun 27 01:51:51 2001
++++ nautilus-1.0.6/components/throbber/Makefile.am Tue Nov 13 11:35:20 2001
+@@ -28,7 +28,8 @@
+ $(NULL)
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST = \
+ $(oaf_in_files) \
+diff -Nur nautilus-1.0.6.orig/components/tree/Makefile.am nautilus-1.0.6/components/tree/Makefile.am
+--- nautilus-1.0.6.orig/components/tree/Makefile.am Tue Nov 13 11:26:25 2001
++++ nautilus-1.0.6/components/tree/Makefile.am Tue Nov 13 11:36:20 2001
+@@ -38,7 +38,8 @@
+ oaf_in_files = Nautilus_View_tree.oaf.in
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
+
+diff -Nur nautilus-1.0.6.orig/data/Makefile.am nautilus-1.0.6/data/Makefile.am
+--- nautilus-1.0.6.orig/data/Makefile.am Tue Nov 13 11:26:25 2001
++++ nautilus-1.0.6/data/Makefile.am Tue Nov 13 11:29:28 2001
+@@ -1,7 +1,9 @@
+ NULL=
+
+-@XML_I18N_MERGE_DESKTOP_RULE@
+-@XML_I18N_MERGE_DIRECTORY_RULE@
++@XML_I18N_MERGE_DESKTOP_RULE1@
++@XML_I18N_MERGE_DESKTOP_RULE2@
++@XML_I18N_MERGE_DIRECTORY_RULE1@
++@XML_I18N_MERGE_DIRECTORY_RULE2@
+
+ DESKTOP_IN_FILES= favorites.desktop.in \
+ programs.desktop.in \
+diff -Nur nautilus-1.0.6.orig/src/Makefile.am nautilus-1.0.6/src/Makefile.am
+--- nautilus-1.0.6.orig/src/Makefile.am Tue Oct 9 23:10:20 2001
++++ nautilus-1.0.6/src/Makefile.am Tue Nov 13 11:29:45 2001
+@@ -125,7 +125,8 @@
+ oaf_in_files = Nautilus_shell.oaf.in
+ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+-@XML_I18N_MERGE_OAF_RULE@
++@XML_I18N_MERGE_OAF_RULE1@
++@XML_I18N_MERGE_OAF_RULE2@
+
+ uidir = $(datadir)/gnome/ui
+ ui_DATA = \
projects / packages / nautilus.git / commitdiff