-diff -ur nautilus-1.0.6.orig/acinclude.m4 nautilus-1.0.6/acinclude.m4
---- nautilus-1.0.6.orig/acinclude.m4 Fri Dec 19 23:36:59 2003
-+++ nautilus-1.0.6/acinclude.m4 Fri Dec 19 23:44:05 2003
-@@ -357,3 +357,280 @@
- AC_SUBST(FREETYPE2_LIBS)
- rm -f conf.freetype2test
- ])
-+
-+AC_DEFUN(XML_I18N_TOOLS_NEWER_THAN_0_9,[ true ])
-+
-+dnl AC_PROG_XML_I18N_TOOLS([MINIMUM-VERSION [,"G2" if always using --utf8] ])
-+# serial 1 AC_PROG_XML_I18N_TOOLS
-+AC_DEFUN(AC_PROG_XML_I18N_TOOLS,
-+[
-+ AC_DEFUN(X18T_PFORG1, dnl and -u for G2
-+ ifelse([$2],[G2],[ -u ], [ -p ]))
-+ AC_DEFUN(X18T_XML_KIND,
-+ ifelse([$2],[G2],[ -u ],[ $(XML_I18N_XML_KIND) ]))
-+ AC_DEFUN(X18T_KEYS_KIND,
-+ ifelse([$2],[G2],[ -u ],[ $(XML_I18N_KEYS_KIND) ]))
-+
-+ XML_I18N_MERGE_DESKTOP_RULE='%.desktop: %.desktop.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d -u X18T_PFORG1'
-+XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d -u X18T_PFORG1'
-+ XML_I18N_MERGE_KEYS_RULE='%.keys: %.keys.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -k X18T_KEYS_KIND'
-+ XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -p'
-+ XML_I18N_MERGE_PONG_RULE='%.pong: %.pong.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_PFORG1'
-+ XML_I18N_MERGE_SERVER_RULE='%.server: %.server.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -u'
-+ XML_I18N_MERGE_SHEET_RULE='%.sheet: %.sheet.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x -u'
-+XML_I18N_MERGE_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d X18T_PFORG1'
-+ XML_I18N_MERGE_XML_RULE='%.xml: %.xml.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_XML_KIND'
-+
-+AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
-+AC_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
-+AC_SUBST(XML_I18N_MERGE_KEYS_RULE)
-+AC_SUBST(XML_I18N_MERGE_OAF_RULE)
-+AC_SUBST(XML_I18N_MERGE_PONG_RULE)
-+AC_SUBST(XML_I18N_MERGE_SERVER_RULE)
-+AC_SUBST(XML_I18N_MERGE_SHEET_RULE)
-+AC_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
-+AC_SUBST(XML_I18N_MERGE_XML_RULE)
-+
-+# Use the tools built into the package, not the ones that are installed.
-+
-+XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
-+AC_SUBST(XML_I18N_EXTRACT)dnl
-+
-+XML_I18N_MERGE='$(top_builddir)/xml-i18n-merge'
-+AC_SUBST(XML_I18N_MERGE)dnl
-+
-+XML_I18N_UPDATE='$(top_builddir)/xml-i18n-update'
-+AC_SUBST(XML_I18N_UPDATE)dnl
-+
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
-+if test -z "$INTLTOOL_PERL"; then
-+ AC_MSG_ERROR([perl not found; required for xml-i18n-tools])
-+fi
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+ AC_MSG_ERROR([perl 5.x required for xml-i18n-tools])
-+fi
-+
-+dnl Remove Intltool [] tags from po/POTFILES
-+dnl
-+ifdef([AC_DIVERSION_ICMDS],[
-+ AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-+ changequote(,)
-+ mv -f po/POTFILES po/POTFILES.tmp
-+ sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-+ rm -f po/POTFILES.tmp
-+ changequote([,])
-+ AC_DIVERT_POP()
-+],[
-+ ifdef([AC_CONFIG_COMMANDS_PRE],[
-+ AC_CONFIG_COMMANDS_PRE([
-+ changequote(,)
-+ mv -f po/POTFILES po/POTFILES.tmp
-+ sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-+ rm -f po/POTFILES.tmp
-+ changequote([,])
-+ ])
-+ ])
-+])
-+
-+dnl manually sed perl in so people don't have to put the xml-i18n-tools scripts in their
-+dnl AC_OUTPUT
-+AC_OUTPUT_COMMANDS([
-+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-extract.in > xml-i18n-extract.out
-+if cmp -s xml-i18n-extract xml-i18n-extract.out 2>/dev/null; then
-+ rm -f xml-i18n-extract.out
-+else
-+ mv -f xml-i18n-extract.out xml-i18n-extract
-+fi
-+chmod ugo+x xml-i18n-extract
-+chmod u+w xml-i18n-extract
-+
-+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-merge.in > xml-i18n-merge.out
-+if cmp -s xml-i18n-merge xml-i18n-merge.out 2>/dev/null; then
-+ rm -f xml-i18n-merge.out
-+else
-+ mv -f xml-i18n-merge.out xml-i18n-merge
-+fi
-+chmod ugo+x xml-i18n-merge
-+chmod u+w xml-i18n-merge
-+
-+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-update.in > xml-i18n-update.out
-+if cmp -s xml-i18n-update xml-i18n-update.out 2>/dev/null; then
-+ rm -f xml-i18n-update.out
-+else
-+ mv -f xml-i18n-update.out xml-i18n-update
-+fi
-+chmod ugo+x xml-i18n-update
-+chmod u+w xml-i18n-update
-+], INTLTOOL_PERL=${INTLTOOL_PERL})
-+
-+# Redirect the config.log output again, so that the ltconfig log is not
-+# clobbered by the next message.
-+exec 5>>./config.log
-+])
-+
-+dnl old names
-+AC_DEFUN(AM_PROG_XML_I18N_TOOLS, [indir([AC_PROG_XML_I18N_TOOLS])])dnl
-+# Configure paths for ESD
-+# Manish Singh 98-9-30
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-+dnl
-+AC_DEFUN(AM_PATH_ESD,
-+[dnl
-+dnl Get the cflags and libraries from the esd-config script
-+dnl
-+AC_ARG_WITH(esd-prefix,[ --with-esd-prefix=PFX Prefix where ESD is installed (optional)],
-+ esd_prefix="$withval", esd_prefix="")
-+AC_ARG_WITH(esd-exec-prefix,[ --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
-+ esd_exec_prefix="$withval", esd_exec_prefix="")
-+AC_ARG_ENABLE(esdtest, [ --disable-esdtest Do not try to compile and run a test ESD program],
-+ , enable_esdtest=yes)
-+
-+ if test x$esd_exec_prefix != x ; then
-+ esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-+ if test x${ESD_CONFIG+set} != xset ; then
-+ ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-+ fi
-+ fi
-+ if test x$esd_prefix != x ; then
-+ esd_args="$esd_args --prefix=$esd_prefix"
-+ if test x${ESD_CONFIG+set} != xset ; then
-+ ESD_CONFIG=$esd_prefix/bin/esd-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-+ min_esd_version=ifelse([$1], ,0.2.5,$1)
-+ AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
-+ no_esd=""
-+ if test "$ESD_CONFIG" = "no" ; then
-+ no_esd=yes
-+ else
-+ ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-+ ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-+
-+ esd_major_version=`$ESD_CONFIG $esd_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_esdtest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $ESD_CFLAGS"
-+ LIBS="$LIBS $ESD_LIBS"
-+dnl
-+dnl Now check if the installed ESD is sufficiently new. (Also sanity
-+dnl checks the results of esd-config to some extent
-+dnl
-+ rm -f conf.esdtest
-+ AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <esd.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.esdtest");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = my_strdup("$min_esd_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_esd_version");
-+ exit(1);
-+ }
-+
-+ if (($esd_major_version > major) ||
-+ (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-+ (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-+ printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-+ printf("*** best to upgrade to the required version.\n");
-+ printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-+ printf("*** to point to the correct copy of esd-config, and remove the file\n");
-+ printf("*** config.cache before re-running configure\n");
-+ return 1;
-+ }
-+}
-+
-+],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_esd" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$ESD_CONFIG" = "no" ; then
-+ echo "*** The esd-config script installed by ESD could not be found"
-+ echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the ESD_CONFIG environment variable to the"
-+ echo "*** full path to esd-config."
-+ else
-+ if test -f conf.esdtest ; then
-+ :
-+ else
-+ echo "*** Could not run ESD test program, checking why..."
-+ CFLAGS="$CFLAGS $ESD_CFLAGS"
-+ LIBS="$LIBS $ESD_LIBS"
-+ AC_TRY_LINK([
-+#include <stdio.h>
-+#include <esd.h>
-+], [ return 0; ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding ESD or finding the wrong"
-+ echo "*** version of ESD. If it is not finding ESD, 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 ESD was incorrectly installed"
-+ echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-+ echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ ESD_CFLAGS=""
-+ ESD_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(ESD_CFLAGS)
-+ AC_SUBST(ESD_LIBS)
-+ rm -f conf.esdtest
-+])
-diff -ur nautilus-1.0.6.orig/data/favorites.desktop.in nautilus-1.0.6/data/favorites.desktop.in
---- nautilus-1.0.6.orig/data/favorites.desktop.in Wed Sep 5 19:12:15 2001
-+++ nautilus-1.0.6/data/favorites.desktop.in Fri Dec 19 23:40:10 2003
-@@ -4,4 +4,6 @@
- _Comment=Favorite applications
- URL=favorites:
- Icon=gnome-favorites.png
--Terminal=0
-+Terminal=false
-+Encoding=UTF-8
-+# vi: encoding=utf-8
-diff -ur nautilus-1.0.6.orig/data/preferences.desktop.in nautilus-1.0.6/data/preferences.desktop.in
---- nautilus-1.0.6.orig/data/preferences.desktop.in Wed Sep 5 19:12:15 2001
-+++ nautilus-1.0.6/data/preferences.desktop.in Fri Dec 19 23:39:32 2003
-@@ -4,4 +4,6 @@
- _Comment=Adjust your user environment
- URL=preferences:
- Icon=apple-red.png
--Terminal=0
-+Terminal=false
-+Encoding=UTF-8
-+# vi: encoding=utf-8
-diff -ur nautilus-1.0.6.orig/data/programs.desktop.in nautilus-1.0.6/data/programs.desktop.in
---- nautilus-1.0.6.orig/data/programs.desktop.in Wed Sep 5 19:12:15 2001
-+++ nautilus-1.0.6/data/programs.desktop.in Fri Dec 19 23:39:59 2003
-@@ -3,5 +3,7 @@
- _Comment=Browse available software
- URL=programs:
- Icon=gnome-default-dlg.png
--Terminal=0
-+Terminal=false
- Type=Link
-+Encoding=UTF-8
-+# vi: encoding=utf-8
-diff -ur nautilus-1.0.6.orig/data/serverconfig.desktop.in nautilus-1.0.6/data/serverconfig.desktop.in
---- nautilus-1.0.6.orig/data/serverconfig.desktop.in Wed Sep 5 19:12:15 2001
-+++ nautilus-1.0.6/data/serverconfig.desktop.in Fri Dec 19 23:39:25 2003
-@@ -4,4 +4,6 @@
- _Comment=Configure network services (web server, DNS server, etc.)
- URL=server-settings:
- Icon=gnome-globe.png
--Terminal=0
-+Terminal=false
-+Encoding=UTF-8
-+# vi: encoding=utf-8
-diff -ur nautilus-1.0.6.orig/data/starthere-link.desktop.in nautilus-1.0.6/data/starthere-link.desktop.in
---- nautilus-1.0.6.orig/data/starthere-link.desktop.in Wed Sep 5 19:12:15 2001
-+++ nautilus-1.0.6/data/starthere-link.desktop.in Fri Dec 19 23:39:52 2003
-@@ -5,4 +5,6 @@
- URL=start-here:
- Icon=gnome-starthere.png
- X-Nautilus-Icon=gnome-starthere
--Terminal=0
-+Terminal=false
-+Encoding=UTF-8
-+# vi: encoding=utf-8
-diff -ur nautilus-1.0.6.orig/data/starthere.desktop.in nautilus-1.0.6/data/starthere.desktop.in
---- nautilus-1.0.6.orig/data/starthere.desktop.in Wed Sep 5 19:12:15 2001
-+++ nautilus-1.0.6/data/starthere.desktop.in Fri Dec 19 23:39:15 2003
-@@ -4,5 +4,7 @@
- Exec=nautilus start-here:
- Icon=gnome-starthere.png
- X-Nautilus-Icon=gnome-starthere
--Terminal=0
-+Terminal=false
+diff -urN aa/nautilus-2.6.0/nautilus-computer.desktop.in nautilus-2.6.0/nautilus-computer.desktop.in
+--- aa/nautilus-2.6.0/nautilus-computer.desktop.in 2003-11-06 16:12:30.000000000 +0100
++++ nautilus-2.6.0/nautilus-computer.desktop.in 2004-03-31 13:48:15.408408256 +0200
+@@ -8,6 +8,7 @@
+ Terminal=false
Type=Application
-+Encoding=UTF-8
-+# vi: encoding=utf-8
-diff -ur nautilus-1.0.6.orig/data/sysconfig.desktop.in nautilus-1.0.6/data/sysconfig.desktop.in
---- nautilus-1.0.6.orig/data/sysconfig.desktop.in Wed Sep 5 19:12:15 2001
-+++ nautilus-1.0.6/data/sysconfig.desktop.in Fri Dec 19 23:39:45 2003
-@@ -4,4 +4,6 @@
- _Comment=Change systemwide settings (affects all users)
- URL=system-settings:
- Icon=gnome-settings.png
--Terminal=0
-+Terminal=false
-+Encoding=UTF-8
-+# vi: encoding=utf-8
-diff -ur nautilus-1.0.6.orig/nautilus-help.desktop.in nautilus-1.0.6/nautilus-help.desktop.in
---- nautilus-1.0.6.orig/nautilus-help.desktop.in Tue Sep 4 17:37:03 2001
-+++ nautilus-1.0.6/nautilus-help.desktop.in Fri Dec 19 23:39:03 2003
-@@ -3,5 +3,7 @@
- _Comment=Documentation
- Exec=nautilus --no-default-window --no-desktop ghelp:toc
- Icon=gnome-help.png
--Terminal=0
-+Terminal=false
+ Categories=Application;Core;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=nautilus
+ X-GNOME-Bugzilla-Component=general
+diff -urN aa/nautilus-2.6.0/nautilus-home.desktop.in nautilus-2.6.0/nautilus-home.desktop.in
+--- aa/nautilus-2.6.0/nautilus-home.desktop.in 2003-11-06 16:32:39.000000000 +0100
++++ nautilus-2.6.0/nautilus-home.desktop.in 2004-03-31 13:48:09.400321624 +0200
+@@ -8,6 +8,7 @@
+ Terminal=false
Type=Application
-+Encoding=UTF-8
-+# vi: encoding=utf-8
-diff -ur nautilus-1.0.6.orig/nautilus.desktop.in nautilus-1.0.6/nautilus.desktop.in
---- nautilus-1.0.6.orig/nautilus.desktop.in Sat Jan 20 22:12:31 2001
-+++ nautilus-1.0.6/nautilus.desktop.in Fri Dec 19 23:39:38 2003
-@@ -4,5 +4,7 @@
- TryExec=run-nautilus
- Exec=run-nautilus
- Icon=nautilus-launch-icon.png
--Terminal=0
-+Terminal=false
- Type=Application
-+Encoding=UTF-8
-+# vi: encoding=utf-8
+ Categories=Application;Core;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=nautilus
+ X-GNOME-Bugzilla-Component=general
projects / packages / nautilus.git / commitdiff