Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

10 files changed, 34 insertions, 232 deletions

diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 277c94cbe92..ad37cecf0e7 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,22 +6,23 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.8.2
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.10
 DISTNAME=	nautilus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME file manager and graphical shell developed by Eazel
 
+LIB_DEPENDS=	exif.10:${PORTSDIR}/graphics/libexif
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomedesktop eel2 \
-		librsvg2
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop eel2 \
+		librsvg2 desktopfileutils
 GNOME_DESKTOP_VERSION=2
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=15
@@ -38,6 +39,7 @@ GCONF_SCHEMAS=	apps_nautilus_preferences.schemas
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/nautilus/extensions-1.0
+	@-update-desktop-database
 #	@${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop
 
 .include <bsd.port.mk>
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index 1645076c452..b400faa1d0d 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-2.8.2.tar.bz2) = d5fdec9acc37181016e8424e96d663b8
-SIZE (gnome2/nautilus-2.8.2.tar.bz2) = 5808170
+MD5 (gnome2/nautilus-2.10.0.tar.bz2) = b29a02be8733a82e002179e2e0f3fe83
+SIZE (gnome2/nautilus-2.10.0.tar.bz2) = 5899170
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
index 7cb9fd80944..a4f79ca6bb3 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig	Mon Aug 16 11:35:20 2004
-+++ Makefile.in	Mon Aug 16 11:35:34 2004
-@@ -179,7 +179,7 @@
- DESKTOP_SETTINGS_FILES =  	nautilus-file-management-properties.desktop
- 
- 
--SUBDIRS =  	libnautilus 			libnautilus-extension		cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				test 				components			po 				data 				icons 				docs				$(NULL)
-+SUBDIRS =  	libnautilus 			libnautilus-extension		cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				 				components			po 				data 				icons 				docs				$(NULL)
- 
- 
- EXTRA_DIST =  	COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus.desktop				nautilus.desktop.in				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				intltool-extract.in				intltool-merge.in				intltool-update.in				Makefile.shared					add-include-prefix				$(DESKTOP_IN_FILES)				$(DESKTOP_APPLICATIONS_FILES)				$(DESKTOP_SETTINGS_FILES)				$(NULL)
+--- Makefile.in.orig	Wed Nov 24 13:14:21 2004
++++ Makefile.in	Wed Nov 24 13:14:47 2004
+@@ -183,7 +183,6 @@
+ 	libbackground		\
+ 	libnautilus-private 	\
+ 	src 			\
+-	test 			\
+ 	po 			\
+ 	data 			\
+ 	icons 			\
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index d4741108d1e..73824998fce 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,14 +1,5 @@
 --- configure.orig	Mon Nov 10 22:08:05 2003
 +++ configure	Mon Nov 10 22:08:05 2003
-@@ -12971,7 +12971,7 @@
- 
- LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
- 
--LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
-+LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
- 
- 
- 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"
 @@ -12979,7 +12979,7 @@
  
  CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
diff --git a/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c b/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c
deleted file mode 100644
index 2ef7220f41e..00000000000
--- a/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- components/image_properties/nautilus-image-properties-view.c.orig	Tue Mar  9 06:23:37 2004
-+++ components/image_properties/nautilus-image-properties-view.c	Wed Oct 13 01:38:33 2004
-@@ -124,13 +124,14 @@
- exif_content_callback (ExifContent *content, gpointer data)
- {
- 	struct ExifAttribute *attribute;
-+        char value[1024];
- 
- 	attribute = (struct ExifAttribute *)data;
- 	if (attribute->found) {
- 		return;
- 	}
- 
--        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag));
-+        attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value)));
- 	if (attribute->value != NULL) {
- 		attribute->found = TRUE;
- 	}
diff --git a/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml b/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml
deleted file mode 100644
index 54ea8ae375f..00000000000
--- a/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml
+++ /dev/null
@@ -1,84 +0,0 @@
---- data/static_bookmarks.xml.orig	Wed Jun  5 22:58:43 2002
-+++ data/static_bookmarks.xml	Wed Jun  5 23:30:11 2002
-@@ -1,54 +1,44 @@
- <?xml version="1.0"?>
- <bookmarks>
-   <folder _name="Software">
--        <bookmark _name="Allaire" icon_name="i-web" uri="http://www.allaire.com/Products/index.cfm"/>
--        <bookmark _name="Borland" icon_name="i-web" uri="http://www.borland.com/kylix/"/>
--        <bookmark _name="MandrakeSoft" icon_name="i-web" uri="http://mandrakesoft.com/"/>
--        <bookmark _name="Netraverse" icon_name="i-web" uri="http://www.netraverse.com"/>
--        <bookmark _name="Red Hat" icon_name="i-web" uri="http://www.redhat.com"/>
--        <bookmark _name="SuSE" icon_name="i-web" uri="http://www.suse.com"/>
-+	<bookmark _name="4Front Technologies" icon_name="i-web" uri="http://www.4front-tech.com"/>
-+	<bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/freebsd1.html"/>
-+        <bookmark _name="FreeBSD" icon_name="i-web" uri="http://www.freebsd.org"/>
-+        <bookmark _name="GNOME" icon_name="i-web" uri="http://www.gnome.org/"/>
-         <bookmark _name="Sun StarOffice" icon_name="i-web" uri="http://www.sun.com/products/staroffice/"/>
-         <bookmark _name="Ximian" icon_name="i-web" uri="http://www.ximian.com"/>
--        <bookmark _name="Zero-Knowledge" icon_name="i-web" uri="http://www.zeroknowledge.com"/>
-   </folder>
-   <folder _name="Hardware">
--        <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com/products/software/linux/"/>
--        <bookmark _name="CNET Computers.com" icon_name="i-web" uri="http://computers.cnet.com/hardware/0-1016.html"/>
--        <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com/linux/"/>
--        <bookmark _name="Penguin Computing" icon_name="i-web" uri="http://www.penguincomputing.com"/>
--        <bookmark _name="ZDNet Linux Hardware Database" icon_name="i-web" uri="http://lhd.zdnet.com"/>
-+	<bookmark _name="Adaptec" icon_name="i-web" uri="http://www.adaptec.com"/>
-+	<bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/hardware.html"/>
-+	<bookmark _name="Cisco Systems, Inc" icon_name="i-web" uri="http://www.cisco.com"/>
-+        <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com"/>
-+        <bookmark _name="Data Net Solutions" icon_name="i-web" uri="http://www.eclipse.com"/>
-+        <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com"/>
-   </folder>
-   <folder _name="News and Media">
--         <bookmark _name="Binary Freedom" icon_name="i-web" uri="http://www.binaryfreedom.com/"/>
--         <bookmark _name="CNET Linux Center" icon_name="i-web" uri="http://linux.cnet.com/linux/0-1518529-7-3378110.html"/>
--         <bookmark _name="LinuxOrbit.com" icon_name="i-web" uri="http://www.linuxorbit.com"/>
--         <bookmark _name="Linux Weekly News" icon_name="i-web" uri="http://www.lwn.net"/>
-+	 <bookmark _name="BSD Today" icon_name="i-web" uri="http://www.bsdtoday.com"/>
-+	 <bookmark _name="Daily Daemon News" icon_name="i-web" uri="http://daily.daemonnews.org"/>
-+	 <bookmark _name="Daemon News" icon_name="i-web" uri="http://www.daemonnews.org"/>
-          <bookmark _name="O'Reilly" icon_name="i-web" uri="http://www.oreillynet.com"/>
--         <bookmark _name="OSDN" icon_name="i-web" uri="http://www.osdn.com"/>
--         <bookmark _name="ZDNet Linux Resource Center" icon_name="i-web" uri="http://linux.zdnet.com"/>
-   </folder>
-   <folder _name="Web Services">
--         <bookmark _name="CollabNet" icon_name="i-web" uri="http://www.collab.net/community/"/>
--         <bookmark _name="Covalent" icon_name="i-web" uri="http://www.covalent.com"/>
--         <bookmark _name="Rackspace" icon_name="i-web" uri="http://www.rackspace.com"/>
--         <bookmark _name="Red Hat Network" icon_name="i-web" uri="http://www.redhat.com/network/"/>
-+	 <bookmark _name="FreeBSD Services, Ltd." icon_name="i-web" uri="http://www.freebsd-services.com"/>
-+	 <bookmark _name="JohnsCompanies Collocation Services" icon_name="i-web" uri="http://www.johncompanies.com/collocation"/>
-          <bookmark _name="SourceForge" icon_name="i-web" uri="http://www.sourceforge.net"/>
-   </folder>
--  <folder _name="International">
--         <bookmark _name="Conectiva" icon_name="i-web" uri="http://en.conectiva.com/"/>
--         <bookmark _name="Linux One" icon_name="i-web" uri="http://www.linuxone.co.kr/english2/eng/main.htm"/>
--         <bookmark _name="Open Source Asia" icon_name="i-web" uri="http://www.opensourceasia.com"/>
--         <bookmark _name="RedFlag Linux" icon_name="i-web" uri="http://www.redflag-linux.com/english/index.html"/>
--         <bookmark _name="Sun Wah Linux" icon_name="i-web" uri="http://www.sw-linux.com/nonflash_front.htm"/>
--  </folder>
--  <folder _name="Linux Resources">
--         <bookmark _name="Debian.org" icon_name="i-web" uri="http://www.debian.org"/>
--         <bookmark _name="Freshmeat.net" icon_name="i-web" uri="http://www.freshmeat.net"/>
--         <bookmark _name="GNOME.org" icon_name="i-web" uri="http://www.gnome.org"/>
--         <bookmark _name="GNU.org" icon_name="i-web" uri="http://www.gnu.org"/>
--         <bookmark _name="Linux Online" icon_name="i-web" uri="http://www.linux.org"/>
--         <bookmark _name="Linux Documentation Project" icon_name="i-web" uri="http://www.linuxdoc.org"/>
--         <bookmark _name="LinuxNewbie.org" icon_name="i-web" uri="http://www.linuxnewbie.org"/>
-+  <folder _name="FreeBSD Resources">
-+         <bookmark _name="BSD Apps" icon_name="i-web" uri="http://www.bsdapps.com"/>
-+         <bookmark _name="BSD At Work" icon_name="i-web" uri="http://www.bsdatwork.com"/>
-+	 <bookmark _name="BSD Central" icon_name="i-web" uri="http://bsdcentral.com"/>
-+         <bookmark _name="BSD Dev Center" icon_name="i-web" uri="http://www.onlamp.com/bsd/"/>
-+	 <bookmark _name="FreeBSD Diary" icon_name="i-web" uri="http://www.freebsddiary.org"/>
-+	 <bookmark _name="FreeBSD Forums" icon_name="i-web" uri="http://www.freebsdforums.org"/>
-+	 <bookmark _name="FreeBSD GNOME Project" icon_name="i-web" uri="http://www.freebsd.org/gnome"/>
-+	 <bookmark _name="FreeBSD Handbook" icon_name="i-web" uri="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/index.html"/>
-+	 <bookmark _name="FreeBSD Security Information" icon_name="i-web" uri="http://www.freebsd.org/security/security.html"/>
-+         <bookmark _name="Freshports" icon_name="i-web" uri="http://www.freshports.org"/>
-+	 <bookmark _name="Google's BSD Search Engine" icon_name="i-web" uri="http://www.google.com/bsd"/>
-          <bookmark _name="OpenOffice" icon_name="i-web" uri="http://www.openoffice.org"/>
-   </folder>
- </bookmarks>
diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
deleted file mode 100644
index 411fe669370..00000000000
--- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbackground/Makefile.in.orig	Mon Aug 16 11:36:57 2004
-+++ libbackground/Makefile.in	Mon Aug 16 11:37:35 2004
-@@ -171,7 +171,7 @@
- 
- EXTRA_DIST = ChangeLog
- 
--INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
-+INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
- 
- 
- noinst_LTLIBRARIES = libbackground.la
diff --git a/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c b/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c
deleted file mode 100644
index 68e98b1542e..00000000000
--- a/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- libnautilus-private/nautilus-medusa-support.c.orig	Wed Apr 11 21:36:16 2001
-+++ libnautilus-private/nautilus-medusa-support.c	Mon May 14 17:45:24 2001
-@@ -84,7 +84,7 @@
- 		 */
- 		status = NAUTILUS_CRON_STATUS_OFF;
- 
--		stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number);
-+		stat_file_name = g_strdup_printf ("/proc/%d/status", process_number);
- 		stat_file = fopen (stat_file_name, "r");
- 		g_free (stat_file_name);
- 		
diff --git a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c
deleted file mode 100644
index 5246e273c53..00000000000
--- a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/file-manager/fm-directory-view.c.orig	Tue Feb 24 08:17:24 2004
-+++ src/file-manager/fm-directory-view.c	Wed Feb 25 02:43:55 2004
-@@ -4476,19 +4476,25 @@
- 
- 	nautilus_bonobo_set_hidden (view->details->ui, 
- 				    FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, 
--				    !any_scripts);
-+				    FALSE);
- 	nautilus_bonobo_set_hidden (view->details->ui, 
- 				    FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS, 
-+				    FALSE);
-+	nautilus_bonobo_set_hidden (view->details->ui,
-+				    FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER,
-+				    !any_scripts);
-+	nautilus_bonobo_set_hidden (view->details->ui,
-+				    FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER,
- 				    !any_scripts);
- 	nautilus_bonobo_set_hidden (view->details->ui, 
- 				    FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS, 
--				    !any_scripts);
-+				    FALSE);
- 	nautilus_bonobo_set_hidden (view->details->ui, 
- 				    FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_SEPARATOR, 
- 				    !any_scripts);
- 	nautilus_bonobo_set_hidden (view->details->ui, 
- 				    FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_SEPARATOR, 
--				    !any_scripts);
-+				    FALSE);
- 	nautilus_bonobo_set_hidden (view->details->ui, 
- 				    FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR, 
- 				    !any_scripts);
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 9e283f87c5b..926374cdc6e 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -1,16 +1,6 @@
 bin/nautilus
+bin/nautilus-connect-server
 bin/nautilus-file-management-properties
-include/libnautilus/libnautilus.h
-include/libnautilus/nautilus-bonobo-ui.h
-include/libnautilus/nautilus-clipboard.h
-include/libnautilus/nautilus-distributed-undo.h
-include/libnautilus/nautilus-idle-queue.h
-include/libnautilus/nautilus-scroll-positionable.h
-include/libnautilus/nautilus-undo-private.h
-include/libnautilus/nautilus-undo.h
-include/libnautilus/nautilus-view-component.h
-include/libnautilus/nautilus-view-standard-main.h
-include/libnautilus/nautilus-view.h
 include/nautilus/libnautilus-extension/nautilus-column-provider.h
 include/nautilus/libnautilus-extension/nautilus-column.h
 include/nautilus/libnautilus-extension/nautilus-extension-types.h
@@ -20,52 +10,21 @@ include/nautilus/libnautilus-extension/nautilus-menu-item.h
 include/nautilus/libnautilus-extension/nautilus-menu-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page-provider.h
 include/nautilus/libnautilus-extension/nautilus-property-page.h
-lib/bonobo/libnautilus-emblem-view.so
-lib/bonobo/libnautilus-history-view.so
-lib/bonobo/libnautilus-image-properties-view.so
-lib/bonobo/libnautilus-notes-view.so
-lib/libnautilus-adapter.a
-lib/libnautilus-adapter.so
-lib/libnautilus-adapter.so.2
 lib/libnautilus-extension.a
 lib/libnautilus-extension.so
 lib/libnautilus-extension.so.1
 lib/libnautilus-private.a
 lib/libnautilus-private.so
 lib/libnautilus-private.so.2
-lib/libnautilus.a
-lib/libnautilus.so
-lib/libnautilus.so.2
-libdata/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
-libdata/bonobo/servers/Nautilus_Control_throbber.server
-libdata/bonobo/servers/Nautilus_View_emblem.server
-libdata/bonobo/servers/Nautilus_View_history.server
-libdata/bonobo/servers/Nautilus_View_image_properties.server
-libdata/bonobo/servers/Nautilus_View_notes.server
-libdata/bonobo/servers/Nautilus_View_text.server
 libdata/bonobo/servers/Nautilus_shell.server
 libdata/pkgconfig/libnautilus-extension.pc
-libdata/pkgconfig/libnautilus.pc
-libexec/nautilus-adapter
-libexec/nautilus-text-view
-libexec/nautilus-throbber
 share/gnome/applications/nautilus-computer.desktop
+share/gnome/applications/nautilus-file-management-properties.desktop
+share/gnome/applications/nautilus-folder-handler.desktop
 share/gnome/applications/nautilus-home.desktop
 share/gnome/applications/nautilus.desktop
 share/gnome/applications/network-scheme.desktop
-share/gnome/control-center-2.0/capplets/nautilus-file-management-properties.desktop
-share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-list-view-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-navigation-window-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-spatial-window-ui.xml
-share/gnome/gnome-2.0/ui/nautilus-text-view-ui.xml
-share/gnome/idl/nautilus-distributed-undo.idl
-share/gnome/idl/nautilus-view-component.idl
+@exec update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/nautilus/browser.xml
 share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
 share/gnome/nautilus/glade/nautilus-file-management-properties.glade
@@ -103,7 +62,13 @@ 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/static_bookmarks.xml
+share/gnome/nautilus/ui/nautilus-desktop-icon-view-ui.xml
+share/gnome/nautilus/ui/nautilus-directory-view-ui.xml
+share/gnome/nautilus/ui/nautilus-icon-view-ui.xml
+share/gnome/nautilus/ui/nautilus-list-view-ui.xml
+share/gnome/nautilus/ui/nautilus-navigation-window-ui.xml
+share/gnome/nautilus/ui/nautilus-shell-ui.xml
+share/gnome/nautilus/ui/nautilus-spatial-window-ui.xml
 share/gnome/pixmaps/nautilus/Search.png
 share/gnome/pixmaps/nautilus/audio.png
 share/gnome/pixmaps/nautilus/backgrounds.png
@@ -181,6 +146,7 @@ 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
+share/locale/nso/LC_MESSAGES/nautilus.mo
 share/locale/pa/LC_MESSAGES/nautilus.mo
 share/locale/pl/LC_MESSAGES/nautilus.mo
 share/locale/pt/LC_MESSAGES/nautilus.mo
@@ -204,6 +170,7 @@ 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
+share/locale/zu/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/pixmaps/nautilus/tahoe
 @dirrm share/gnome/pixmaps/nautilus/sierra
 @dirrm share/gnome/pixmaps/nautilus/gnome
@@ -211,12 +178,13 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo
 @dirrm share/gnome/pixmaps/nautilus/crux_teal
 @dirrm share/gnome/pixmaps/nautilus/crux_eggplant
 @dirrm share/gnome/pixmaps/nautilus
+@dirrm share/gnome/nautilus/ui
 @dirrm share/gnome/nautilus/patterns
 @dirrm share/gnome/nautilus/glade
 @dirrm share/gnome/nautilus
 @dirrm include/nautilus/libnautilus-extension
 @dirrm include/nautilus
-@dirrm include/libnautilus
 @exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0
 @unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/lib/nautilus 2>/dev/null || /usr/bin/true
+@unexec update-desktop-database > /dev/null || /usr/bin/true