aboutsummaryrefslogtreecommitdiff
path: root/x11-fm/nautilus2
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-09-18 06:49:37 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-09-18 06:49:37 +0000
commit9c0caae1c20155b432bb0feb074a8fd9cc1c12bc (patch)
tree534d0190982c831de589344c3003940ec6f2d6b1 /x11-fm/nautilus2
parent27d17afba2c21f490ea8472d7aa37495e02e3ed8 (diff)
downloadports-9c0caae1c20155b432bb0feb074a8fd9cc1c12bc.tar.gz
ports-9c0caae1c20155b432bb0feb074a8fd9cc1c12bc.zip
Notes
Diffstat (limited to 'x11-fm/nautilus2')
-rw-r--r--x11-fm/nautilus2/Makefile14
-rw-r--r--x11-fm/nautilus2/distinfo2
-rw-r--r--x11-fm/nautilus2/files/patch-aa25
-rw-r--r--x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c159
-rw-r--r--x11-fm/nautilus2/files/patch-ltmain.sh51
-rw-r--r--x11-fm/nautilus2/pkg-plist146
6 files changed, 163 insertions, 234 deletions
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 0bf6c2b25e1f..8cbb405cb1e9 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= nautilus2
-PORTVERSION= 2.2.4
+PORTVERSION= 2.4.0
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4
DIST_SUBDIR= gnome2
DISTNAME= nautilus-${PORTVERSION}
@@ -21,17 +21,17 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
USE_BZIP2= yes
USE_GMAKE= yes
USE_X_PREFIX= yes
-USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop eel2 librsvg2 \
- gnomecontrolcenter2
+USE_GNOME= gnomeprefix gnomehack gnomehier gnomedesktop eel2 librsvg2
GNOME_DESKTOP_VERSION=2
INSTALLS_SHLIB= yes
-USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
USE_REINPLACE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -liconv" \
LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}"
CONFIGURE_ARGS= --with-freetype2-lib-place=${LOCALBASE}/lib \
- --with-freetype2-include-place=${LOCALBASE}/include/freetype2
+ --with-freetype2-include-place=${LOCALBASE}/include/freetype2 \
+ --enable-static
MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
post-install:
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 0113dd7b2bcd..40a3b0590e2b 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.2.4.tar.bz2) = cb189d8a53dca17e5345261bd819c421
+MD5 (gnome2/nautilus-2.4.0.tar.bz2) = ec3e317a12072b79d9b915c256400ed9
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index bff0e4a65988..3881dec5e6a5 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,14 +1,6 @@
---- configure.orig Mon Jan 13 10:45:25 2003
-+++ configure Tue Jan 14 13:11:53 2003
-@@ -8294,6 +8294,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -12661,7 +12662,7 @@
+--- configure.orig Sat Jun 28 00:42:27 2003
++++ configure Sat Jun 28 00:44:45 2003
+@@ -12860,7 +12860,7 @@
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
@@ -17,7 +9,7 @@
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
-@@ -12669,7 +12670,7 @@
+@@ -12868,7 +12868,7 @@
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
@@ -26,16 +18,16 @@
COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
-@@ -13593,7 +13594,7 @@
- s,@LIBTOOL@,$LIBTOOL,;t t
+@@ -13849,7 +13849,7 @@
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@STARTUP_NOTIFICATION_PACKAGE@,$STARTUP_NOTIFICATION_PACKAGE,;t t
s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
-s,@ALL_LIBS@,$ALL_LIBS,;t t
+s~@ALL_LIBS@~$ALL_LIBS~;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
- s,@ALLOCA@,$ALLOCA,;t t
s,@USE_NLS@,$USE_NLS,;t t
-@@ -13643,25 +13644,25 @@
+ s,@MSGFMT@,$MSGFMT,;t t
+@@ -13901,26 +13901,26 @@
s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
s,@HAVE_JW@,$HAVE_JW,;t t
s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -43,6 +35,7 @@
+s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
s,@LIBJPEG@,$LIBJPEG,;t t
s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
+ s,@GSEQUENCE_CFLAGS@,$GSEQUENCE_CFLAGS,;t t
s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t
s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
-s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c
index bcf3479a9a07..b63431e8a341 100644
--- a/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c
+++ b/x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-volume-monitor.c
@@ -1,6 +1,6 @@
---- libnautilus-private/nautilus-volume-monitor.c.orig Fri Feb 28 09:52:23 2003
-+++ libnautilus-private/nautilus-volume-monitor.c Mon Mar 10 18:13:57 2003
-@@ -59,6 +59,18 @@
+--- libnautilus-private/nautilus-volume-monitor.c.orig Sun May 4 04:36:53 2003
++++ libnautilus-private/nautilus-volume-monitor.c Wed May 7 00:50:22 2003
+@@ -59,6 +59,16 @@
#include <sys/types.h>
#include <unistd.h>
@@ -9,17 +9,15 @@
+#include <sys/ucred.h>
+#include <sys/mount.h>
+
-+#define HAVE_GETMNTINFO
+#define HAVE_SETFSENT
-+#define HAVE_FSTAB_H
+#define FREEBSD_MNT
+#define setmntent(f,m) setfsent()
+#endif
+
#ifdef HAVE_SYS_VFSTAB_H
#include <sys/vfstab.h>
- #else
-@@ -103,7 +115,7 @@
+ #elif HAVE_FSTAB_H
+@@ -120,7 +130,7 @@
#define MNTOPT_RO "ro"
#endif
@@ -27,8 +25,8 @@
+#if !defined(HAVE_SETMNTENT) && !defined(HAVE_SETFSENT)
#define setmntent(f,m) fopen(f,m)
#endif
-
-@@ -492,6 +504,9 @@
+ #ifndef HAVE_ENDMNTENT
+@@ -519,6 +529,9 @@
static gboolean
has_removable_mntent_options (MountTableEntry *ent)
{
@@ -38,7 +36,7 @@
#ifdef HAVE_HASMNTOPT
/* Use "owner" or "user" or "users" as our way of determining a removable volume */
if (hasmntopt (ent, "user") != NULL
-@@ -501,6 +516,12 @@
+@@ -528,6 +541,12 @@
return TRUE;
}
#endif
@@ -51,7 +49,7 @@
#ifdef SOLARIS_MNT
if (eel_str_has_prefix (ent->mnt_special, "/vol/")) {
-@@ -522,10 +543,15 @@
+@@ -667,10 +686,15 @@
static GList *
get_removable_volumes (NautilusVolumeMonitor *monitor)
{
@@ -68,9 +66,9 @@
+ MountTableEntry *ent = NULL;
+ NautilusVolume *volume = NULL;
char * fs_opt;
- #ifdef HAVE_SYS_MNTTAB_H
+ #if defined(HAVE_SYS_MNTTAB_H) || defined(AIX_MNT)
MountTableEntry ent_storage;
-@@ -533,26 +559,27 @@
+@@ -678,26 +702,27 @@
#ifdef HAVE_GETMNTINFO
int count, index;
#endif
@@ -103,30 +101,30 @@
return NULL;
}
-@@ -587,9 +614,21 @@
+@@ -742,9 +767,21 @@
(monitor, volume, ent->mnt_type, volumes);
}
}
+#elif defined (HAVE_SETFSENT)
+ while ((fsent = getfsent ()) != NULL) {
-+ if (strstr (fsent->fs_mntops, "noauto") != NULL) {
-+ volume = create_volume (fsent->fs_spec, fsent->fs_file);
-+ volumes = finish_creating_volume_and_prepend
-+ (monitor, volume, fsent->fs_vfstype, volumes);
-+ }
++ if (strstr (fsent->fs_mntops, "noauto") != NULL) {
++ volume = create_volume (fsent->fs_spec, fsent->fs_file);
++ volumes = finish_creating_volume_and_prepend
++ (monitor, volume, fsent->fs_vfstype, volumes);
++ }
+ }
#endif
-
+
+#ifndef HAVE_SETFSENT
- fclose (file);
+ endmntent (file);
+#else
+ endfsent();
+#endif
#ifdef HAVE_CDDA
volume = create_volume (CD_AUDIO_PATH, CD_AUDIO_PATH);
-@@ -619,7 +658,7 @@
+@@ -774,7 +811,7 @@
return result;
}
@@ -135,7 +133,7 @@
static gboolean
volume_is_removable (const NautilusVolume *volume)
-@@ -885,7 +924,7 @@
+@@ -1040,7 +1077,7 @@
char *command;
if (path != NULL) {
@@ -144,26 +142,27 @@
eel_gnome_shell_execute (command);
g_free (command);
}
-@@ -963,23 +1002,34 @@
-
-
+@@ -1197,23 +1234,34 @@
+ return volumes;
+ }
--#ifdef SOLARIS_MNT
-+#if defined(SOLARIS_MNT) || defined(FREEBSD_MNT)
+-#elif defined(SOLARIS_MNT)
++#elif defined(SOLARIS_MNT) || defined(FREEBSD_MNT)
static GList *
get_mount_list (NautilusVolumeMonitor *monitor)
{
- FILE *fh;
GList *volumes;
+- MountTableEntry ent;
+ NautilusVolume *volume;
+#ifndef HAVE_SETFSENT
- MountTableEntry ent;
++ MountTableEntry ent;
+ FILE *fh;
+#else
-+ MountTableEntry *ent;
++ MountTableEntry *ent;
+ int fh, index;
+#endif
- NautilusVolume *volume;
volumes = NULL;
@@ -171,7 +170,7 @@
fh = setmntent (MOUNT_TABLE_PATH, "r");
if (fh == NULL) {
+#else
-+ fh = getmntinfo (&ent, MNT_WAIT);
++ fh = getmntinfo (&ent, MNT_WAIT);
+ if (fh == 0) {
+#endif
return NULL;
@@ -181,73 +180,77 @@
while (! getmntent(fh, &ent)) {
volume = create_volume (ent.mnt_special, ent.mnt_mountp);
volume->is_removable = has_removable_mntent_options (&ent);
-@@ -988,6 +1038,16 @@
+@@ -1222,6 +1270,16 @@
}
- fclose (fh);
+ endmntent (fh);
+#else
-+ /* getmentinfo returns a pointer to static data. Do not free. */
-+ for (index = 0; index < fh; index++) {
-+ volume = create_volume (ent[index].f_mntfromname,
-+ ent[index].f_mntonname);
-+ volume->is_removable = has_removable_mntent_options (ent + index);
-+ volumes = finish_creating_volume_and_prepend
-+ (monitor, volume, ent[index].f_fstypename, volumes);
-+ }
++ /* getmentinfo returns a pointer to static data. Do not free. */
++ for (index = 0; index < fh; index++) {
++ volume = create_volume (ent[index].f_mntfromname,
++ ent[index].f_mntonname);
++ volume->is_removable = has_removable_mntent_options (ent + index);
++ volumes = finish_creating_volume_and_prepend
++ (monitor, volume, ent[index].f_fstypename, volumes);
++ }
+#endif
return volumes;
}
-@@ -1214,9 +1274,38 @@
+@@ -1448,7 +1506,7 @@
static int
get_cdrom_type (const char *vol_dev_path, int* fd)
{
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT)
- *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
- return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
+-#ifdef SOLARIS_MNT
++#if defined(SOLARIS_MNT)
+ GString *new_dev_path;
+ struct cdrom_tocentry entry;
+ struct cdrom_tochdr header;
+@@ -1487,6 +1545,34 @@
+ return type;
+ #elif defined(AIX_MNT)
+ return CDS_NO_INFO;
+#elif defined(FREEBSD_MNT)
-+ struct ioc_toc_header header;
-+ struct ioc_read_toc_single_entry entry;
-+ int type;
++ struct ioc_toc_header header;
++ struct ioc_read_toc_single_entry entry;
++ int type;
+
-+ *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
-+ if (*fd < 0) {
-+ return CDS_DATA_1;
-+ }
-+
-+ if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) {
-+ return CDS_DATA_1;
-+ }
++ *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
++ if (*fd < 0) {
++ return CDS_DATA_1;
++ }
+
-+ type = CDS_DATA_1;
++ if ( ioctl(*fd, CDIOREADTOCHEADER, &header) == 0) {
++ return CDS_DATA_1;
++ }
+
-+ for (entry.track = header.starting_track;
-+ entry.track <= header.ending_track;
-+ entry.track++) {
-+ entry.address_format = CD_LBA_FORMAT;
-+ if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) {
-+ if (entry.entry.control & CDROM_DATA_TRACK) {
-+ type = CDS_AUDIO;
-+ break;
-+ }
-+ }
-+ }
++ type = CDS_DATA_1;
++ for (entry.track = header.starting_track;
++ entry.track <= header.ending_track;
++ entry.track++) {
++ entry.address_format = CD_LBA_FORMAT;
++ if (ioctl (*fd, CDIOREADTOCENTRY, &entry) == 0) {
++ if (entry.entry.control & CDROM_DATA_TRACK) {
++ type = CDS_AUDIO;
++ break;
++ }
++ }
++ }
+
-+ return type;
++ return type;
#else
- GString *new_dev_path;
- struct cdrom_tocentry entry;
-@@ -1768,7 +1857,7 @@
+ *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK);
+ return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT);
+@@ -2004,7 +2090,7 @@
for (node = volume_list; node != NULL; node = node->next) {
volume = node->data;
--#ifndef SOLARIS_MNT
-+#if !defined(SOLARIS_MNT) && !defined(FREEBSD_MNT)
- /* These are set up by get_current_mount_list for Solaris. */
+-#if !defined(SOLARIS_MNT) && !defined(AIX_MNT)
++#if !defined(SOLARIS_MNT) && !defined(AIX_MNT) && !defined(FREEBSD_MNT)
+ /* These are set up by get_current_mount_list for Solaris&AIX.*/
volume->is_removable = volume_is_removable (volume);
#endif
-@@ -1797,7 +1886,7 @@
+@@ -2033,7 +2119,7 @@
ok = mount_volume_auto_add (volume);
} else if (strcmp (file_system_type_name, "cdda") == 0) {
ok = mount_volume_cdda_add (volume);
@@ -256,7 +259,7 @@
ok = mount_volume_iso9660_add (volume);
} else if (strcmp (file_system_type_name, "nfs") == 0) {
ok = mount_volume_nfs_add (volume);
-@@ -1835,8 +1924,8 @@
+@@ -2071,8 +2157,8 @@
} else if (eel_str_has_prefix (volume->device_path, "/dev/cdrom")) {
volume->device_type = NAUTILUS_DEVICE_CDROM_DRIVE;
volume->is_removable = TRUE;
diff --git a/x11-fm/nautilus2/files/patch-ltmain.sh b/x11-fm/nautilus2/files/patch-ltmain.sh
new file mode 100644
index 000000000000..854b2a10a327
--- /dev/null
+++ b/x11-fm/nautilus2/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig Sat Feb 8 09:47:44 2003
++++ ltmain.sh Mon Jun 30 18:31:09 2003
+@@ -1075,7 +1075,7 @@
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd4*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1085,8 +1085,16 @@
+ continue
+ ;;
+
++ -pthread)
++ compile_command="$compile_command -pthread"
++ finalize_command="$finalize_command -pthread"
++ compiler_flags="$compiler_flags -pthread"
++ continue
++ ;;
++
+ -module)
+ module=yes
++ build_old_libs=no
+ continue
+ ;;
+
+@@ -2503,6 +2511,9 @@
+ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test $build_libtool_need_lc = "yes"; then
+@@ -4330,10 +4341,12 @@
+ fi
+
+ # Install the pseudo-library for information purposes.
++ if /usr/bin/false; then
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
++ fi
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index ee9869cad7c9..b371b220b1ac 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -9,12 +9,14 @@ etc/X11/starthere/serverconfig.desktop
etc/X11/starthere/sysconfig.desktop
etc/X11/sysconfig/.directory
etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/nautilus/desktop/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml
etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml
@@ -116,7 +118,6 @@ share/gnome/nautilus/starthere-link.desktop
share/gnome/nautilus/starthere.desktop
share/gnome/nautilus/static_bookmarks.xml
share/gnome/network/nautilus-server-connect.desktop
-share/gnome/pixmaps/nautilus/nautilus-desktop.png
share/gnome/pixmaps/nautilus/CD_drive.png
share/gnome/pixmaps/nautilus/HD_drive.png
share/gnome/pixmaps/nautilus/Search.png
@@ -127,163 +128,39 @@ share/gnome/pixmaps/nautilus/colors.png
share/gnome/pixmaps/nautilus/cpu.png
share/gnome/pixmaps/nautilus/crux_eggplant/Search.png
share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
-share/gnome/pixmaps/nautilus/crux_eggplant/decrement-i.png
-share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png
-share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png
-share/gnome/pixmaps/nautilus/crux_eggplant/increment.png
-share/gnome/pixmaps/nautilus/crux_eggplant/number_strip.png
-share/gnome/pixmaps/nautilus/crux_eggplant/theme_preview.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/001.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/002.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/003.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/004.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/005.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/006.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/007.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/008.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/009.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/010.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/011.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/012.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/013.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/014.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/015.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/016.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/017.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/018.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/019.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/020.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/021.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/022.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/023.png
-share/gnome/pixmaps/nautilus/crux_eggplant/throbber/024.png
-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/crux_teal/Search.png
share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml
-share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png
-share/gnome/pixmaps/nautilus/crux_teal/decrement.png
-share/gnome/pixmaps/nautilus/crux_teal/increment-i.png
-share/gnome/pixmaps/nautilus/crux_teal/increment.png
-share/gnome/pixmaps/nautilus/crux_teal/number_strip.png
-share/gnome/pixmaps/nautilus/crux_teal/theme_preview.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/001.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/002.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/003.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/004.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/005.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/006.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/007.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/008.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/009.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/010.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/011.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/012.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/013.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/014.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/015.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/016.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/017.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/018.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/019.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/020.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/021.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/022.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/023.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/024.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/025.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/026.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/027.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/028.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/029.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/030.png
-share/gnome/pixmaps/nautilus/crux_teal/throbber/rest.png
-share/gnome/pixmaps/nautilus/crux_teal/zoom_body.png
-share/gnome/pixmaps/nautilus/decrement.png
share/gnome/pixmaps/nautilus/default/Search.png
-share/gnome/pixmaps/nautilus/default/decrement.png
share/gnome/pixmaps/nautilus/default/default.xml
-share/gnome/pixmaps/nautilus/default/increment.png
-share/gnome/pixmaps/nautilus/default/number_strip.png
share/gnome/pixmaps/nautilus/default/side_bar_image.png
-share/gnome/pixmaps/nautilus/default/theme_preview.png
-share/gnome/pixmaps/nautilus/default/zoom_body.png
share/gnome/pixmaps/nautilus/emblems.png
share/gnome/pixmaps/nautilus/erase.png
share/gnome/pixmaps/nautilus/gnome/Services.png
share/gnome/pixmaps/nautilus/gnome/gnome.xml
-share/gnome/pixmaps/nautilus/gnome/theme_preview.png
-share/gnome/pixmaps/nautilus/gnome/throbber/001.png
-share/gnome/pixmaps/nautilus/gnome/throbber/002.png
-share/gnome/pixmaps/nautilus/gnome/throbber/003.png
-share/gnome/pixmaps/nautilus/gnome/throbber/004.png
-share/gnome/pixmaps/nautilus/gnome/throbber/005.png
-share/gnome/pixmaps/nautilus/gnome/throbber/006.png
-share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
-share/gnome/pixmaps/nautilus/increment.png
share/gnome/pixmaps/nautilus/knob.png
share/gnome/pixmaps/nautilus/memory_chip.gif
+share/gnome/pixmaps/nautilus/nautilus-desktop.png
+share/gnome/pixmaps/nautilus/nautilus-file-management-properties.png
share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
share/gnome/pixmaps/nautilus/nautilus-server-connect.png
share/gnome/pixmaps/nautilus/note-indicator.png
-share/gnome/pixmaps/nautilus/number_strip.png
+share/gnome/pixmaps/nautilus/side_bar_image.png
share/gnome/pixmaps/nautilus/sierra/green_weave.png
-share/gnome/pixmaps/nautilus/sierra/number_strip.png
share/gnome/pixmaps/nautilus/sierra/sierra.xml
-share/gnome/pixmaps/nautilus/sierra/theme_preview.png
-share/gnome/pixmaps/nautilus/side_bar_image.png
share/gnome/pixmaps/nautilus/tahoe/bluewall.png
-share/gnome/pixmaps/nautilus/tahoe/number_strip.png
share/gnome/pixmaps/nautilus/tahoe/tahoe.xml
-share/gnome/pixmaps/nautilus/tahoe/theme_preview.png
share/gnome/pixmaps/nautilus/text-selection-frame.png
-share/gnome/pixmaps/nautilus/throbber/001.png
-share/gnome/pixmaps/nautilus/throbber/002.png
-share/gnome/pixmaps/nautilus/throbber/003.png
-share/gnome/pixmaps/nautilus/throbber/004.png
-share/gnome/pixmaps/nautilus/throbber/005.png
-share/gnome/pixmaps/nautilus/throbber/006.png
-share/gnome/pixmaps/nautilus/throbber/007.png
-share/gnome/pixmaps/nautilus/throbber/008.png
-share/gnome/pixmaps/nautilus/throbber/009.png
-share/gnome/pixmaps/nautilus/throbber/010.png
-share/gnome/pixmaps/nautilus/throbber/011.png
-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.png
-share/gnome/pixmaps/nautilus/zoom_body.png
share/locale/am/LC_MESSAGES/nautilus.mo
share/locale/ar/LC_MESSAGES/nautilus.mo
share/locale/az/LC_MESSAGES/nautilus.mo
share/locale/be/LC_MESSAGES/nautilus.mo
share/locale/bg/LC_MESSAGES/nautilus.mo
+share/locale/bn/LC_MESSAGES/nautilus.mo
share/locale/ca/LC_MESSAGES/nautilus.mo
share/locale/cs/LC_MESSAGES/nautilus.mo
+share/locale/cy/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
@@ -299,15 +176,19 @@ share/locale/gl/LC_MESSAGES/nautilus.mo
share/locale/he/LC_MESSAGES/nautilus.mo
share/locale/hi/LC_MESSAGES/nautilus.mo
share/locale/hu/LC_MESSAGES/nautilus.mo
+share/locale/id/LC_MESSAGES/nautilus.mo
+share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
share/locale/ja/LC_MESSAGES/nautilus.mo
share/locale/ko/LC_MESSAGES/nautilus.mo
+share/locale/li/LC_MESSAGES/nautilus.mo
share/locale/lt/LC_MESSAGES/nautilus.mo
share/locale/lv/LC_MESSAGES/nautilus.mo
share/locale/mk/LC_MESSAGES/nautilus.mo
share/locale/ml/LC_MESSAGES/nautilus.mo
share/locale/mn/LC_MESSAGES/nautilus.mo
share/locale/ms/LC_MESSAGES/nautilus.mo
+share/locale/ne/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
@@ -322,12 +203,11 @@ share/locale/sq/LC_MESSAGES/nautilus.mo
share/locale/sr/LC_MESSAGES/nautilus.mo
share/locale/sr@Latn/LC_MESSAGES/nautilus.mo
share/locale/sv/LC_MESSAGES/nautilus.mo
-share/locale/ta/LC_MESSAGES/nautilus.mo
share/locale/th/LC_MESSAGES/nautilus.mo
share/locale/tr/LC_MESSAGES/nautilus.mo
share/locale/uk/LC_MESSAGES/nautilus.mo
-share/locale/wa/LC_MESSAGES/nautilus.mo
share/locale/vi/LC_MESSAGES/nautilus.mo
+share/locale/wa/LC_MESSAGES/nautilus.mo
share/locale/yi/LC_MESSAGES/nautilus.mo
share/locale/zh_CN/LC_MESSAGES/nautilus.mo
share/locale/zh_TW/LC_MESSAGES/nautilus.mo
@@ -339,10 +219,12 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/desktop
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/desktop
@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus