From 48d56577d5561c5f2ec4a29974cd7f64a2aa8ad5 Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Fri, 4 May 2001 21:51:17 +0000 Subject: The new GNOME 1.4 "Fifth-Toe" metaport, bringing together a whole bunch of GNOME applications under one convenient building mechanism. Applications include: mozilla, galeon, gabber, pan, gnumeric, sodipodi, atomix, balsa, bombermaze, dia, eog, gedit, gimp, glimmer, gnomeicu, gob, gtm, gnucash and abiword. --- x11-fm/nautilus/Makefile | 30 +- x11-fm/nautilus/distinfo | 2 +- x11-fm/nautilus/files/patch-aa | 59 +--- x11-fm/nautilus/files/patch-ab | 27 +- x11-fm/nautilus/files/patch-ac | 289 ++++++++++++------- x11-fm/nautilus/files/patch-xml-i18n-extract | 11 - x11-fm/nautilus/files/patch-xml-i18n-merge | 11 - x11-fm/nautilus/files/patch-xml-i18n-update | 11 - x11-fm/nautilus/pkg-plist | 388 +++++++++++++++++++++++--- x11-fm/nautilus2/Makefile | 30 +- x11-fm/nautilus2/distinfo | 2 +- x11-fm/nautilus2/files/patch-aa | 59 +--- x11-fm/nautilus2/files/patch-ab | 27 +- x11-fm/nautilus2/files/patch-ac | 289 ++++++++++++------- x11-fm/nautilus2/files/patch-xml-i18n-extract | 11 - x11-fm/nautilus2/files/patch-xml-i18n-merge | 11 - x11-fm/nautilus2/files/patch-xml-i18n-update | 11 - x11-fm/nautilus2/pkg-plist | 388 +++++++++++++++++++++++--- 18 files changed, 1194 insertions(+), 462 deletions(-) delete mode 100644 x11-fm/nautilus/files/patch-xml-i18n-extract delete mode 100644 x11-fm/nautilus/files/patch-xml-i18n-merge delete mode 100644 x11-fm/nautilus/files/patch-xml-i18n-update delete mode 100644 x11-fm/nautilus2/files/patch-xml-i18n-extract delete mode 100644 x11-fm/nautilus2/files/patch-xml-i18n-merge delete mode 100644 x11-fm/nautilus2/files/patch-xml-i18n-update (limited to 'x11-fm') diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index cec3b027a7a1..67941553d6a9 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -6,22 +6,22 @@ # PORTNAME= nautilus -PORTVERSION= 0.8 +PORTVERSION= 1.0.2 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= unstable/sources/nautilus +MASTER_SITE_SUBDIR= stable/sources/nautilus MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \ - freetype-config:${PORTSDIR}/print/freetype2 # XXX +BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX +# The following is only needed if --with-eazel-services is brought in, +# which it isn't, because it depends on ammonite, which is Linux-only +# BUILD_DEPENDS+=rpm:${PORTSDIR}/archivers/rpm + LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \ - gtkhtml.8:${PORTSDIR}/www/gtkhtml \ - ghttp.1:${PORTSDIR}/www/libghttp \ - bz2.1:${PORTSDIR}/archivers/bzip2 \ freetype.6:${PORTSDIR}/print/freetype2 -.if defined(WITH_MOZILLA) +.if !defined(WITHOUT_MOZILLA) MOZILLA= mozilla BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} @@ -34,12 +34,12 @@ USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" -CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ - --with-freetype2-include-place=${LOCALBASE}/include/freetype2 +CONFIGURE_ARGS= --with-freetype2-lib-place=${X11BASE}/lib \ + --with-freetype2-include-place=${X11BASE}/include/freetype2 -.if defined(WITH_MOZILLA) +.if !defined(WITHOUT_MOZILLA) CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \ --with-mozilla-include-place=${X11BASE}/include/mozilla MOZILLA_LIBS= "-L${X11BASE}/lib/${MOZILLA}" @@ -50,9 +50,11 @@ MOZILLA_LIBS= "" PLIST_SUB+= MOZILLA:="@comment " .endif -.if !defined(WITH_MOZILLA) +MAN1= nautilus-xml-migrate.1 + +.if !defined(WITHOUT_MOZILLA) pre-extract: - @${ECHO} "You can add embedded mozilla support by defining WITH_MOZILLA" + @${ECHO} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA" .endif pre-patch: diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index 554338f88a7e..11d30f6f75f6 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1 +1 @@ -MD5 (nautilus-0.8.tar.gz) = 26e6403619559477d02f1cabb7681e4c +MD5 (nautilus-1.0.2.tar.gz) = 9c6b11436e11d7dc184dd5748e7e82ac diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa index 4f01381ab0bb..5c7b55cccce7 100644 --- a/x11-fm/nautilus/files/patch-aa +++ b/x11-fm/nautilus/files/patch-aa @@ -1,11 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Wed Jan 31 17:42:11 2001 -+++ configure Wed Jan 31 17:52:50 2001 -@@ -41,9 +41,9 @@ - ac_help="$ac_help - --enable-eazel-services Enable support for Eazel services (default is no)" +--- configure.orig Mon Mar 12 19:48:16 2001 ++++ configure Fri Mar 16 15:02:38 2001 +@@ -45,5 +45,5 @@ ac_help="$ac_help - --with-freetype2-libraries=PATH freetype2 library path" + --with-freetype2-lib-place=PREFIX freetype2 library path" @@ -13,49 +8,31 @@ $FreeBSD$ - --with-freetype2-includes=PATH freetype2 include path" + --with-freetype2-include-place=PREFIX freetype2 include path" ac_help="$ac_help - --with-freetype2-prefix=PATH freetype2 installation prefix" - ac_help="$ac_help -@@ -2789,15 +2789,15 @@ - _found_freetype2="no" - +@@ -3216,4 +3216,4 @@ # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given. -if test "${with_freetype2_libraries+set}" = set; then - withval="$with_freetype2_libraries" +if test "${with_freetype2_lib_place+set}" = set; then + withval="$with_freetype2_lib_place" freetype2_lib_prefix=$withval - fi - - +@@ -3223,4 +3223,4 @@ # Check whether --with-freetype2-includes or --without-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval="$with_freetype2_includes" +if test "${with_freetype2_include_place+set}" = set; then + withval="$with_freetype2_include_place" freetype2_include_prefix=$withval - fi - -@@ -2927,7 +2927,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +@@ -3354,3 +3354,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam -ldl $LIBS" +LIBS="-lpam $LIBS" cat > conftest.$ac_ext <&6 - else +@@ -3394,3 +3394,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam_misc -ldl -lpam $LIBS" +LIBS="-lpam_misc -lpam $LIBS" cat > conftest.$ac_ext <&6 - PAM_LIBS="-ldl -lpam -lpam_misc" + PAM_LIBS="-lpam -lpam_misc" @@ -64,23 +41,13 @@ $FreeBSD$ -PAM_LIBS="-ldl -lpam" +PAM_LIBS="-lpam" fi - - else -@@ -3235,7 +3235,7 @@ - - CC="$_save_cc" +@@ -3662,3 +3662,3 @@ -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin" +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin" echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6 - echo "configure:3241: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 - ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'` -@@ -3598,7 +3598,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- rpm_libs=-lbz2 -+ rpm_libs="-lrpm -lbz2" - else - echo "$ac_t""no" 1>&6 +@@ -6117,3 +6117,3 @@ + if test x$SCROLLKEEPER_CONFIG = xno; then +- { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; } ++ echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2 fi diff --git a/x11-fm/nautilus/files/patch-ab b/x11-fm/nautilus/files/patch-ab index a46aeaaf19d8..169e4d76349d 100644 --- a/x11-fm/nautilus/files/patch-ab +++ b/x11-fm/nautilus/files/patch-ab @@ -1,13 +1,28 @@ ---- Makefile.in.orig Wed Aug 16 08:26:30 2000 -+++ Makefile.in Wed Aug 23 14:56:45 2000 -@@ -501,8 +501,8 @@ - $(mkinstalldirs) $(DESTDIR)/$(prefix)/bin - @list='nautilus-clean.sh'; for p in $$list; do\ +--- Makefile.in.orig Mon Mar 12 19:49:51 2001 ++++ Makefile.in Fri Mar 16 16:15:38 2001 +@@ -202,3 +202,3 @@ + +-SUBDIRS = data icons intl cut-n-paste-code librsvg libnautilus libnautilus-adapter libnautilus-extensions helper-utilities helper-scripts src components $(APPLETS_SUBDIRS) nautilus-installer test user-guide help po omf-install $(NULL) ++SUBDIRS = data icons intl cut-n-paste-code librsvg libnautilus libnautilus-adapter libnautilus-extensions helper-utilities helper-scripts src components $(APPLETS_SUBDIRS) nautilus-installer test user-guide help po $(NULL) + +@@ -607,4 +607,4 @@ if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \ - $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ else :; fi; \ +@@ -620,4 +620,4 @@ + do \ +- echo $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ +- $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ ++ echo $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \ ++ $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \ + done +@@ -628,4 +628,4 @@ + do \ +- echo $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ +- $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ ++ echo $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \ ++ $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \ done - diff --git a/x11-fm/nautilus/files/patch-ac b/x11-fm/nautilus/files/patch-ac index 632cbbc8420a..8e4edd0bf3ab 100644 --- a/x11-fm/nautilus/files/patch-ac +++ b/x11-fm/nautilus/files/patch-ac @@ -1,54 +1,92 @@ $FreeBSD$ ---- libnautilus-extensions/nautilus-volume-monitor.c.orig Tue Jan 16 03:31:56 2001 -+++ libnautilus-extensions/nautilus-volume-monitor.c Wed Jan 31 21:29:21 2001 -@@ -60,7 +60,13 @@ - #include +--- libnautilus-extensions/nautilus-volume-monitor.c.orig Sat Feb 24 01:54:34 2001 ++++ libnautilus-extensions/nautilus-volume-monitor.c Sun Mar 11 15:46:11 2001 +@@ -68,6 +68,12 @@ + #include #endif +#ifdef __FreeBSD__ +#include +#include +#include -+#else - #include +#endif ++ + #ifdef HAVE_SYS_MNTTAB_H + #define SOLARIS_MNT 1 + #include +@@ -327,6 +333,12 @@ + has_removable_mntent_options (struct mnttab *ent) + { - #ifdef MOUNT_AUDIO_CD ++#elif defined(__FreeBSD__) ++ ++static gboolean ++has_removable_mntent_options (struct fstab *ent) ++{ ++ + #else + + static gboolean +@@ -335,12 +347,18 @@ + + #endif /* HAVE_SYS_MNTTAB_H */ + ++#ifndef __FreeBSD__ + /* Use "owner" or "user" or "users" as our way of determining a removable volume */ + if (hasmntopt (ent, "user") != NULL + || hasmntopt (ent, "users") != NULL + || hasmntopt (ent, "owner") != NULL) { + return TRUE; + } ++#else ++ if (strstr (ent->fs_mntops, "noauto") != NULL) { ++ return TRUE; ++ } ++#endif -@@ -264,16 +270,25 @@ - GList * - nautilus_volume_monitor_get_removable_volumes (NautilusVolumeMonitor *monitor) + #if SOLARIS_MNT && HAVE_VOL + if (strstr (ent->mnt_special, "/vol/") == ent->mnt_special) { +@@ -360,23 +378,32 @@ + static GList * + get_removable_volumes (void) { +#ifndef __FreeBSD__ FILE *file; - GList *volumes; + #if HAVE_SYS_MNTTAB_H + struct mnttab dummy_ent; + struct mnttab *ent = &dummy_ent; + #else struct mntent *ent; -+#else -+ struct fstab *ent; -+#endif + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ ++struct fstab *ent; ++#endif /* __FreeBSD__ */ + GList *volumes; NautilusVolume *volume; volumes = NULL; +#ifndef __FreeBSD__ - file = setmntent (_PATH_MNTTAB, "r"); - g_return_val_if_fail (file != NULL, NULL); + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return NULL; + } +#else + setfsent(); -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ - while ((ent = getmntent (file)) != NULL) { - /* Use noauto as our way of determining a removable volume */ - if (strstr (ent->mnt_opts, MNTOPT_NOAUTO) != NULL) { -@@ -281,6 +296,15 @@ - volume->device_path = g_strdup (ent->mnt_fsname); - volume->mount_path = g_strdup (ent->mnt_dir); + #if HAVE_SYS_MNTTAB_H + while (! getmntent (file, ent)) { + /* On Solaris look for /vol/ for determining a removable volume */ +@@ -396,12 +423,27 @@ volume->filesystem = g_strdup (ent->mnt_type); -+#else /* FreeBSD, probably ;) */ + + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ + while ((ent = getfsent ()) != NULL) { + /* Use noauto as our way of determining a removable volume */ + if (strstr (ent->fs_mntops, "noauto") != NULL) { @@ -56,11 +94,11 @@ $FreeBSD$ + volume->device_path = g_strdup (ent->fs_spec); + volume->mount_path = g_strdup (ent->fs_file); + volume->filesystem = g_strdup (ent->fs_vfstype); -+#endif - if (mount_volume_add_filesystem (volume)) { - mount_volume_get_name (volume); - volumes = g_list_append (volumes, volume); -@@ -290,7 +314,11 @@ ++ volume->is_removable = TRUE; ++ volume->is_read_only = (strstr (ent->fs_type, FSTAB_RO) !=NULL); ++#endif /* __FreeBSD__ */ + + volumes = mount_volume_add_filesystem (volume, volumes); } } @@ -72,62 +110,158 @@ $FreeBSD$ #ifdef MOUNT_AUDIO_CD volume = g_new0 (NautilusVolume, 1); -@@ -682,15 +710,27 @@ +@@ -419,6 +461,7 @@ + static gboolean + volume_is_removable (const NautilusVolume *volume) { - GList *current_mounts = NULL; - NautilusVolume *volume = NULL; +#ifndef __FreeBSD__ - FILE *fh; + FILE *file; + #if HAVE_SYS_MNTTAB_H + struct mnttab dummy_ent; +@@ -426,13 +469,21 @@ + #else + struct mntent *ent; + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ ++ struct fstab *ent; ++#endif /* __FreeBSD__ */ + ++#ifndef __FreeBSD__ + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return FALSE; + } ++#else ++ setfsent(); ++#endif /* __FreeBSD__ */ + + /* Search for our device in the fstab */ ++#ifndef __FreeBSD__ + #if HAVE_SYS_MNTTAB_H + while (!getmntent (file, ent)) { + if (strcmp (volume->device_path, ent->mnt_special) == 0) { +@@ -455,8 +506,23 @@ + } + + #endif /* HAVE_SYS_MNTTAB_H */ +- ++#else /* __FreeBSD__ */ ++ while ((ent = getfsent ()) != NULL) { ++ /* Use noauto as our way of determining a removable volume */ ++ if (strcmp (volume->device_path, ent->fs_spec) == 0 ++ && has_removable_mntent_options (ent)) { ++ endfsent(); ++ return TRUE; ++ } ++ } ++#endif /* __FreeBSD__ */ ++ ++ ++#ifndef __FreeBSD__ + fclose (file); ++#else ++ endfsent(); ++#endif + return FALSE; + } + +@@ -484,14 +550,23 @@ + } + } + #else ++#ifndef __FreeBSD__ + struct mntent *ent; +- ++#else ++ struct fstab *ent; ++#endif ++ ++#ifndef __FreeBSD__ + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return FALSE; + } +- ++#else ++ setfsent(); ++#endif /* __FreeBSD__ */ ++ + /* Search for our device in the fstab */ ++#ifndef __FreeBSD__ + while ((ent = getmntent (file)) != NULL) { + if (strcmp (volume->device_path, ent->mnt_fsname) == 0) { + if (strstr (ent->mnt_opts, MNTOPT_RO) != NULL) { +@@ -500,9 +575,21 @@ + } + } + } ++#else /* __FreeBSD__ */ ++ while ((ent = getfsent ()) != NULL) { ++ if (strcmp (volume->device_path, ent->fs_spec) == 0 ++ && strstr (ent->fs_type, FSTAB_RO) != NULL) { ++ endfsent(); ++ return TRUE; ++ } ++ } ++ endfsent(); ++#endif + #endif + ++#ifndef __FreeBSD__ + fclose (file); ++#endif + return FALSE; + } + +@@ -975,14 +1062,26 @@ + + + #else ++#ifndef __FreeBSD__ char line[PATH_MAX * 3]; char device_name[sizeof (line)]; NautilusStringList *list; -+#else ++#else /* __FreeBSD__ */ + struct statfs *mounted; + int mounted_num; + int i; -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ /* Open /proc/mounts */ fh = fopen (PATH_PROC_MOUNTS, "r"); g_return_val_if_fail (fh != NULL, NULL); -+#else ++#else /* __FreeBSD__ */ + mounted_num = getmntinfo(&mounted, MNT_WAIT); + g_return_val_if_fail (mounted_num > 0, NULL); -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ while (fgets (line, sizeof(line), fh)) { if (sscanf (line, "%s", device_name) == 1) { - list = nautilus_string_list_new_from_tokens (line, " ", FALSE); -@@ -702,17 +742,25 @@ + list = nautilus_string_list_new_from_tokens (line, PROC_MOUNTS_SEPARATOR, FALSE); +@@ -995,11 +1094,20 @@ volume->device_path = nautilus_string_list_nth (list, 0); volume->mount_path = nautilus_string_list_nth (list, 1); volume->filesystem = nautilus_string_list_nth (list, 2); -- -+#else ++#else /* __FreeBSD__ */ + for (i = 0; i < mounted_num; i++) { + volume = g_new0 (NautilusVolume, 1); + volume->device_path = g_strdup(mounted[i].f_mntfromname); + volume->mount_path = g_strdup(mounted[i].f_mntonname); + volume->filesystem = g_strdup(mounted[i].f_fstypename); +#endif /* __FreeBSD__ */ - if (mount_volume_add_filesystem (volume)) { - mount_volume_get_name (volume); - current_mounts = g_list_append (current_mounts, volume); - } else { - nautilus_volume_monitor_free_volume (volume); - } + current_mounts = mount_volume_add_filesystem (volume, current_mounts); +#ifndef __FreeBSD__ } nautilus_string_list_free (list); } } -+#endif ++#endif /* __FreeBSD__ */ } - #ifdef MOUNT_AUDIO_CD -@@ -728,7 +776,9 @@ + #endif /* SOLARIS_MNT */ +@@ -1019,7 +1127,9 @@ } #endif @@ -137,53 +271,7 @@ $FreeBSD$ return current_mounts; -@@ -889,6 +939,45 @@ - return TRUE; - } - -+#ifdef 0 -+#ifdef __FreeBSD__ -+static void -+fstab_add_mount_volume (NautilusVolumeMonitor *monitor, struct fstab *ent) -+{ -+ NautilusVolume *volume; -+ gboolean mounted; -+ -+ volume = g_new0 (NautilusVolume, 1); -+ volume->device_path = g_strdup(ent->fs_spec); -+ volume->mount_path = g_strdup(ent->fs_file); -+ -+ mounted = FALSE; -+ -+ if (nautilus_str_has_prefix (ent->fs_spec, "/dev/fd")) { -+ mounted = mount_volume_floppy_add (monitor, volume); -+ } else if (strcmp (ent->fs_vfstype, "ufs") == 0) { -+ mounted = mount_volume_ext2_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "nfs") == 0) { -+ mounted = mount_volume_nfs_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "cd9660") == 0) { -+ mounted = mount_volume_iso9660_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "msdos") == 0) { -+ mounted = mount_volume_msdos_add (volume); -+ } -+ -+ if (mounted) { -+ volume->is_read_only = strstr (ent->fs_type, FSTAB_RO) != NULL; -+ monitor->details->volumes = g_list_append (monitor->details->volumes, volume); -+ mount_volume_add_aliases (monitor, volume->device_path, volume); -+ } else { -+ g_free (volume->device_path); -+ g_free (volume->mount_path); -+ g_free (volume); -+ } -+} -+#endif -+#endif -+ - static void - cdrom_ioctl_get_info (int fd) - { -@@ -1025,6 +1114,14 @@ +@@ -1375,6 +1485,14 @@ break; } } @@ -198,3 +286,12 @@ $FreeBSD$ } #endif +@@ -1869,7 +1987,7 @@ + } + + if (mounted) { +-#ifndef SOLARIS_MNT ++#if !defined(SOLARIS_MNT) && !defined(__FreeBSD__) + volume->is_removable = volume_is_removable (volume); + volume->is_read_only = volume_is_read_only (volume); + #endif /* SOLARIS_MNT */ diff --git a/x11-fm/nautilus/files/patch-xml-i18n-extract b/x11-fm/nautilus/files/patch-xml-i18n-extract deleted file mode 100644 index a21354cc11b4..000000000000 --- a/x11-fm/nautilus/files/patch-xml-i18n-extract +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-extract 2001/01/31 17:44:52 1.1 -+++ xml-i18n-extract 2001/01/31 17:45:08 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 2 -*- - - # diff --git a/x11-fm/nautilus/files/patch-xml-i18n-merge b/x11-fm/nautilus/files/patch-xml-i18n-merge deleted file mode 100644 index 137e5978ddfd..000000000000 --- a/x11-fm/nautilus/files/patch-xml-i18n-merge +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-merge 2001/01/31 17:44:52 1.1 -+++ xml-i18n-merge 2001/01/31 17:45:16 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - - # - # The XML Translation Merge Tool diff --git a/x11-fm/nautilus/files/patch-xml-i18n-update b/x11-fm/nautilus/files/patch-xml-i18n-update deleted file mode 100644 index abdebb38482b..000000000000 --- a/x11-fm/nautilus/files/patch-xml-i18n-update +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-update 2001/01/31 17:44:52 1.1 -+++ xml-i18n-update 2001/01/31 17:45:22 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - - # The GNOME Translation Update Tool - # diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist index 1901db766717..5d4f6e3c0e56 100644 --- a/x11-fm/nautilus/pkg-plist +++ b/x11-fm/nautilus/pkg-plist @@ -15,19 +15,24 @@ bin/nautilus-launcher-applet %%MOZILLA:%%bin/nautilus-mozilla-content-view bin/nautilus-music-view bin/nautilus-notes +bin/nautilus-preferences-applet +bin/nautilus-restore-settings-to-default.sh bin/nautilus-sample-content-view bin/nautilus-sidebar-loser bin/nautilus-text-view bin/nautilus-throbber bin/nautilus-verify-rpm.sh +bin/nautilus-xml-migrate bin/run-nautilus etc/CORBA/servers/nautilus-launcher-applet.gnorba +etc/CORBA/servers/nautilus-preferences-applet.gnorba etc/vfs/modules/help-methods.conf include/libnautilus/libnautilus.h include/libnautilus/nautilus-bonobo-ui.h include/libnautilus/nautilus-bonobo-workarounds.h include/libnautilus/nautilus-clipboard.h include/libnautilus/nautilus-distributed-undo.h +include/libnautilus/nautilus-idle-queue.h include/libnautilus/nautilus-undo-private.h include/libnautilus/nautilus-undo.h include/libnautilus/nautilus-view-component.h @@ -44,17 +49,236 @@ lib/libnautilus.so.0 lib/vfs/modules/libvfs-help.so share/gnome/apps/Applications/nautilus.desktop share/gnome/help/gnufdl/C/gnufdl.sgml -share/gnome/help/nautilus/C/custicon.png -share/gnome/help/nautilus/C/full.png -share/gnome/help/nautilus/C/license.html -share/gnome/help/nautilus/C/locbar.png -share/gnome/help/nautilus/C/nautilus.sgml -share/gnome/help/nautilus/C/player.png -share/gnome/help/nautilus/C/prefmenu.png -share/gnome/help/nautilus/C/sidebar.png -share/gnome/help/nautilus/C/viewmenu.png -share/gnome/hyperbola/maps/pages.map +share/gnome/help/gnugpl/C/gnugpl.sgml +share/gnome/help/nautilus-quick-reference/C/figures/emblems.png +share/gnome/help/nautilus-quick-reference/C/figures/find.png +share/gnome/help/nautilus-quick-reference/C/figures/full.png +share/gnome/help/nautilus-quick-reference/C/figures/locbar.png +share/gnome/help/nautilus-quick-reference/C/figures/menubar.png +share/gnome/help/nautilus-quick-reference/C/figures/music.png +share/gnome/help/nautilus-quick-reference/C/figures/navbar.png +share/gnome/help/nautilus-quick-reference/C/figures/patterns.png +share/gnome/help/nautilus-quick-reference/C/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/C/figures/softcat.png +share/gnome/help/nautilus-quick-reference/C/figures/storage.png +share/gnome/help/nautilus-quick-reference/C/figures/themes.png +share/gnome/help/nautilus-quick-reference/C/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/C/index.html +share/gnome/help/nautilus-quick-reference/es/figures/colors_small.png +share/gnome/help/nautilus-quick-reference/es/figures/emblems_small.png +share/gnome/help/nautilus-quick-reference/es/figures/ff_small.png +share/gnome/help/nautilus-quick-reference/es/figures/find_small.png +share/gnome/help/nautilus-quick-reference/es/figures/full_small.png +share/gnome/help/nautilus-quick-reference/es/figures/locbar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/menubar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/music_small.png +share/gnome/help/nautilus-quick-reference/es/figures/navbar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/sidebar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/softcat.png +share/gnome/help/nautilus-quick-reference/es/figures/storage.png +share/gnome/help/nautilus-quick-reference/es/figures/themes_small.png +share/gnome/help/nautilus-quick-reference/es/index.html +share/gnome/help/nautilus-quick-reference/ko/figures/emblems.png +share/gnome/help/nautilus-quick-reference/ko/figures/find.png +share/gnome/help/nautilus-quick-reference/ko/figures/full.png +share/gnome/help/nautilus-quick-reference/ko/figures/locbar.png +share/gnome/help/nautilus-quick-reference/ko/figures/menubar.png +share/gnome/help/nautilus-quick-reference/ko/figures/music.png +share/gnome/help/nautilus-quick-reference/ko/figures/navbar.png +share/gnome/help/nautilus-quick-reference/ko/figures/patterns.png +share/gnome/help/nautilus-quick-reference/ko/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/ko/figures/softcat.png +share/gnome/help/nautilus-quick-reference/ko/figures/storage.png +share/gnome/help/nautilus-quick-reference/ko/figures/themes.png +share/gnome/help/nautilus-quick-reference/ko/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/ko/index.html +share/gnome/help/nautilus-quick-reference/no/figures/colors_small.png +share/gnome/help/nautilus-quick-reference/no/figures/emblems_small.png +share/gnome/help/nautilus-quick-reference/no/figures/ff_small.png +share/gnome/help/nautilus-quick-reference/no/figures/find_small.png +share/gnome/help/nautilus-quick-reference/no/figures/full_small.png +share/gnome/help/nautilus-quick-reference/no/figures/locbar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/menubar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/music_small.png +share/gnome/help/nautilus-quick-reference/no/figures/navbar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/sidebar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/softcat.png +share/gnome/help/nautilus-quick-reference/no/figures/storage.png +share/gnome/help/nautilus-quick-reference/no/figures/themes_small.png +share/gnome/help/nautilus-quick-reference/no/index.html +share/gnome/help/nautilus-quick-reference/sv/figures/emblems.png +share/gnome/help/nautilus-quick-reference/sv/figures/find.png +share/gnome/help/nautilus-quick-reference/sv/figures/full.png +share/gnome/help/nautilus-quick-reference/sv/figures/locbar.png +share/gnome/help/nautilus-quick-reference/sv/figures/menubar.png +share/gnome/help/nautilus-quick-reference/sv/figures/music.png +share/gnome/help/nautilus-quick-reference/sv/figures/navbar.png +share/gnome/help/nautilus-quick-reference/sv/figures/patterns.png +share/gnome/help/nautilus-quick-reference/sv/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/sv/figures/softcat.png +share/gnome/help/nautilus-quick-reference/sv/figures/storage.png +share/gnome/help/nautilus-quick-reference/sv/figures/themes.png +share/gnome/help/nautilus-quick-reference/sv/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/sv/index.html +share/gnome/help/nautilus-release-notes/C/beta.html +share/gnome/help/nautilus-release-notes/C/docbook.css +share/gnome/help/nautilus-release-notes/C/index.html +share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml +share/gnome/help/nautilus-release-notes/C/mozilla.html +share/gnome/help/nautilus-release-notes/C/new10.html +share/gnome/help/nautilus-release-notes/C/new102.html +share/gnome/help/nautilus-release-notes/C/require.html +share/gnome/help/nautilus-release-notes/C/searching.html +share/gnome/help/nautilus-release-notes/C/session.html +share/gnome/help/nautilus-release-notes/C/stylesheet-images/caution.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/home.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/important.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/next.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/note.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/prev.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/tip.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/up.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/C/chapter1.html +share/gnome/help/nautilus-user-manual/C/chapter2.html +share/gnome/help/nautilus-user-manual/C/docbook.css +share/gnome/help/nautilus-user-manual/C/figures/custicon.png +share/gnome/help/nautilus-user-manual/C/figures/full-1.png +share/gnome/help/nautilus-user-manual/C/figures/full-2.png +share/gnome/help/nautilus-user-manual/C/figures/full-3.png +share/gnome/help/nautilus-user-manual/C/figures/full-4.png +share/gnome/help/nautilus-user-manual/C/figures/full-5.png +share/gnome/help/nautilus-user-manual/C/figures/full-6.png +share/gnome/help/nautilus-user-manual/C/figures/full.png +share/gnome/help/nautilus-user-manual/C/figures/link.png +share/gnome/help/nautilus-user-manual/C/figures/locbar.png +share/gnome/help/nautilus-user-manual/C/figures/noread.png +share/gnome/help/nautilus-user-manual/C/figures/nowrite.png +share/gnome/help/nautilus-user-manual/C/figures/part-1.png +share/gnome/help/nautilus-user-manual/C/figures/part-2.png +share/gnome/help/nautilus-user-manual/C/figures/part-3.png +share/gnome/help/nautilus-user-manual/C/figures/part.png +share/gnome/help/nautilus-user-manual/C/figures/player-1.png +share/gnome/help/nautilus-user-manual/C/figures/player-2.png +share/gnome/help/nautilus-user-manual/C/figures/player-3.png +share/gnome/help/nautilus-user-manual/C/figures/player-4.png +share/gnome/help/nautilus-user-manual/C/figures/player.png +share/gnome/help/nautilus-user-manual/C/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/C/figures/sidebar.png +share/gnome/help/nautilus-user-manual/C/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/C/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/C/gnome.html +share/gnome/help/nautilus-user-manual/C/home.html +share/gnome/help/nautilus-user-manual/C/index.html +share/gnome/help/nautilus-user-manual/C/introdesktop.html +share/gnome/help/nautilus-user-manual/C/ln21.html +share/gnome/help/nautilus-user-manual/C/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/C/navigating.html +share/gnome/help/nautilus-user-manual/C/session.html +share/gnome/help/nautilus-user-manual/C/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/es/chapter1.html +share/gnome/help/nautilus-user-manual/es/chapter2.html +share/gnome/help/nautilus-user-manual/es/default.html +share/gnome/help/nautilus-user-manual/es/docbook.css +share/gnome/help/nautilus-user-manual/es/figures/custicon.png +share/gnome/help/nautilus-user-manual/es/figures/full.png +share/gnome/help/nautilus-user-manual/es/figures/link.png +share/gnome/help/nautilus-user-manual/es/figures/locbar.png +share/gnome/help/nautilus-user-manual/es/figures/noread.png +share/gnome/help/nautilus-user-manual/es/figures/nowrite.png +share/gnome/help/nautilus-user-manual/es/figures/part.png +share/gnome/help/nautilus-user-manual/es/figures/player.png +share/gnome/help/nautilus-user-manual/es/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/es/figures/sidebar.png +share/gnome/help/nautilus-user-manual/es/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/es/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/es/gnome.html +share/gnome/help/nautilus-user-manual/es/home.html +share/gnome/help/nautilus-user-manual/es/index.html +share/gnome/help/nautilus-user-manual/es/introdesktop.html +share/gnome/help/nautilus-user-manual/es/ln18.html +share/gnome/help/nautilus-user-manual/es/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/es/navigating.html +share/gnome/help/nautilus-user-manual/es/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/es/tree.html +share/gnome/help/nautilus-user-manual/es/viewopen.html +share/gnome/help/nautilus-user-manual/ko/chapter1.html +share/gnome/help/nautilus-user-manual/ko/chapter2.html +share/gnome/help/nautilus-user-manual/ko/docbook.css +share/gnome/help/nautilus-user-manual/ko/figures/custicon.png +share/gnome/help/nautilus-user-manual/ko/figures/full-1.png +share/gnome/help/nautilus-user-manual/ko/figures/full-2.png +share/gnome/help/nautilus-user-manual/ko/figures/full-3.png +share/gnome/help/nautilus-user-manual/ko/figures/full-4.png +share/gnome/help/nautilus-user-manual/ko/figures/full-5.png +share/gnome/help/nautilus-user-manual/ko/figures/full-6.png +share/gnome/help/nautilus-user-manual/ko/figures/full.png +share/gnome/help/nautilus-user-manual/ko/figures/link.png +share/gnome/help/nautilus-user-manual/ko/figures/locbar.png +share/gnome/help/nautilus-user-manual/ko/figures/noread.png +share/gnome/help/nautilus-user-manual/ko/figures/nowrite.png +share/gnome/help/nautilus-user-manual/ko/figures/part-1.png +share/gnome/help/nautilus-user-manual/ko/figures/part-2.png +share/gnome/help/nautilus-user-manual/ko/figures/part-3.png +share/gnome/help/nautilus-user-manual/ko/figures/part.png +share/gnome/help/nautilus-user-manual/ko/figures/player-1.png +share/gnome/help/nautilus-user-manual/ko/figures/player-2.png +share/gnome/help/nautilus-user-manual/ko/figures/player-3.png +share/gnome/help/nautilus-user-manual/ko/figures/player-4.png +share/gnome/help/nautilus-user-manual/ko/figures/player.png +share/gnome/help/nautilus-user-manual/ko/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/ko/figures/sidebar.png +share/gnome/help/nautilus-user-manual/ko/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/ko/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/ko/gnome.html +share/gnome/help/nautilus-user-manual/ko/home.html +share/gnome/help/nautilus-user-manual/ko/index.html +share/gnome/help/nautilus-user-manual/ko/introdesktop.html +share/gnome/help/nautilus-user-manual/ko/ln18.html +share/gnome/help/nautilus-user-manual/ko/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/ko/navigating.html +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/ko/tree.html +share/gnome/help/nautilus-user-manual/ko/viewopen.html share/gnome/nautilus/browser.xml +share/gnome/nautilus/components/hyperbola/maps/pages.map +share/gnome/nautilus/components/hyperbola/topleveldocs.xml share/gnome/nautilus/emblems/OK.png share/gnome/nautilus/emblems/certified.png share/gnome/nautilus/emblems/cool.png @@ -67,8 +291,6 @@ share/gnome/nautilus/emblems/important.png share/gnome/nautilus/emblems/new.png share/gnome/nautilus/emblems/ohno.png share/gnome/nautilus/emblems/personal.png -share/gnome/nautilus/emblems/secret.png -share/gnome/nautilus/emblems/shared.png share/gnome/nautilus/emblems/special.png share/gnome/nautilus/emblems/urgent.png share/gnome/nautilus/fonts/urw/fonts.dir @@ -86,6 +308,7 @@ share/gnome/nautilus/fonts/urw/n019024l.pfb share/gnome/nautilus/fonts/urw/n019024l.pfm share/gnome/nautilus/linksets/apps.xml share/gnome/nautilus/linksets/desktop.xml +share/gnome/nautilus/linksets/home.xml share/gnome/nautilus/linksets/portals.xml share/gnome/nautilus/linksets/search_engines.xml share/gnome/nautilus/nautilus-extras.placeholder @@ -122,14 +345,9 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/services/text/english_to_french.xml -share/gnome/nautilus/services/text/french_to_english.xml share/gnome/nautilus/services/text/google.xml share/gnome/nautilus/services/text/webster.xml share/gnome/nautilus/static_bookmarks.xml -share/gnome/nautilus/top/.nautilus-metafile.xml -share/gnome/nautilus/top/Computer -share/gnome/nautilus/top/Services share/gnome/oaf/Nautilus_ComponentAdapterFactory_std.oaf share/gnome/oaf/Nautilus_Control_throbber.oaf share/gnome/oaf/Nautilus_View_content-loser.oaf @@ -191,15 +409,33 @@ share/gnome/pixmaps/nautilus/arlo/decrement.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-72.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-96.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite.png +share/gnome/pixmaps/nautilus/arlo/i-directory-12-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-12.png share/gnome/pixmaps/nautilus/arlo/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-192.png +share/gnome/pixmaps/nautilus/arlo/i-directory-20-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-20.png +share/gnome/pixmaps/nautilus/arlo/i-directory-24-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-24.png +share/gnome/pixmaps/nautilus/arlo/i-directory-36-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-36.png share/gnome/pixmaps/nautilus/arlo/i-directory-72-aa.png share/gnome/pixmaps/nautilus/arlo/i-directory-72.png share/gnome/pixmaps/nautilus/arlo/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-96.png share/gnome/pixmaps/nautilus/arlo/i-directory-aa.png share/gnome/pixmaps/nautilus/arlo/i-directory.png share/gnome/pixmaps/nautilus/arlo/i-directory.xml +share/gnome/pixmaps/nautilus/arlo/i-regular-12-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-12.png share/gnome/pixmaps/nautilus/arlo/i-regular-192-aa.png share/gnome/pixmaps/nautilus/arlo/i-regular-192.png +share/gnome/pixmaps/nautilus/arlo/i-regular-20-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-20.png +share/gnome/pixmaps/nautilus/arlo/i-regular-24-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-24.png +share/gnome/pixmaps/nautilus/arlo/i-regular-36-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-36.png share/gnome/pixmaps/nautilus/arlo/i-regular-72-aa.png share/gnome/pixmaps/nautilus/arlo/i-regular-72.png share/gnome/pixmaps/nautilus/arlo/i-regular-96-aa.png @@ -258,10 +494,16 @@ share/gnome/pixmaps/nautilus/arlo/throbber/025.png share/gnome/pixmaps/nautilus/arlo/throbber/026.png share/gnome/pixmaps/nautilus/arlo/throbber/027.png share/gnome/pixmaps/nautilus/arlo/throbber/028.png +share/gnome/pixmaps/nautilus/arlo/throbber/029.png +share/gnome/pixmaps/nautilus/arlo/throbber/030.png share/gnome/pixmaps/nautilus/arlo/throbber/rest.png share/gnome/pixmaps/nautilus/arlo/zoom_body.png share/gnome/pixmaps/nautilus/audio.png share/gnome/pixmaps/nautilus/backgrounds.png +share/gnome/pixmaps/nautilus/bubble-LL.png +share/gnome/pixmaps/nautilus/bubble-LR.png +share/gnome/pixmaps/nautilus/bubble-UL.png +share/gnome/pixmaps/nautilus/bubble-UR.png share/gnome/pixmaps/nautilus/chit_frame.png share/gnome/pixmaps/nautilus/colors.png share/gnome/pixmaps/nautilus/computer.png @@ -283,21 +525,23 @@ share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-72.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-96.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72-aa.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-aa.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.xml -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.png share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.xml share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png share/gnome/pixmaps/nautilus/crux_eggplant/increment.png @@ -350,6 +594,8 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/025.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/026.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/027.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/028.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png share/gnome/pixmaps/nautilus/decrement.png @@ -357,7 +603,28 @@ share/gnome/pixmaps/nautilus/default.xml share/gnome/pixmaps/nautilus/druid_header.png share/gnome/pixmaps/nautilus/druid_header_stretch.png share/gnome/pixmaps/nautilus/druid_sidebar.png -share/gnome/pixmaps/nautilus/eazel-logo.gif +share/gnome/pixmaps/nautilus/eazel-logos/About_Image.png +share/gnome/pixmaps/nautilus/eazel-logos/LICENSE +share/gnome/pixmaps/nautilus/eazel-logos/about_background.png +share/gnome/pixmaps/nautilus/eazel-logos/default.xml +share/gnome/pixmaps/nautilus/eazel-logos/druid_header.png +share/gnome/pixmaps/nautilus/eazel-logos/eazel-logo-right-side-logo.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/001.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/002.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/003.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/004.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/005.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/006.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/007.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/008.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/009.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/010.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/011.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/012.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/013.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/014.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/015.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/rest.png share/gnome/pixmaps/nautilus/emblem-OK.svg share/gnome/pixmaps/nautilus/emblem-broken-link.png share/gnome/pixmaps/nautilus/emblem-certified.svg @@ -373,9 +640,10 @@ share/gnome/pixmaps/nautilus/emblem-noread.svg share/gnome/pixmaps/nautilus/emblem-nowrite.svg share/gnome/pixmaps/nautilus/emblem-ohno.svg share/gnome/pixmaps/nautilus/emblem-personal.svg -share/gnome/pixmaps/nautilus/emblem-secret.svg -share/gnome/pixmaps/nautilus/emblem-shared.svg share/gnome/pixmaps/nautilus/emblem-special.svg +share/gnome/pixmaps/nautilus/emblem-symbolic-link-12.png +share/gnome/pixmaps/nautilus/emblem-symbolic-link-24.png +share/gnome/pixmaps/nautilus/emblem-symbolic-link-36.png share/gnome/pixmaps/nautilus/emblem-symbolic-link.png share/gnome/pixmaps/nautilus/emblem-trash.png share/gnome/pixmaps/nautilus/emblem-urgent.svg @@ -456,6 +724,8 @@ share/gnome/pixmaps/nautilus/gnome-textfile.png share/gnome/pixmaps/nautilus/gnome-video-mpeg.png share/gnome/pixmaps/nautilus/gnome-video-quicktime.png share/gnome/pixmaps/nautilus/gnome-video-x-msvideo.png +share/gnome/pixmaps/nautilus/gnome/SearchWeb.png +share/gnome/pixmaps/nautilus/gnome/Services.png share/gnome/pixmaps/nautilus/gnome/gnome.xml share/gnome/pixmaps/nautilus/gnome/i-directory-12.png share/gnome/pixmaps/nautilus/gnome/i-directory-192.png @@ -485,7 +755,9 @@ share/gnome/pixmaps/nautilus/gnome/throbber/008.png share/gnome/pixmaps/nautilus/gnome/throbber/009.png share/gnome/pixmaps/nautilus/gnome/throbber/010.png share/gnome/pixmaps/nautilus/gnome/throbber/rest.png -share/gnome/pixmaps/nautilus/hand.svg +share/gnome/pixmaps/nautilus/hand-72.png +share/gnome/pixmaps/nautilus/hand-96.png +share/gnome/pixmaps/nautilus/hand.png share/gnome/pixmaps/nautilus/home.png share/gnome/pixmaps/nautilus/i-blockdev.png share/gnome/pixmaps/nautilus/i-bookmark-20.png @@ -572,7 +844,6 @@ share/gnome/pixmaps/nautilus/loading.png share/gnome/pixmaps/nautilus/manual.png share/gnome/pixmaps/nautilus/memory_chip.gif share/gnome/pixmaps/nautilus/multi-ok.png -share/gnome/pixmaps/nautilus/nautilus-logo.png share/gnome/pixmaps/nautilus/nautilus-mini-logo.png share/gnome/pixmaps/nautilus/netscape.png share/gnome/pixmaps/nautilus/not.png @@ -620,9 +891,25 @@ share/gnome/pixmaps/nautilus/throbber/012.png share/gnome/pixmaps/nautilus/throbber/013.png share/gnome/pixmaps/nautilus/throbber/014.png share/gnome/pixmaps/nautilus/throbber/015.png +share/gnome/pixmaps/nautilus/throbber/016.png +share/gnome/pixmaps/nautilus/throbber/017.png +share/gnome/pixmaps/nautilus/throbber/018.png +share/gnome/pixmaps/nautilus/throbber/019.png +share/gnome/pixmaps/nautilus/throbber/020.png +share/gnome/pixmaps/nautilus/throbber/021.png +share/gnome/pixmaps/nautilus/throbber/022.png +share/gnome/pixmaps/nautilus/throbber/023.png +share/gnome/pixmaps/nautilus/throbber/024.png +share/gnome/pixmaps/nautilus/throbber/025.png +share/gnome/pixmaps/nautilus/throbber/026.png +share/gnome/pixmaps/nautilus/throbber/027.png +share/gnome/pixmaps/nautilus/throbber/028.png +share/gnome/pixmaps/nautilus/throbber/029.png +share/gnome/pixmaps/nautilus/throbber/030.png share/gnome/pixmaps/nautilus/throbber/rest.png share/gnome/pixmaps/nautilus/thumbnail_frame.aa.png share/gnome/pixmaps/nautilus/thumbnail_frame.png +share/gnome/pixmaps/nautilus/tiny-alert.png share/gnome/pixmaps/nautilus/trash-empty.png share/gnome/pixmaps/nautilus/trash-full.png share/gnome/pixmaps/nautilus/uparrow.png @@ -669,9 +956,11 @@ share/gnome/ui/nautilus-service-ui.xml share/gnome/ui/nautilus-shell-ui.xml share/gnome/ui/nautilus-sidebar-loser-ui.xml share/gnome/ui/nautilus-text-view-ui.xml +share/locale/az/LC_MESSAGES/nautilus.mo share/locale/ca/LC_MESSAGES/nautilus.mo share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo +share/locale/el/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo share/locale/es/LC_MESSAGES/nautilus.mo share/locale/fi/LC_MESSAGES/nautilus.mo @@ -683,11 +972,13 @@ share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo +share/locale/nn/LC_MESSAGES/nautilus.mo share/locale/no/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo share/locale/ru/LC_MESSAGES/nautilus.mo share/locale/sk/LC_MESSAGES/nautilus.mo +share/locale/sl/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo share/locale/ta/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo @@ -698,6 +989,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/gnome/throbber @dirrm share/gnome/pixmaps/nautilus/gnome +@dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber +@dirrm share/gnome/pixmaps/nautilus/eazel-logos @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds @@ -708,7 +1001,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/arlo @dirrm share/gnome/pixmaps/nautilus/ardmore @dirrm share/gnome/pixmaps/nautilus -@dirrm share/gnome/nautilus/top @dirrm share/gnome/nautilus/services/text @dirrm share/gnome/nautilus/services @dirrm share/gnome/nautilus/patterns @@ -716,11 +1008,37 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/nautilus/fonts/urw @dirrm share/gnome/nautilus/fonts @dirrm share/gnome/nautilus/emblems +@dirrm share/gnome/nautilus/components/hyperbola/maps +@dirrm share/gnome/nautilus/components/hyperbola +@dirrm share/gnome/nautilus/components @dirrm share/gnome/nautilus -@dirrm share/gnome/hyperbola/maps -@dirrm share/gnome/hyperbola -@dirrm share/gnome/help/nautilus/C -@dirrm share/gnome/help/nautilus +@dirrm share/gnome/help/nautilus-user-manual/ko/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/ko/figures +@dirrm share/gnome/help/nautilus-user-manual/ko +@dirrm share/gnome/help/nautilus-user-manual/es/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/es/figures +@dirrm share/gnome/help/nautilus-user-manual/es +@dirrm share/gnome/help/nautilus-user-manual/C/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/C/figures +@dirrm share/gnome/help/nautilus-user-manual/C +@dirrm share/gnome/help/nautilus-user-manual +@dirrm share/gnome/help/nautilus-release-notes/C/stylesheet-images +@dirrm share/gnome/help/nautilus-release-notes/C/figures +@dirrm share/gnome/help/nautilus-release-notes/C +@dirrm share/gnome/help/nautilus-release-notes +@dirrm share/gnome/help/nautilus-quick-reference/sv/figures +@dirrm share/gnome/help/nautilus-quick-reference/sv +@dirrm share/gnome/help/nautilus-quick-reference/no/figures +@dirrm share/gnome/help/nautilus-quick-reference/no +@dirrm share/gnome/help/nautilus-quick-reference/ko/figures +@dirrm share/gnome/help/nautilus-quick-reference/ko +@dirrm share/gnome/help/nautilus-quick-reference/es/figures +@dirrm share/gnome/help/nautilus-quick-reference/es +@dirrm share/gnome/help/nautilus-quick-reference/C/figures +@dirrm share/gnome/help/nautilus-quick-reference/C +@dirrm share/gnome/help/nautilus-quick-reference +@dirrm share/gnome/help/gnugpl/C +@dirrm share/gnome/help/gnugpl @dirrm share/gnome/help/gnufdl/C @dirrm share/gnome/help/gnufdl @dirrm include/libnautilus diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index cec3b027a7a1..67941553d6a9 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,22 +6,22 @@ # PORTNAME= nautilus -PORTVERSION= 0.8 +PORTVERSION= 1.0.2 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= unstable/sources/nautilus +MASTER_SITE_SUBDIR= stable/sources/nautilus MAINTAINER= sobomax@FreeBSD.org -BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm \ - freetype-config:${PORTSDIR}/print/freetype2 # XXX +BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX +# The following is only needed if --with-eazel-services is brought in, +# which it isn't, because it depends on ammonite, which is Linux-only +# BUILD_DEPENDS+=rpm:${PORTSDIR}/archivers/rpm + LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \ - gtkhtml.8:${PORTSDIR}/www/gtkhtml \ - ghttp.1:${PORTSDIR}/www/libghttp \ - bz2.1:${PORTSDIR}/archivers/bzip2 \ freetype.6:${PORTSDIR}/print/freetype2 -.if defined(WITH_MOZILLA) +.if !defined(WITHOUT_MOZILLA) MOZILLA= mozilla BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} @@ -34,12 +34,12 @@ USE_GNOME= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \ - LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ + LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" -CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \ - --with-freetype2-include-place=${LOCALBASE}/include/freetype2 +CONFIGURE_ARGS= --with-freetype2-lib-place=${X11BASE}/lib \ + --with-freetype2-include-place=${X11BASE}/include/freetype2 -.if defined(WITH_MOZILLA) +.if !defined(WITHOUT_MOZILLA) CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \ --with-mozilla-include-place=${X11BASE}/include/mozilla MOZILLA_LIBS= "-L${X11BASE}/lib/${MOZILLA}" @@ -50,9 +50,11 @@ MOZILLA_LIBS= "" PLIST_SUB+= MOZILLA:="@comment " .endif -.if !defined(WITH_MOZILLA) +MAN1= nautilus-xml-migrate.1 + +.if !defined(WITHOUT_MOZILLA) pre-extract: - @${ECHO} "You can add embedded mozilla support by defining WITH_MOZILLA" + @${ECHO} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA" .endif pre-patch: diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index 554338f88a7e..11d30f6f75f6 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1 +1 @@ -MD5 (nautilus-0.8.tar.gz) = 26e6403619559477d02f1cabb7681e4c +MD5 (nautilus-1.0.2.tar.gz) = 9c6b11436e11d7dc184dd5748e7e82ac diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index 4f01381ab0bb..5c7b55cccce7 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,11 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Wed Jan 31 17:42:11 2001 -+++ configure Wed Jan 31 17:52:50 2001 -@@ -41,9 +41,9 @@ - ac_help="$ac_help - --enable-eazel-services Enable support for Eazel services (default is no)" +--- configure.orig Mon Mar 12 19:48:16 2001 ++++ configure Fri Mar 16 15:02:38 2001 +@@ -45,5 +45,5 @@ ac_help="$ac_help - --with-freetype2-libraries=PATH freetype2 library path" + --with-freetype2-lib-place=PREFIX freetype2 library path" @@ -13,49 +8,31 @@ $FreeBSD$ - --with-freetype2-includes=PATH freetype2 include path" + --with-freetype2-include-place=PREFIX freetype2 include path" ac_help="$ac_help - --with-freetype2-prefix=PATH freetype2 installation prefix" - ac_help="$ac_help -@@ -2789,15 +2789,15 @@ - _found_freetype2="no" - +@@ -3216,4 +3216,4 @@ # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given. -if test "${with_freetype2_libraries+set}" = set; then - withval="$with_freetype2_libraries" +if test "${with_freetype2_lib_place+set}" = set; then + withval="$with_freetype2_lib_place" freetype2_lib_prefix=$withval - fi - - +@@ -3223,4 +3223,4 @@ # Check whether --with-freetype2-includes or --without-freetype2-includes was given. -if test "${with_freetype2_includes+set}" = set; then - withval="$with_freetype2_includes" +if test "${with_freetype2_include_place+set}" = set; then + withval="$with_freetype2_include_place" freetype2_include_prefix=$withval - fi - -@@ -2927,7 +2927,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else +@@ -3354,3 +3354,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam -ldl $LIBS" +LIBS="-lpam $LIBS" cat > conftest.$ac_ext <&6 - else +@@ -3394,3 +3394,3 @@ ac_save_LIBS="$LIBS" -LIBS="-lpam_misc -ldl -lpam $LIBS" +LIBS="-lpam_misc -lpam $LIBS" cat > conftest.$ac_ext <&6 - PAM_LIBS="-ldl -lpam -lpam_misc" + PAM_LIBS="-lpam -lpam_misc" @@ -64,23 +41,13 @@ $FreeBSD$ -PAM_LIBS="-ldl -lpam" +PAM_LIBS="-lpam" fi - - else -@@ -3235,7 +3235,7 @@ - - CC="$_save_cc" +@@ -3662,3 +3662,3 @@ -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin" +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin" echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6 - echo "configure:3241: checking for gdk_superwin_get_type in -lgtksuperwin" >&5 - ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'` -@@ -3598,7 +3598,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- rpm_libs=-lbz2 -+ rpm_libs="-lrpm -lbz2" - else - echo "$ac_t""no" 1>&6 +@@ -6117,3 +6117,3 @@ + if test x$SCROLLKEEPER_CONFIG = xno; then +- { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; } ++ echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2 fi diff --git a/x11-fm/nautilus2/files/patch-ab b/x11-fm/nautilus2/files/patch-ab index a46aeaaf19d8..169e4d76349d 100644 --- a/x11-fm/nautilus2/files/patch-ab +++ b/x11-fm/nautilus2/files/patch-ab @@ -1,13 +1,28 @@ ---- Makefile.in.orig Wed Aug 16 08:26:30 2000 -+++ Makefile.in Wed Aug 23 14:56:45 2000 -@@ -501,8 +501,8 @@ - $(mkinstalldirs) $(DESTDIR)/$(prefix)/bin - @list='nautilus-clean.sh'; for p in $$list; do\ +--- Makefile.in.orig Mon Mar 12 19:49:51 2001 ++++ Makefile.in Fri Mar 16 16:15:38 2001 +@@ -202,3 +202,3 @@ + +-SUBDIRS = data icons intl cut-n-paste-code librsvg libnautilus libnautilus-adapter libnautilus-extensions helper-utilities helper-scripts src components $(APPLETS_SUBDIRS) nautilus-installer test user-guide help po omf-install $(NULL) ++SUBDIRS = data icons intl cut-n-paste-code librsvg libnautilus libnautilus-adapter libnautilus-extensions helper-utilities helper-scripts src components $(APPLETS_SUBDIRS) nautilus-installer test user-guide help po $(NULL) + +@@ -607,4 +607,4 @@ if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \ - $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ + echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p"; \ + $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)/$(prefix)/bin/$$p; \ else :; fi; \ +@@ -620,4 +620,4 @@ + do \ +- echo $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ +- $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ ++ echo $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \ ++ $(INSTALL_DATA) $$i $(icondir)/`basename $$i`; \ + done +@@ -628,4 +628,4 @@ + do \ +- echo $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ +- $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ ++ echo $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \ ++ $(INSTALL_DATA) $$i $(throbberdir)/`basename $$i`; \ done - diff --git a/x11-fm/nautilus2/files/patch-ac b/x11-fm/nautilus2/files/patch-ac index 632cbbc8420a..8e4edd0bf3ab 100644 --- a/x11-fm/nautilus2/files/patch-ac +++ b/x11-fm/nautilus2/files/patch-ac @@ -1,54 +1,92 @@ $FreeBSD$ ---- libnautilus-extensions/nautilus-volume-monitor.c.orig Tue Jan 16 03:31:56 2001 -+++ libnautilus-extensions/nautilus-volume-monitor.c Wed Jan 31 21:29:21 2001 -@@ -60,7 +60,13 @@ - #include +--- libnautilus-extensions/nautilus-volume-monitor.c.orig Sat Feb 24 01:54:34 2001 ++++ libnautilus-extensions/nautilus-volume-monitor.c Sun Mar 11 15:46:11 2001 +@@ -68,6 +68,12 @@ + #include #endif +#ifdef __FreeBSD__ +#include +#include +#include -+#else - #include +#endif ++ + #ifdef HAVE_SYS_MNTTAB_H + #define SOLARIS_MNT 1 + #include +@@ -327,6 +333,12 @@ + has_removable_mntent_options (struct mnttab *ent) + { - #ifdef MOUNT_AUDIO_CD ++#elif defined(__FreeBSD__) ++ ++static gboolean ++has_removable_mntent_options (struct fstab *ent) ++{ ++ + #else + + static gboolean +@@ -335,12 +347,18 @@ + + #endif /* HAVE_SYS_MNTTAB_H */ + ++#ifndef __FreeBSD__ + /* Use "owner" or "user" or "users" as our way of determining a removable volume */ + if (hasmntopt (ent, "user") != NULL + || hasmntopt (ent, "users") != NULL + || hasmntopt (ent, "owner") != NULL) { + return TRUE; + } ++#else ++ if (strstr (ent->fs_mntops, "noauto") != NULL) { ++ return TRUE; ++ } ++#endif -@@ -264,16 +270,25 @@ - GList * - nautilus_volume_monitor_get_removable_volumes (NautilusVolumeMonitor *monitor) + #if SOLARIS_MNT && HAVE_VOL + if (strstr (ent->mnt_special, "/vol/") == ent->mnt_special) { +@@ -360,23 +378,32 @@ + static GList * + get_removable_volumes (void) { +#ifndef __FreeBSD__ FILE *file; - GList *volumes; + #if HAVE_SYS_MNTTAB_H + struct mnttab dummy_ent; + struct mnttab *ent = &dummy_ent; + #else struct mntent *ent; -+#else -+ struct fstab *ent; -+#endif + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ ++struct fstab *ent; ++#endif /* __FreeBSD__ */ + GList *volumes; NautilusVolume *volume; volumes = NULL; +#ifndef __FreeBSD__ - file = setmntent (_PATH_MNTTAB, "r"); - g_return_val_if_fail (file != NULL, NULL); + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return NULL; + } +#else + setfsent(); -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ - while ((ent = getmntent (file)) != NULL) { - /* Use noauto as our way of determining a removable volume */ - if (strstr (ent->mnt_opts, MNTOPT_NOAUTO) != NULL) { -@@ -281,6 +296,15 @@ - volume->device_path = g_strdup (ent->mnt_fsname); - volume->mount_path = g_strdup (ent->mnt_dir); + #if HAVE_SYS_MNTTAB_H + while (! getmntent (file, ent)) { + /* On Solaris look for /vol/ for determining a removable volume */ +@@ -396,12 +423,27 @@ volume->filesystem = g_strdup (ent->mnt_type); -+#else /* FreeBSD, probably ;) */ + + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ + while ((ent = getfsent ()) != NULL) { + /* Use noauto as our way of determining a removable volume */ + if (strstr (ent->fs_mntops, "noauto") != NULL) { @@ -56,11 +94,11 @@ $FreeBSD$ + volume->device_path = g_strdup (ent->fs_spec); + volume->mount_path = g_strdup (ent->fs_file); + volume->filesystem = g_strdup (ent->fs_vfstype); -+#endif - if (mount_volume_add_filesystem (volume)) { - mount_volume_get_name (volume); - volumes = g_list_append (volumes, volume); -@@ -290,7 +314,11 @@ ++ volume->is_removable = TRUE; ++ volume->is_read_only = (strstr (ent->fs_type, FSTAB_RO) !=NULL); ++#endif /* __FreeBSD__ */ + + volumes = mount_volume_add_filesystem (volume, volumes); } } @@ -72,62 +110,158 @@ $FreeBSD$ #ifdef MOUNT_AUDIO_CD volume = g_new0 (NautilusVolume, 1); -@@ -682,15 +710,27 @@ +@@ -419,6 +461,7 @@ + static gboolean + volume_is_removable (const NautilusVolume *volume) { - GList *current_mounts = NULL; - NautilusVolume *volume = NULL; +#ifndef __FreeBSD__ - FILE *fh; + FILE *file; + #if HAVE_SYS_MNTTAB_H + struct mnttab dummy_ent; +@@ -426,13 +469,21 @@ + #else + struct mntent *ent; + #endif /* HAVE_SYS_MNTTAB_H */ ++#else /* __FreeBSD__ */ ++ struct fstab *ent; ++#endif /* __FreeBSD__ */ + ++#ifndef __FreeBSD__ + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return FALSE; + } ++#else ++ setfsent(); ++#endif /* __FreeBSD__ */ + + /* Search for our device in the fstab */ ++#ifndef __FreeBSD__ + #if HAVE_SYS_MNTTAB_H + while (!getmntent (file, ent)) { + if (strcmp (volume->device_path, ent->mnt_special) == 0) { +@@ -455,8 +506,23 @@ + } + + #endif /* HAVE_SYS_MNTTAB_H */ +- ++#else /* __FreeBSD__ */ ++ while ((ent = getfsent ()) != NULL) { ++ /* Use noauto as our way of determining a removable volume */ ++ if (strcmp (volume->device_path, ent->fs_spec) == 0 ++ && has_removable_mntent_options (ent)) { ++ endfsent(); ++ return TRUE; ++ } ++ } ++#endif /* __FreeBSD__ */ ++ ++ ++#ifndef __FreeBSD__ + fclose (file); ++#else ++ endfsent(); ++#endif + return FALSE; + } + +@@ -484,14 +550,23 @@ + } + } + #else ++#ifndef __FreeBSD__ + struct mntent *ent; +- ++#else ++ struct fstab *ent; ++#endif ++ ++#ifndef __FreeBSD__ + file = setmntent (PATH_MOUNT_TABLE, "r"); + if (file == NULL) { + return FALSE; + } +- ++#else ++ setfsent(); ++#endif /* __FreeBSD__ */ ++ + /* Search for our device in the fstab */ ++#ifndef __FreeBSD__ + while ((ent = getmntent (file)) != NULL) { + if (strcmp (volume->device_path, ent->mnt_fsname) == 0) { + if (strstr (ent->mnt_opts, MNTOPT_RO) != NULL) { +@@ -500,9 +575,21 @@ + } + } + } ++#else /* __FreeBSD__ */ ++ while ((ent = getfsent ()) != NULL) { ++ if (strcmp (volume->device_path, ent->fs_spec) == 0 ++ && strstr (ent->fs_type, FSTAB_RO) != NULL) { ++ endfsent(); ++ return TRUE; ++ } ++ } ++ endfsent(); ++#endif + #endif + ++#ifndef __FreeBSD__ + fclose (file); ++#endif + return FALSE; + } + +@@ -975,14 +1062,26 @@ + + + #else ++#ifndef __FreeBSD__ char line[PATH_MAX * 3]; char device_name[sizeof (line)]; NautilusStringList *list; -+#else ++#else /* __FreeBSD__ */ + struct statfs *mounted; + int mounted_num; + int i; -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ /* Open /proc/mounts */ fh = fopen (PATH_PROC_MOUNTS, "r"); g_return_val_if_fail (fh != NULL, NULL); -+#else ++#else /* __FreeBSD__ */ + mounted_num = getmntinfo(&mounted, MNT_WAIT); + g_return_val_if_fail (mounted_num > 0, NULL); -+#endif ++#endif /* __FreeBSD__ */ +#ifndef __FreeBSD__ while (fgets (line, sizeof(line), fh)) { if (sscanf (line, "%s", device_name) == 1) { - list = nautilus_string_list_new_from_tokens (line, " ", FALSE); -@@ -702,17 +742,25 @@ + list = nautilus_string_list_new_from_tokens (line, PROC_MOUNTS_SEPARATOR, FALSE); +@@ -995,11 +1094,20 @@ volume->device_path = nautilus_string_list_nth (list, 0); volume->mount_path = nautilus_string_list_nth (list, 1); volume->filesystem = nautilus_string_list_nth (list, 2); -- -+#else ++#else /* __FreeBSD__ */ + for (i = 0; i < mounted_num; i++) { + volume = g_new0 (NautilusVolume, 1); + volume->device_path = g_strdup(mounted[i].f_mntfromname); + volume->mount_path = g_strdup(mounted[i].f_mntonname); + volume->filesystem = g_strdup(mounted[i].f_fstypename); +#endif /* __FreeBSD__ */ - if (mount_volume_add_filesystem (volume)) { - mount_volume_get_name (volume); - current_mounts = g_list_append (current_mounts, volume); - } else { - nautilus_volume_monitor_free_volume (volume); - } + current_mounts = mount_volume_add_filesystem (volume, current_mounts); +#ifndef __FreeBSD__ } nautilus_string_list_free (list); } } -+#endif ++#endif /* __FreeBSD__ */ } - #ifdef MOUNT_AUDIO_CD -@@ -728,7 +776,9 @@ + #endif /* SOLARIS_MNT */ +@@ -1019,7 +1127,9 @@ } #endif @@ -137,53 +271,7 @@ $FreeBSD$ return current_mounts; -@@ -889,6 +939,45 @@ - return TRUE; - } - -+#ifdef 0 -+#ifdef __FreeBSD__ -+static void -+fstab_add_mount_volume (NautilusVolumeMonitor *monitor, struct fstab *ent) -+{ -+ NautilusVolume *volume; -+ gboolean mounted; -+ -+ volume = g_new0 (NautilusVolume, 1); -+ volume->device_path = g_strdup(ent->fs_spec); -+ volume->mount_path = g_strdup(ent->fs_file); -+ -+ mounted = FALSE; -+ -+ if (nautilus_str_has_prefix (ent->fs_spec, "/dev/fd")) { -+ mounted = mount_volume_floppy_add (monitor, volume); -+ } else if (strcmp (ent->fs_vfstype, "ufs") == 0) { -+ mounted = mount_volume_ext2_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "nfs") == 0) { -+ mounted = mount_volume_nfs_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "cd9660") == 0) { -+ mounted = mount_volume_iso9660_add (volume); -+ } else if (strcmp (ent->fs_vfstype, "msdos") == 0) { -+ mounted = mount_volume_msdos_add (volume); -+ } -+ -+ if (mounted) { -+ volume->is_read_only = strstr (ent->fs_type, FSTAB_RO) != NULL; -+ monitor->details->volumes = g_list_append (monitor->details->volumes, volume); -+ mount_volume_add_aliases (monitor, volume->device_path, volume); -+ } else { -+ g_free (volume->device_path); -+ g_free (volume->mount_path); -+ g_free (volume); -+ } -+} -+#endif -+#endif -+ - static void - cdrom_ioctl_get_info (int fd) - { -@@ -1025,6 +1114,14 @@ +@@ -1375,6 +1485,14 @@ break; } } @@ -198,3 +286,12 @@ $FreeBSD$ } #endif +@@ -1869,7 +1987,7 @@ + } + + if (mounted) { +-#ifndef SOLARIS_MNT ++#if !defined(SOLARIS_MNT) && !defined(__FreeBSD__) + volume->is_removable = volume_is_removable (volume); + volume->is_read_only = volume_is_read_only (volume); + #endif /* SOLARIS_MNT */ diff --git a/x11-fm/nautilus2/files/patch-xml-i18n-extract b/x11-fm/nautilus2/files/patch-xml-i18n-extract deleted file mode 100644 index a21354cc11b4..000000000000 --- a/x11-fm/nautilus2/files/patch-xml-i18n-extract +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-extract 2001/01/31 17:44:52 1.1 -+++ xml-i18n-extract 2001/01/31 17:45:08 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 2 -*- - - # diff --git a/x11-fm/nautilus2/files/patch-xml-i18n-merge b/x11-fm/nautilus2/files/patch-xml-i18n-merge deleted file mode 100644 index 137e5978ddfd..000000000000 --- a/x11-fm/nautilus2/files/patch-xml-i18n-merge +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-merge 2001/01/31 17:44:52 1.1 -+++ xml-i18n-merge 2001/01/31 17:45:16 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - - # - # The XML Translation Merge Tool diff --git a/x11-fm/nautilus2/files/patch-xml-i18n-update b/x11-fm/nautilus2/files/patch-xml-i18n-update deleted file mode 100644 index abdebb38482b..000000000000 --- a/x11-fm/nautilus2/files/patch-xml-i18n-update +++ /dev/null @@ -1,11 +0,0 @@ - -$FreeBSD$ - ---- xml-i18n-update 2001/01/31 17:44:52 1.1 -+++ xml-i18n-update 2001/01/31 17:45:22 -@@ -1,4 +1,4 @@ --#!/usr/local/bin/perl -w -+#!/usr/bin/perl -w - - # The GNOME Translation Update Tool - # diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index 1901db766717..5d4f6e3c0e56 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -15,19 +15,24 @@ bin/nautilus-launcher-applet %%MOZILLA:%%bin/nautilus-mozilla-content-view bin/nautilus-music-view bin/nautilus-notes +bin/nautilus-preferences-applet +bin/nautilus-restore-settings-to-default.sh bin/nautilus-sample-content-view bin/nautilus-sidebar-loser bin/nautilus-text-view bin/nautilus-throbber bin/nautilus-verify-rpm.sh +bin/nautilus-xml-migrate bin/run-nautilus etc/CORBA/servers/nautilus-launcher-applet.gnorba +etc/CORBA/servers/nautilus-preferences-applet.gnorba etc/vfs/modules/help-methods.conf include/libnautilus/libnautilus.h include/libnautilus/nautilus-bonobo-ui.h include/libnautilus/nautilus-bonobo-workarounds.h include/libnautilus/nautilus-clipboard.h include/libnautilus/nautilus-distributed-undo.h +include/libnautilus/nautilus-idle-queue.h include/libnautilus/nautilus-undo-private.h include/libnautilus/nautilus-undo.h include/libnautilus/nautilus-view-component.h @@ -44,17 +49,236 @@ lib/libnautilus.so.0 lib/vfs/modules/libvfs-help.so share/gnome/apps/Applications/nautilus.desktop share/gnome/help/gnufdl/C/gnufdl.sgml -share/gnome/help/nautilus/C/custicon.png -share/gnome/help/nautilus/C/full.png -share/gnome/help/nautilus/C/license.html -share/gnome/help/nautilus/C/locbar.png -share/gnome/help/nautilus/C/nautilus.sgml -share/gnome/help/nautilus/C/player.png -share/gnome/help/nautilus/C/prefmenu.png -share/gnome/help/nautilus/C/sidebar.png -share/gnome/help/nautilus/C/viewmenu.png -share/gnome/hyperbola/maps/pages.map +share/gnome/help/gnugpl/C/gnugpl.sgml +share/gnome/help/nautilus-quick-reference/C/figures/emblems.png +share/gnome/help/nautilus-quick-reference/C/figures/find.png +share/gnome/help/nautilus-quick-reference/C/figures/full.png +share/gnome/help/nautilus-quick-reference/C/figures/locbar.png +share/gnome/help/nautilus-quick-reference/C/figures/menubar.png +share/gnome/help/nautilus-quick-reference/C/figures/music.png +share/gnome/help/nautilus-quick-reference/C/figures/navbar.png +share/gnome/help/nautilus-quick-reference/C/figures/patterns.png +share/gnome/help/nautilus-quick-reference/C/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/C/figures/softcat.png +share/gnome/help/nautilus-quick-reference/C/figures/storage.png +share/gnome/help/nautilus-quick-reference/C/figures/themes.png +share/gnome/help/nautilus-quick-reference/C/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/C/index.html +share/gnome/help/nautilus-quick-reference/es/figures/colors_small.png +share/gnome/help/nautilus-quick-reference/es/figures/emblems_small.png +share/gnome/help/nautilus-quick-reference/es/figures/ff_small.png +share/gnome/help/nautilus-quick-reference/es/figures/find_small.png +share/gnome/help/nautilus-quick-reference/es/figures/full_small.png +share/gnome/help/nautilus-quick-reference/es/figures/locbar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/menubar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/music_small.png +share/gnome/help/nautilus-quick-reference/es/figures/navbar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/sidebar_small.png +share/gnome/help/nautilus-quick-reference/es/figures/softcat.png +share/gnome/help/nautilus-quick-reference/es/figures/storage.png +share/gnome/help/nautilus-quick-reference/es/figures/themes_small.png +share/gnome/help/nautilus-quick-reference/es/index.html +share/gnome/help/nautilus-quick-reference/ko/figures/emblems.png +share/gnome/help/nautilus-quick-reference/ko/figures/find.png +share/gnome/help/nautilus-quick-reference/ko/figures/full.png +share/gnome/help/nautilus-quick-reference/ko/figures/locbar.png +share/gnome/help/nautilus-quick-reference/ko/figures/menubar.png +share/gnome/help/nautilus-quick-reference/ko/figures/music.png +share/gnome/help/nautilus-quick-reference/ko/figures/navbar.png +share/gnome/help/nautilus-quick-reference/ko/figures/patterns.png +share/gnome/help/nautilus-quick-reference/ko/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/ko/figures/softcat.png +share/gnome/help/nautilus-quick-reference/ko/figures/storage.png +share/gnome/help/nautilus-quick-reference/ko/figures/themes.png +share/gnome/help/nautilus-quick-reference/ko/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/ko/index.html +share/gnome/help/nautilus-quick-reference/no/figures/colors_small.png +share/gnome/help/nautilus-quick-reference/no/figures/emblems_small.png +share/gnome/help/nautilus-quick-reference/no/figures/ff_small.png +share/gnome/help/nautilus-quick-reference/no/figures/find_small.png +share/gnome/help/nautilus-quick-reference/no/figures/full_small.png +share/gnome/help/nautilus-quick-reference/no/figures/locbar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/menubar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/music_small.png +share/gnome/help/nautilus-quick-reference/no/figures/navbar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/sidebar_small.png +share/gnome/help/nautilus-quick-reference/no/figures/softcat.png +share/gnome/help/nautilus-quick-reference/no/figures/storage.png +share/gnome/help/nautilus-quick-reference/no/figures/themes_small.png +share/gnome/help/nautilus-quick-reference/no/index.html +share/gnome/help/nautilus-quick-reference/sv/figures/emblems.png +share/gnome/help/nautilus-quick-reference/sv/figures/find.png +share/gnome/help/nautilus-quick-reference/sv/figures/full.png +share/gnome/help/nautilus-quick-reference/sv/figures/locbar.png +share/gnome/help/nautilus-quick-reference/sv/figures/menubar.png +share/gnome/help/nautilus-quick-reference/sv/figures/music.png +share/gnome/help/nautilus-quick-reference/sv/figures/navbar.png +share/gnome/help/nautilus-quick-reference/sv/figures/patterns.png +share/gnome/help/nautilus-quick-reference/sv/figures/sidebar.png +share/gnome/help/nautilus-quick-reference/sv/figures/softcat.png +share/gnome/help/nautilus-quick-reference/sv/figures/storage.png +share/gnome/help/nautilus-quick-reference/sv/figures/themes.png +share/gnome/help/nautilus-quick-reference/sv/figures/viewmenu.png +share/gnome/help/nautilus-quick-reference/sv/index.html +share/gnome/help/nautilus-release-notes/C/beta.html +share/gnome/help/nautilus-release-notes/C/docbook.css +share/gnome/help/nautilus-release-notes/C/index.html +share/gnome/help/nautilus-release-notes/C/nautilus-release-notes.sgml +share/gnome/help/nautilus-release-notes/C/mozilla.html +share/gnome/help/nautilus-release-notes/C/new10.html +share/gnome/help/nautilus-release-notes/C/new102.html +share/gnome/help/nautilus-release-notes/C/require.html +share/gnome/help/nautilus-release-notes/C/searching.html +share/gnome/help/nautilus-release-notes/C/session.html +share/gnome/help/nautilus-release-notes/C/stylesheet-images/caution.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/home.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/important.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/next.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/note.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/prev.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/tip.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/up.gif +share/gnome/help/nautilus-release-notes/C/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/C/chapter1.html +share/gnome/help/nautilus-user-manual/C/chapter2.html +share/gnome/help/nautilus-user-manual/C/docbook.css +share/gnome/help/nautilus-user-manual/C/figures/custicon.png +share/gnome/help/nautilus-user-manual/C/figures/full-1.png +share/gnome/help/nautilus-user-manual/C/figures/full-2.png +share/gnome/help/nautilus-user-manual/C/figures/full-3.png +share/gnome/help/nautilus-user-manual/C/figures/full-4.png +share/gnome/help/nautilus-user-manual/C/figures/full-5.png +share/gnome/help/nautilus-user-manual/C/figures/full-6.png +share/gnome/help/nautilus-user-manual/C/figures/full.png +share/gnome/help/nautilus-user-manual/C/figures/link.png +share/gnome/help/nautilus-user-manual/C/figures/locbar.png +share/gnome/help/nautilus-user-manual/C/figures/noread.png +share/gnome/help/nautilus-user-manual/C/figures/nowrite.png +share/gnome/help/nautilus-user-manual/C/figures/part-1.png +share/gnome/help/nautilus-user-manual/C/figures/part-2.png +share/gnome/help/nautilus-user-manual/C/figures/part-3.png +share/gnome/help/nautilus-user-manual/C/figures/part.png +share/gnome/help/nautilus-user-manual/C/figures/player-1.png +share/gnome/help/nautilus-user-manual/C/figures/player-2.png +share/gnome/help/nautilus-user-manual/C/figures/player-3.png +share/gnome/help/nautilus-user-manual/C/figures/player-4.png +share/gnome/help/nautilus-user-manual/C/figures/player.png +share/gnome/help/nautilus-user-manual/C/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/C/figures/sidebar.png +share/gnome/help/nautilus-user-manual/C/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/C/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/C/gnome.html +share/gnome/help/nautilus-user-manual/C/home.html +share/gnome/help/nautilus-user-manual/C/index.html +share/gnome/help/nautilus-user-manual/C/introdesktop.html +share/gnome/help/nautilus-user-manual/C/ln21.html +share/gnome/help/nautilus-user-manual/C/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/C/navigating.html +share/gnome/help/nautilus-user-manual/C/session.html +share/gnome/help/nautilus-user-manual/C/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/C/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/es/chapter1.html +share/gnome/help/nautilus-user-manual/es/chapter2.html +share/gnome/help/nautilus-user-manual/es/default.html +share/gnome/help/nautilus-user-manual/es/docbook.css +share/gnome/help/nautilus-user-manual/es/figures/custicon.png +share/gnome/help/nautilus-user-manual/es/figures/full.png +share/gnome/help/nautilus-user-manual/es/figures/link.png +share/gnome/help/nautilus-user-manual/es/figures/locbar.png +share/gnome/help/nautilus-user-manual/es/figures/noread.png +share/gnome/help/nautilus-user-manual/es/figures/nowrite.png +share/gnome/help/nautilus-user-manual/es/figures/part.png +share/gnome/help/nautilus-user-manual/es/figures/player.png +share/gnome/help/nautilus-user-manual/es/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/es/figures/sidebar.png +share/gnome/help/nautilus-user-manual/es/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/es/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/es/gnome.html +share/gnome/help/nautilus-user-manual/es/home.html +share/gnome/help/nautilus-user-manual/es/index.html +share/gnome/help/nautilus-user-manual/es/introdesktop.html +share/gnome/help/nautilus-user-manual/es/ln18.html +share/gnome/help/nautilus-user-manual/es/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/es/navigating.html +share/gnome/help/nautilus-user-manual/es/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/es/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/es/tree.html +share/gnome/help/nautilus-user-manual/es/viewopen.html +share/gnome/help/nautilus-user-manual/ko/chapter1.html +share/gnome/help/nautilus-user-manual/ko/chapter2.html +share/gnome/help/nautilus-user-manual/ko/docbook.css +share/gnome/help/nautilus-user-manual/ko/figures/custicon.png +share/gnome/help/nautilus-user-manual/ko/figures/full-1.png +share/gnome/help/nautilus-user-manual/ko/figures/full-2.png +share/gnome/help/nautilus-user-manual/ko/figures/full-3.png +share/gnome/help/nautilus-user-manual/ko/figures/full-4.png +share/gnome/help/nautilus-user-manual/ko/figures/full-5.png +share/gnome/help/nautilus-user-manual/ko/figures/full-6.png +share/gnome/help/nautilus-user-manual/ko/figures/full.png +share/gnome/help/nautilus-user-manual/ko/figures/link.png +share/gnome/help/nautilus-user-manual/ko/figures/locbar.png +share/gnome/help/nautilus-user-manual/ko/figures/noread.png +share/gnome/help/nautilus-user-manual/ko/figures/nowrite.png +share/gnome/help/nautilus-user-manual/ko/figures/part-1.png +share/gnome/help/nautilus-user-manual/ko/figures/part-2.png +share/gnome/help/nautilus-user-manual/ko/figures/part-3.png +share/gnome/help/nautilus-user-manual/ko/figures/part.png +share/gnome/help/nautilus-user-manual/ko/figures/player-1.png +share/gnome/help/nautilus-user-manual/ko/figures/player-2.png +share/gnome/help/nautilus-user-manual/ko/figures/player-3.png +share/gnome/help/nautilus-user-manual/ko/figures/player-4.png +share/gnome/help/nautilus-user-manual/ko/figures/player.png +share/gnome/help/nautilus-user-manual/ko/figures/prefmenu.png +share/gnome/help/nautilus-user-manual/ko/figures/sidebar.png +share/gnome/help/nautilus-user-manual/ko/figures/viewmenu.png +share/gnome/help/nautilus-user-manual/ko/figures/viewmusic.png +share/gnome/help/nautilus-user-manual/ko/gnome.html +share/gnome/help/nautilus-user-manual/ko/home.html +share/gnome/help/nautilus-user-manual/ko/index.html +share/gnome/help/nautilus-user-manual/ko/introdesktop.html +share/gnome/help/nautilus-user-manual/ko/ln18.html +share/gnome/help/nautilus-user-manual/ko/nautilus-user-manual.sgml +share/gnome/help/nautilus-user-manual/ko/navigating.html +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/caution.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/home.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/important.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/next.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/note.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/prev.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/tip.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-blank.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-minus.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/toc-plus.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/up.gif +share/gnome/help/nautilus-user-manual/ko/stylesheet-images/warning.gif +share/gnome/help/nautilus-user-manual/ko/tree.html +share/gnome/help/nautilus-user-manual/ko/viewopen.html share/gnome/nautilus/browser.xml +share/gnome/nautilus/components/hyperbola/maps/pages.map +share/gnome/nautilus/components/hyperbola/topleveldocs.xml share/gnome/nautilus/emblems/OK.png share/gnome/nautilus/emblems/certified.png share/gnome/nautilus/emblems/cool.png @@ -67,8 +291,6 @@ share/gnome/nautilus/emblems/important.png share/gnome/nautilus/emblems/new.png share/gnome/nautilus/emblems/ohno.png share/gnome/nautilus/emblems/personal.png -share/gnome/nautilus/emblems/secret.png -share/gnome/nautilus/emblems/shared.png share/gnome/nautilus/emblems/special.png share/gnome/nautilus/emblems/urgent.png share/gnome/nautilus/fonts/urw/fonts.dir @@ -86,6 +308,7 @@ share/gnome/nautilus/fonts/urw/n019024l.pfb share/gnome/nautilus/fonts/urw/n019024l.pfm share/gnome/nautilus/linksets/apps.xml share/gnome/nautilus/linksets/desktop.xml +share/gnome/nautilus/linksets/home.xml share/gnome/nautilus/linksets/portals.xml share/gnome/nautilus/linksets/search_engines.xml share/gnome/nautilus/nautilus-extras.placeholder @@ -122,14 +345,9 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/services/text/english_to_french.xml -share/gnome/nautilus/services/text/french_to_english.xml share/gnome/nautilus/services/text/google.xml share/gnome/nautilus/services/text/webster.xml share/gnome/nautilus/static_bookmarks.xml -share/gnome/nautilus/top/.nautilus-metafile.xml -share/gnome/nautilus/top/Computer -share/gnome/nautilus/top/Services share/gnome/oaf/Nautilus_ComponentAdapterFactory_std.oaf share/gnome/oaf/Nautilus_Control_throbber.oaf share/gnome/oaf/Nautilus_View_content-loser.oaf @@ -191,15 +409,33 @@ share/gnome/pixmaps/nautilus/arlo/decrement.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-72.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite-96.png share/gnome/pixmaps/nautilus/arlo/emblem-nowrite.png +share/gnome/pixmaps/nautilus/arlo/i-directory-12-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-12.png share/gnome/pixmaps/nautilus/arlo/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-192.png +share/gnome/pixmaps/nautilus/arlo/i-directory-20-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-20.png +share/gnome/pixmaps/nautilus/arlo/i-directory-24-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-24.png +share/gnome/pixmaps/nautilus/arlo/i-directory-36-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-36.png share/gnome/pixmaps/nautilus/arlo/i-directory-72-aa.png share/gnome/pixmaps/nautilus/arlo/i-directory-72.png share/gnome/pixmaps/nautilus/arlo/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/arlo/i-directory-96.png share/gnome/pixmaps/nautilus/arlo/i-directory-aa.png share/gnome/pixmaps/nautilus/arlo/i-directory.png share/gnome/pixmaps/nautilus/arlo/i-directory.xml +share/gnome/pixmaps/nautilus/arlo/i-regular-12-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-12.png share/gnome/pixmaps/nautilus/arlo/i-regular-192-aa.png share/gnome/pixmaps/nautilus/arlo/i-regular-192.png +share/gnome/pixmaps/nautilus/arlo/i-regular-20-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-20.png +share/gnome/pixmaps/nautilus/arlo/i-regular-24-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-24.png +share/gnome/pixmaps/nautilus/arlo/i-regular-36-aa.png +share/gnome/pixmaps/nautilus/arlo/i-regular-36.png share/gnome/pixmaps/nautilus/arlo/i-regular-72-aa.png share/gnome/pixmaps/nautilus/arlo/i-regular-72.png share/gnome/pixmaps/nautilus/arlo/i-regular-96-aa.png @@ -258,10 +494,16 @@ share/gnome/pixmaps/nautilus/arlo/throbber/025.png share/gnome/pixmaps/nautilus/arlo/throbber/026.png share/gnome/pixmaps/nautilus/arlo/throbber/027.png share/gnome/pixmaps/nautilus/arlo/throbber/028.png +share/gnome/pixmaps/nautilus/arlo/throbber/029.png +share/gnome/pixmaps/nautilus/arlo/throbber/030.png share/gnome/pixmaps/nautilus/arlo/throbber/rest.png share/gnome/pixmaps/nautilus/arlo/zoom_body.png share/gnome/pixmaps/nautilus/audio.png share/gnome/pixmaps/nautilus/backgrounds.png +share/gnome/pixmaps/nautilus/bubble-LL.png +share/gnome/pixmaps/nautilus/bubble-LR.png +share/gnome/pixmaps/nautilus/bubble-UL.png +share/gnome/pixmaps/nautilus/bubble-UR.png share/gnome/pixmaps/nautilus/chit_frame.png share/gnome/pixmaps/nautilus/colors.png share/gnome/pixmaps/nautilus/computer.png @@ -283,21 +525,23 @@ share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-72.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-96.png share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72-aa.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96-aa.png +share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-aa.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.png share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.xml -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-192.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-72.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-96.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular-aa.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.png share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.xml share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png share/gnome/pixmaps/nautilus/crux_eggplant/increment.png @@ -350,6 +594,8 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/025.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/026.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/027.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/028.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/029.png +share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png share/gnome/pixmaps/nautilus/decrement.png @@ -357,7 +603,28 @@ share/gnome/pixmaps/nautilus/default.xml share/gnome/pixmaps/nautilus/druid_header.png share/gnome/pixmaps/nautilus/druid_header_stretch.png share/gnome/pixmaps/nautilus/druid_sidebar.png -share/gnome/pixmaps/nautilus/eazel-logo.gif +share/gnome/pixmaps/nautilus/eazel-logos/About_Image.png +share/gnome/pixmaps/nautilus/eazel-logos/LICENSE +share/gnome/pixmaps/nautilus/eazel-logos/about_background.png +share/gnome/pixmaps/nautilus/eazel-logos/default.xml +share/gnome/pixmaps/nautilus/eazel-logos/druid_header.png +share/gnome/pixmaps/nautilus/eazel-logos/eazel-logo-right-side-logo.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/001.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/002.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/003.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/004.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/005.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/006.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/007.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/008.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/009.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/010.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/011.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/012.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/013.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/014.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/015.png +share/gnome/pixmaps/nautilus/eazel-logos/throbber/rest.png share/gnome/pixmaps/nautilus/emblem-OK.svg share/gnome/pixmaps/nautilus/emblem-broken-link.png share/gnome/pixmaps/nautilus/emblem-certified.svg @@ -373,9 +640,10 @@ share/gnome/pixmaps/nautilus/emblem-noread.svg share/gnome/pixmaps/nautilus/emblem-nowrite.svg share/gnome/pixmaps/nautilus/emblem-ohno.svg share/gnome/pixmaps/nautilus/emblem-personal.svg -share/gnome/pixmaps/nautilus/emblem-secret.svg -share/gnome/pixmaps/nautilus/emblem-shared.svg share/gnome/pixmaps/nautilus/emblem-special.svg +share/gnome/pixmaps/nautilus/emblem-symbolic-link-12.png +share/gnome/pixmaps/nautilus/emblem-symbolic-link-24.png +share/gnome/pixmaps/nautilus/emblem-symbolic-link-36.png share/gnome/pixmaps/nautilus/emblem-symbolic-link.png share/gnome/pixmaps/nautilus/emblem-trash.png share/gnome/pixmaps/nautilus/emblem-urgent.svg @@ -456,6 +724,8 @@ share/gnome/pixmaps/nautilus/gnome-textfile.png share/gnome/pixmaps/nautilus/gnome-video-mpeg.png share/gnome/pixmaps/nautilus/gnome-video-quicktime.png share/gnome/pixmaps/nautilus/gnome-video-x-msvideo.png +share/gnome/pixmaps/nautilus/gnome/SearchWeb.png +share/gnome/pixmaps/nautilus/gnome/Services.png share/gnome/pixmaps/nautilus/gnome/gnome.xml share/gnome/pixmaps/nautilus/gnome/i-directory-12.png share/gnome/pixmaps/nautilus/gnome/i-directory-192.png @@ -485,7 +755,9 @@ share/gnome/pixmaps/nautilus/gnome/throbber/008.png share/gnome/pixmaps/nautilus/gnome/throbber/009.png share/gnome/pixmaps/nautilus/gnome/throbber/010.png share/gnome/pixmaps/nautilus/gnome/throbber/rest.png -share/gnome/pixmaps/nautilus/hand.svg +share/gnome/pixmaps/nautilus/hand-72.png +share/gnome/pixmaps/nautilus/hand-96.png +share/gnome/pixmaps/nautilus/hand.png share/gnome/pixmaps/nautilus/home.png share/gnome/pixmaps/nautilus/i-blockdev.png share/gnome/pixmaps/nautilus/i-bookmark-20.png @@ -572,7 +844,6 @@ share/gnome/pixmaps/nautilus/loading.png share/gnome/pixmaps/nautilus/manual.png share/gnome/pixmaps/nautilus/memory_chip.gif share/gnome/pixmaps/nautilus/multi-ok.png -share/gnome/pixmaps/nautilus/nautilus-logo.png share/gnome/pixmaps/nautilus/nautilus-mini-logo.png share/gnome/pixmaps/nautilus/netscape.png share/gnome/pixmaps/nautilus/not.png @@ -620,9 +891,25 @@ share/gnome/pixmaps/nautilus/throbber/012.png share/gnome/pixmaps/nautilus/throbber/013.png share/gnome/pixmaps/nautilus/throbber/014.png share/gnome/pixmaps/nautilus/throbber/015.png +share/gnome/pixmaps/nautilus/throbber/016.png +share/gnome/pixmaps/nautilus/throbber/017.png +share/gnome/pixmaps/nautilus/throbber/018.png +share/gnome/pixmaps/nautilus/throbber/019.png +share/gnome/pixmaps/nautilus/throbber/020.png +share/gnome/pixmaps/nautilus/throbber/021.png +share/gnome/pixmaps/nautilus/throbber/022.png +share/gnome/pixmaps/nautilus/throbber/023.png +share/gnome/pixmaps/nautilus/throbber/024.png +share/gnome/pixmaps/nautilus/throbber/025.png +share/gnome/pixmaps/nautilus/throbber/026.png +share/gnome/pixmaps/nautilus/throbber/027.png +share/gnome/pixmaps/nautilus/throbber/028.png +share/gnome/pixmaps/nautilus/throbber/029.png +share/gnome/pixmaps/nautilus/throbber/030.png share/gnome/pixmaps/nautilus/throbber/rest.png share/gnome/pixmaps/nautilus/thumbnail_frame.aa.png share/gnome/pixmaps/nautilus/thumbnail_frame.png +share/gnome/pixmaps/nautilus/tiny-alert.png share/gnome/pixmaps/nautilus/trash-empty.png share/gnome/pixmaps/nautilus/trash-full.png share/gnome/pixmaps/nautilus/uparrow.png @@ -669,9 +956,11 @@ share/gnome/ui/nautilus-service-ui.xml share/gnome/ui/nautilus-shell-ui.xml share/gnome/ui/nautilus-sidebar-loser-ui.xml share/gnome/ui/nautilus-text-view-ui.xml +share/locale/az/LC_MESSAGES/nautilus.mo share/locale/ca/LC_MESSAGES/nautilus.mo share/locale/da/LC_MESSAGES/nautilus.mo share/locale/de/LC_MESSAGES/nautilus.mo +share/locale/el/LC_MESSAGES/nautilus.mo share/locale/en_GB/LC_MESSAGES/nautilus.mo share/locale/es/LC_MESSAGES/nautilus.mo share/locale/fi/LC_MESSAGES/nautilus.mo @@ -683,11 +972,13 @@ share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo +share/locale/nn/LC_MESSAGES/nautilus.mo share/locale/no/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo share/locale/pt_BR/LC_MESSAGES/nautilus.mo share/locale/ru/LC_MESSAGES/nautilus.mo share/locale/sk/LC_MESSAGES/nautilus.mo +share/locale/sl/LC_MESSAGES/nautilus.mo share/locale/sv/LC_MESSAGES/nautilus.mo share/locale/ta/LC_MESSAGES/nautilus.mo share/locale/tr/LC_MESSAGES/nautilus.mo @@ -698,6 +989,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/gnome/throbber @dirrm share/gnome/pixmaps/nautilus/gnome +@dirrm share/gnome/pixmaps/nautilus/eazel-logos/throbber +@dirrm share/gnome/pixmaps/nautilus/eazel-logos @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/throbber @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces @dirrm share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds @@ -708,7 +1001,6 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/arlo @dirrm share/gnome/pixmaps/nautilus/ardmore @dirrm share/gnome/pixmaps/nautilus -@dirrm share/gnome/nautilus/top @dirrm share/gnome/nautilus/services/text @dirrm share/gnome/nautilus/services @dirrm share/gnome/nautilus/patterns @@ -716,11 +1008,37 @@ share/locale/zh_TW.Big5/LC_MESSAGES/nautilus.mo @dirrm share/gnome/nautilus/fonts/urw @dirrm share/gnome/nautilus/fonts @dirrm share/gnome/nautilus/emblems +@dirrm share/gnome/nautilus/components/hyperbola/maps +@dirrm share/gnome/nautilus/components/hyperbola +@dirrm share/gnome/nautilus/components @dirrm share/gnome/nautilus -@dirrm share/gnome/hyperbola/maps -@dirrm share/gnome/hyperbola -@dirrm share/gnome/help/nautilus/C -@dirrm share/gnome/help/nautilus +@dirrm share/gnome/help/nautilus-user-manual/ko/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/ko/figures +@dirrm share/gnome/help/nautilus-user-manual/ko +@dirrm share/gnome/help/nautilus-user-manual/es/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/es/figures +@dirrm share/gnome/help/nautilus-user-manual/es +@dirrm share/gnome/help/nautilus-user-manual/C/stylesheet-images +@dirrm share/gnome/help/nautilus-user-manual/C/figures +@dirrm share/gnome/help/nautilus-user-manual/C +@dirrm share/gnome/help/nautilus-user-manual +@dirrm share/gnome/help/nautilus-release-notes/C/stylesheet-images +@dirrm share/gnome/help/nautilus-release-notes/C/figures +@dirrm share/gnome/help/nautilus-release-notes/C +@dirrm share/gnome/help/nautilus-release-notes +@dirrm share/gnome/help/nautilus-quick-reference/sv/figures +@dirrm share/gnome/help/nautilus-quick-reference/sv +@dirrm share/gnome/help/nautilus-quick-reference/no/figures +@dirrm share/gnome/help/nautilus-quick-reference/no +@dirrm share/gnome/help/nautilus-quick-reference/ko/figures +@dirrm share/gnome/help/nautilus-quick-reference/ko +@dirrm share/gnome/help/nautilus-quick-reference/es/figures +@dirrm share/gnome/help/nautilus-quick-reference/es +@dirrm share/gnome/help/nautilus-quick-reference/C/figures +@dirrm share/gnome/help/nautilus-quick-reference/C +@dirrm share/gnome/help/nautilus-quick-reference +@dirrm share/gnome/help/gnugpl/C +@dirrm share/gnome/help/gnugpl @dirrm share/gnome/help/gnufdl/C @dirrm share/gnome/help/gnufdl @dirrm include/libnautilus -- cgit v1.2.3