--- nautilus-2.27.4.orig/debian/rules +++ nautilus-2.27.4/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus \ + --disable-update-mimedb \ + --disable-packagekit +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed +DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 1:2.26.2)' + +binary-post-install/nautilus-data:: + dh_installmime -p$(cdbs_curpkg) --- nautilus-2.27.4.orig/debian/changelog +++ nautilus-2.27.4/debian/changelog @@ -0,0 +1,1668 @@ +nautilus (1:2.27.4-0ubuntu2) karmic; urgency=low + + * Drop gnome-mount Recommends, it's not used any more. + + -- Martin Pitt Tue, 21 Jul 2009 01:17:45 +0200 + +nautilus (1:2.27.4-0ubuntu1) karmic; urgency=low + + * New upstream release: (LP: #399131) + - Add support for starting and stopping drives + - Use the new GVfs metadata framework + - Support new style unmount operations; this will provide a nice dialog when + unmounting a busy drive mount + - Add application icons to the Open With context menu (LP: #13253) + - Reload xdg-user-dirs according to the user preferences + * debian/control.in: + - Bump glib depends to 2.21.3 + - Remove debian VCS links so debcheckout works + * debian/patches/01_lpi.patch: + * debian/patches/02_autoconf.patch: + * debian/patches/11_restart_mode.patch: + * debian/patches/12_list-view_expand.patch: + * debian/patches/80_suppress_umount_in_ltsp.patch: + * debian/patches/82_gnome-app-install.patch: + * debian/patches/90_relibtoolize.patch: + * debian/patches/95_no-initial-fade.patch: + - Refreshed + + -- Robert Ancell Tue, 14 Jul 2009 08:49:29 +0200 + +nautilus (1:2.27.2-0ubuntu2) karmic; urgency=low + + * debian/control.in: Prefer brasero over nautilus-cd-burner. This avoids + pulling in both, since they conflict to each other. + + -- Martin Pitt Tue, 14 Jul 2009 08:26:30 +0200 + +nautilus (1:2.27.2-0ubuntu1) karmic; urgency=low + + * New upstream release: (LP: #387266) + - Support ctrl-drop in list view (LP: #261108) + - Allow user defined keyboard shortcuts for extension items + - Fix crash on click on toolbar (LP: #375927) + - Fix crash on entering empty location (LP: #378254) + - Added daemon-mode (don't exit with last window) + - Display info about the selected item in the information sidebar + (LP: #23734) + - Sort applications in open with (LP: #360553) + - Fix text going dark if setting dark background (LP: #356289) + - Update nautilus website url in about dialog (LP: #374555) + + -- Didier Roche Mon, 15 Jun 2009 13:33:53 +0200 + +nautilus (1:2.27.1-0ubuntu1) karmic; urgency=low + + * New upstream version + * debian/patches/03_menu_entry.patch, + debian/patches/11_restart_mode.patch: + - new version update + * debian/nautilus-data.gconf-defaults, + debian/patches/17_no_autorun_launcher.patch: + - those workaround are not required the bug is fixed in the new version + * debian/patches/18_svn_r15184_fix_icon_view_zoom.patch: + - the change is in the new version + * debian/watch: + - watch unstable serie + + -- Sebastien Bacher Mon, 11 May 2009 13:52:57 +0200 + +nautilus (1:2.26.2-3ubuntu1) karmic; urgency=low + + * Sync on Debian + * debian/control.in: + - Build-Depends on liblaunchpad-integration-dev + - don't build using beagle and tracker + - don't recommends desktop-base + - nautilus Recommends gnome-app-install rather than synaptic + - set vcs url + * debian/mount-archive.desktop, + debian/mount-archive.desktop.in, + debian/nautilus.install: + - new nautilus context menu item to allow mounting zip, iso, etc + * debian/nautilus-data.gconf-schemas: + - change the default desktop configuration. + * debian/patches/01_lpi.patch: + - launchpad changes. + * debian/patches/02_autoconf.patch: + - configure update. + * debian/patches/03_menu_entry.patch: + - change the menu item category. + * debian/patches/10_rename_desktop.patch: + - the change is not required since jaunty + * debian/patches/15_translations_list_update.patch: + - list the new desktop as translatable + * debian/patches/16_workaround_autorestart_issue.patch: + - don't use this workaround but rather the debian one + * debian/nautilus-data.gconf-defaults, + debian/patches/17_no_autorun_launcher.patch: + - set the key to not do software autoruns and the entry to hidden so the + cluebar is not displayed in nautilus either since autorun don't work under + linux is the majority of the cases and displaying the dialog confuse users + * debian/patches/18_svn_r15184_fix_icon_view_zoom.patch: + - Patch from SVN to take zoom in to account when updating + the scroll width + * debian/patches/20_open-with_install.patch: + - don't use that debian change but rather gnome-app-install + * debian/patches/80_suppress_umount_in_ltsp.patch: + - don't list unmount and eject actions on ltsp clients + * debian/patches/82_gnome-app-install.patch: + - Invoke gnome-app-install when no application known for file. + * debian/patches/95_no-initial-fade.patch: Patch to disable the initial + fade-in of the background without disabling crossfades when the + background is changed. + * debian/rules: + - don't use debian translation hack + + -- Sebastien Bacher Mon, 04 May 2009 12:17:03 +0200 + +nautilus (2.26.2-3) unstable; urgency=low + + * 11_restart_mode.patch: new patch. Do not get the session manager to + automatically restart nautilus when using --no-desktop. Thanks to + Roland Mas for testing. + + -- Josselin Mouette Wed, 29 Apr 2009 17:55:35 +0200 + +nautilus (2.26.2-2) unstable; urgency=low + + * 20_open-with_install.patch: fix a crash when switching tabs in the + dialog. + + -- Josselin Mouette Sat, 25 Apr 2009 23:44:05 +0200 + +nautilus (2.26.2-1) unstable; urgency=low + + * Break eiciel, diff-ext, nautilus-gksu, nautilus-actions, + nautilus-share and seahorse-plugins until versions rebuilt with the + new extension path. + * Only suggest xdg-user-dirs, nautilus works perfectly fine without + it. + * New upstream release. + + Correctly cleans up session files. Closes: #469267. + + Checks whether the session is active with ConsoleKit before + mounting a removable media. Closes: #512824. + + Follows OnlyShowIn/NotShowIn for .desktop files on the desktop. + Closes: #422570. + + Only accepts .desktop with executable permissions. + Closes: #515078, #515104. + * 07_desktop_file_activation.patch: removed from the sources. + * 02_eel_libadd.patch: stolen from the eel2 sources. Fix linking of + the eel convenience library. + * 14_sidebar_network-protocol.patch: removed, useless since 2.24. + Closes: #518773. + * 20_open-with_install.patch: updated for the new version. + * 90_relibtoolize.patch: new patch, relibtoolize over that. + * Refresh other patches. + * Bump shlibs version to 2.26.2. + * Add brasero 2.26 as an alternative to n-c-b. + * Recommend consolekit. + * Pass --disable-packagekit. + * Fix section of debug package. + * Update build-dependencies and dependencies according to the upstream + changes. + * Build-depend on libglib2.0-doc and libgtk2.0-doc to ensure proper + xrefs. + * nautilus-data.install: there are no more bonobo files to ship. + * 10_load_session.patch: new patch. Support --load-session so that + sessions saved with older nautilus versions will load correctly. + + -- Josselin Mouette Sat, 25 Apr 2009 01:33:51 +0200 + +nautilus (2.24.2-3) unstable; urgency=low + + * Require shared-mime-info 0.50 to have support for the x-content + types. Closes: #511370. + * Recommend gnome-mount. + * Break rhythmbox < 0.12. + * Standards version is 3.8.1. + * Upload to unstable. + + -- Josselin Mouette Tue, 07 Apr 2009 14:06:47 +0200 + +nautilus (2.24.2-2) experimental; urgency=low + + * Add a Breaks with g-v-m << 2.24 to avoid double actions on device + insertion. Closes: #507630, #510692. + * 20_open-with_install.patch: add missing argument to + gtk_tree_model_get. Closes: #510694. + + -- Josselin Mouette Tue, 06 Jan 2009 17:07:39 +0100 + +nautilus (2.24.2-1) experimental; urgency=low + + * nautilus-data.gconf-defaults: enable autorun actions for all media + CD/DVD/etc. by default instead of asking. + + Also do it for blank media. + * libnautilus-extension1 breaks nautilus << 2.22. + * Build-depend on libgnome-desktop-dev 2.24 to be sure to link with + libgnome-desktop-2-7. Otherwise, since symbols are not versioned, + libeel2-2.24 will load it anyway and ka-boom. Closes: #507632. + * New upstream release. + + -- Josselin Mouette Wed, 26 Nov 2008 01:28:28 +0100 + +nautilus (2.24.1-1) experimental; urgency=low + + [ Gustavo Noronha Silva ] + * New upstream release + * debian/patches/20_open-with_install.patch: + - updated to the new version + + [ Josselin Mouette ] + * Update (build-)dependencies according to the new version. + * Add Breaks in libnautilus-extension1 against all packages that use + the old API. + * 12_list-view_expand.patch, 14_sidebar_network-protocol.patch: + refreshed. + * Update shlibs version to 2.23.1. + * Only require gvfs (>= 1.0.2), only recommend gvfs-backends. + * Stop recommending fam, gio does not support it correctly. + * Remove useless dh_strip argument overloading. + * 01_manpage.patch: fix whatis entry in nautilus-connect-server.1. + * Install upstream manpages in nautilus. + * Install the documentation for libnautilus-extension. + + -- Josselin Mouette Sun, 23 Nov 2008 23:39:28 +0100 + +nautilus (2.22.5.1-1) experimental; urgency=low + + [ Josselin Mouette ] + * 20_open-with_install.patch: handle the case where content_type = + NULL. See bugzilla #541183. + + [ Sebastian Dröge ] + * New upstream bugfix release. + + -- Sebastian Dröge Sat, 12 Jul 2008 19:17:54 +0200 + +nautilus (2.22.4-1) experimental; urgency=low + + * New upstream bugfix release. + + -- Sebastian Dröge Mon, 30 Jun 2008 16:28:24 +0200 + +nautilus (2.22.3-1) experimental; urgency=low + + [ Josselin Mouette ] + * 20_open-with_install.patch: ported from the patch formerly in eel2. + * Also recommend synaptic and app-install-data. + * Include patch-translations.mk, require gnome-pkg-tools 0.13. + * debian/po-up: taken from eel2. + * 99_ltmain_as-needed.patch: make the patch apply with -p1. + Closes: #484953. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/control.in: + - Drop esound from build dependencies. + + debian/patches/05_places-sidebar_single-click.patch: + - Dropped, merged upstream. + * debian/control.in: + + Update Standards-Version to 3.8.0, no additional changes needed. + + -- Sebastian Dröge Wed, 25 Jun 2008 08:42:25 +0200 + +nautilus (2.22.2-1) experimental; urgency=high + + * New upstream bugfix release: + + debian/patches/05_places-sidebar_single-click.patch: + - Updated to apply cleanly again. + + -- Sebastian Dröge Tue, 08 Apr 2008 18:48:04 +0200 + +nautilus (2.22.1-1) experimental; urgency=low + + * 05_places-sidebar_single-click.patch: Update from bugzilla and enable + again as it should work good now and is more consistent with the + GTK file chooser. + * New upstream bugfix release: + + debian/patches/03_sftp_connect.patch, + debian/patches/04_show_backup_files.patch, + debian/patches/15_tracker_check.patch, + debian/patches/90_from_svn_mount_connect_to_server_locations.patch, + debian/patches/90_from_svn_fix_changing_default_application.patch: + - Dropped, emrged upstream. + + -- Sebastian Dröge Fri, 28 Mar 2008 22:12:12 +0100 + +nautilus (2.22.0-3) experimental; urgency=low + + * Disable 05_places-sidebar_single-click.patch as it's buggy. + * Remove 18_disable_signal_handler.patch, it's better fixed upstream. + * Remove 06_dont_create_Desktop.patch, --no-desktop is meant as a switch + to not show icons on the desktop and not creating the desktop directory + creates all kinds of broken links in nautilus. + * Remove 08_folder_handler.patch, this is upstream already. + * Disable 10_location_titlebar.patch, this gives completely unwanted results + for thrash:// for example or when the filesystem uses something else + than UTF8 as encoding (%XX stuff in the title). + See http://bugzilla.gnome.org/show_bug.cgi?id=142087 + * 90_from_svn_mount_connect_to_server_locations.patch, Added. Mounts location + in the connect to server dialog. Patch taken from the Ubuntu package. + + -- Sebastian Dröge Wed, 19 Mar 2008 16:22:08 +0100 + +nautilus (2.22.0-2) experimental; urgency=low + + * Disable 07_desktop_file_activation.patch for now, it breaks in an + unintended way. + + -- Sebastian Dröge Wed, 19 Mar 2008 11:10:42 +0100 + +nautilus (2.22.0-1) experimental; urgency=low + + [ Sebastian Dröge ] + * New upstream stable release: + + Upload to experimental first because of intrusive changes. + + debian/control.in: + - Update build dependencies and dependencies. + + debian/rules: + - Bump shlibs. + + debian/patches/01_prompt_same_file.patch, + debian/patches/16_missing_thumbnails.patch, + debian/patches/20_upstream_nautilus-dnd-user-owned.patch, + debian/patches/21_nautilus_xmp.patch, + debian/patches/23_thumbnails_add-border.patch, + debian/patches/11_gnomevfs_query_eject.patch: + - Dropped, merged upstream. + + debian/patches/06_dont_create_Desktop.patch: + - Updated to apply cleanly again. + + debian/patches/07_desktop_file_activation.patch: + - Updated to apply cleanly again. + + debian/patches/10_location_titlebar.patch: + - Updated to apply cleanly again. + + debian/patches/14_sidebar_network-protocol.patch: + - Updated to apply cleanly again. + + debian/patches/99_ltmain_as-needed.patch: + - Updated to apply cleanly again. + + debian/patches/90_from_svn_fix_changing_default_application.patch: + - Make changing the default application work again, patch taken from + the Ubuntu package. + + debian/patches/18_disable_signal_handler.patch: + - Don't use the logging code signal handler it's buggy and makes + nautilus being stuck and eat cpu on crash. Patch taken from the + Ubuntu package. + + -- Sebastian Dröge Sun, 16 Mar 2008 20:30:48 +0100 + +nautilus (2.20.0-7) unstable; urgency=low + + * 25_disable_sighandler.patch: patch from upstream SVN. Disable the + horrible signal handler that makes nautilus go wild while filling + its debug log. Closes: #454764, #494788. + * Don’t require libselinux on non-linux OSes. Closes: #494645. + + -- Josselin Mouette Tue, 16 Sep 2008 08:15:05 +0200 + +nautilus (2.20.0-6) unstable; urgency=low + + * 24_smb_crash.patch: patch from upstream to handle NULL MIME types + set by the SMB module gracefully, avoiding a lot of crashes. + + -- Josselin Mouette Mon, 21 Jul 2008 17:09:01 +0200 + +nautilus (2.20.0-5) unstable; urgency=low + + * 05_places-sidebar_single-click.patch: replaced by upstream version + of the patch, that does not activate items while right-clicking + them. Closes: #414960. + * 06_dont_create_Desktop.patch, + 20_upstream_nautilus-dnd-user-owned.patch: make patches apply with + -p1. Closes: #484953. + * Recommend app-install-data and synaptic now that libeel doesn’t + anymore. + + -- Josselin Mouette Fri, 18 Jul 2008 13:27:27 +0200 + +nautilus (2.20.0-4) unstable; urgency=low + + [ Loic Minier ] + * Add a nautilus-extensions-1.0 Provide to nautilus to express the fact that + nautilus will search for extensions in /usr/lib/nautilus/extensions-1.0; + this might avoid a long list of Conflicts in nautilus when updating to + extensions-2.0 (nautilus >= 2.21.2). + + [ Josselin Mouette ] + * Demote fam to a Suggests; only g-d-e really needs to recommend it. + * 02_trash_location.patch: new patch. When unmounting a volume with a + non-empty trash, take into account that with the new location, the + directory to remove is the parent of the one returned by gnome-vfs. + + -- Josselin Mouette Wed, 28 May 2008 01:47:28 +0200 + +nautilus (2.20.0-3) unstable; urgency=low + + [ Diego Escalante Urrelo ] + * New patch, 23_thumbnails_add-border.patch, restore the + thumbnail borders; (GNOME #478363). Closes: #456957. + + [ Josselin Mouette ] + * Add missing references to all patches. + + [ Sebastien Bacher ] + * New nautilus-connect-server manpage from Fernando Ribeiro (Ubuntu: #61299) + + [ Josselin Mouette ] + * 16_missing_thumbnails.patch: stolen from upstream's SVN. Fixes + disappearing thumnails. Closes: #453525. + + [ Julian Andres Klode ] + * debian/nautilus-connect-server.1: fix the manpage + * debian/nautilus-file-management-properties.1: add new manpage + * Upgrade to Policy 3.7.3 + * Add VCS-Browser and VCS-Svn fields to debian/control + * Use the new Homepage field + + -- Josselin Mouette Sat, 12 Jan 2008 16:16:26 +0100 + +nautilus (2.20.0-2) unstable; urgency=high + + [ Loic Minier ] + * Build-dep against libglib2.0-dev >= 2.14; fixes crashes when mixing the + internal copy of GSequence with the glib one; thanks Andre Klapper. + + [ Sebastian Dröge ] + * debian/patches/21_nautilus_xmp.patch, + debian/control.in: + + Build against exempi 1.99.5. Patch by Michael Biebl. (Closes: #450486) + + -- Sebastian Dröge Thu, 22 Nov 2007 11:00:12 +0100 + +nautilus (2.20.0-1) unstable; urgency=low + + * 15_tracker_check.patch: new patch, properly checks that tracker is + installed before using it. Closes: #439863. + * Suggest tracker. + * New upstream release. + * Update build dependencies. + * Pass --disable-update-mimedb to configure flags. + * Don't ship the XML file in nautilus, ugh. + * Call dh_installmime by hand for nautilus-data. + * Refresh patches. + * 05_places-sidebar_single-click.patch: updated to new version. + * 12_list-view_expand.patch: updated for 2.20; revert upstream commit + r13045. + * 13_thumbnail_size_pref.patch: removed, integrated upstream. + * 60_combobox-changed-signal.patch: removed, integrated upstream. + * Update menu file. + + -- Josselin Mouette Mon, 24 Sep 2007 12:34:46 +0200 + +nautilus (2.18.3-3) unstable; urgency=low + + * New patch, 60_combobox-changed-signal, fix a crash with newer Gtk emitting + a changed signal; GNOME #459221; SVN r13002. + + -- Loic Minier Tue, 24 Jul 2007 15:57:04 +0200 + +nautilus (2.18.3-2) unstable; urgency=low + + * 14_sidebar_network-protocol.patch: fix systematic segfault. + Closes: #434123. + * Enable tracker support by build-depending on libtrackerclient-dev. + + -- Josselin Mouette Sun, 22 Jul 2007 15:17:31 +0200 + +nautilus (2.18.3-1) unstable; urgency=low + + [ Josselin Mouette ] + * 12_list-view_expand.patch: update the minimum width to 20 + characters. + * Update watch file. + * 13_thumbnail_size_pref.patch: stolen from upstream SVN. Introduces a + preference to define the thumbnail size (closes: #425400). + * 99_ltmain_as-needed.patch: make --as-needed work for the library + too. + + [ Otavio Salvador ] + * 14_sidebar_network-protocol.patch: Adds the "Network Servers" option + on sidebar. Thanks to Luis Gustavo S. Barreto + for the patch. + + [ Guilherme de S. Pastore ] + * 15_japanese_typo.patch: fixes a typo in the Japanese translation. Thanks + to Kobayashi Noritada for reporting it. (Closes: #430679) + + [ Josselin Mouette ] + * New upstream release. + * Refresh patches. + * 15_japanese_typo.patch: removed, integrated upstream. + + -- Josselin Mouette Wed, 18 Jul 2007 23:43:01 +0200 + +nautilus (2.18.1-3) unstable; urgency=low + + [ Loic Minier ] + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Prepend -z defs to LDFLAGS for additional safety. + * Wrap build-deps and deps. + + [ Josselin Mouette ] + * 12_list-view_expand.patch: set a minimum width for the name column + to avoid opening a window with a too small name column. Partially + fixes #422563. + + -- Josselin Mouette Wed, 16 May 2007 00:21:01 +0200 + +nautilus (2.18.1-2) unstable; urgency=low + + * 10_location_titlebar.patch: include gnome-vfs-utils.h + (closes: #421027). + * Refresh other patches. + * 12_list-view_expand.patch: make the filename column expandable + instead of setting the width by default. Reverts upstream commit + 12779. + + -- Josselin Mouette Tue, 01 May 2007 16:16:22 +0200 + +nautilus (2.18.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * 10_location_titlebar.patch: patch from Adrien Delle Cave to display + the full location in the title bar when a setting is enabled + (closes: #413018). + * 01_prompt_same_file.patch: don't overwrite files when the source and + destination are strictly the same (closes: #419525). + + [ Sebastian Dröge ] + * Upload to unstable, drop check-dist include. + * New upstream release: + + Update build dependency on libgnome2-dev to >= 2.14.0 and add + x11proto-core-dev for the multimedia keys support. + + Bump shlibs to 2.17.90. + + Fix URL in the watch file. + + Dropped 02_umask.patch, + 09_connect_server_iter.patch, merged upstream. + + Dropped 11_umount-progress-bar.patch, this is obsolete now that + gnome-volume-manager and gnome-vfs use gnome-mount, which displays + a notification bubble. See Gnome #313639. + + Add icons to nautilus-data.install. + * 11_gnomevfs_query_eject.patch: Patch taken from Ubuntu. Use gnomevfs' + gnome_vfs_drive_needs_eject() function instead of just looking at the + drive type. This keeps umount/eject consistent and keeps it configurable + with the HAL policies. + * 20_upstream_nautilus-dnd-user-owned.patch: Patch taken from Ubuntu. + Use copy instead of move when using DND and the destination is owned by + someone else. See Gnome #339154. + * 10_location_titlebar.patch: Updated with the latest patch from + Gnome #142087. + + -- Sebastian Dröge Tue, 24 Apr 2007 22:38:54 +0200 + +nautilus (2.16.3-5) experimental; urgency=low + + * Bump up librsvg2-dev build-dep to >= 2.16.0-2 to make the package + autobuildable; add a librsvg2-common >= 2.16.0-2 build-dep since + desktop-base needs it, and librsvg2-dev doesn't pull it. + + -- Loic Minier Tue, 13 Mar 2007 13:27:43 +0100 + +nautilus (2.16.3-4) experimental; urgency=low + + * 08_folder_handler.patch: add OnlyShowIn=GNOME to + nautilus-folder-handler.desktop (closes: #396969). + * 07_desktop_file_activation.patch: + + Compare numeric uids instead of using strcmp. + + Fix the context menu of "link" desktop items. + * 09_connect_server_iter.patch: patch from Christian Neumair to + display only supported protocols in the "connect to" window + (closes: #375180). + + -- Josselin Mouette Sun, 25 Feb 2007 00:50:36 +0100 + +nautilus (2.16.3-3) experimental; urgency=low + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + * Add an epoch to the libgnomevfs2-dev build-dep and dep. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + + [ Josselin Mouette ] + * 06_dont_create_Desktop.patch: patch from upstream bugzilla. Don't + create the Desktop directory when run with the --no-desktop option + (closes: #230757, #408896). + * 07_desktop_file_activation.patch: + + Don't launch desktop files that aren't at safe places + (closes: #408556). This doesn't affect desktop files that are + merely links. + + Don't launch those that don't end with .desktop (closes: #408948). + + -- Josselin Mouette Thu, 15 Feb 2007 17:23:51 +0100 + +nautilus (2.16.3-2) experimental; urgency=low + + * 03_sftp_connect.patch: patch from Mike Hommey to add a "connect to + server" context menu item for sftp shares (closes: #375181). + * 04_show_backup_files.patch: patch from Stephen Cook to display + backup files together with hidden files (closes: #401583). + * Refresh 11_umount-progress-bar.patch. + * 05_places-sidebar_single-click.patch: patch from UHU Linux to use + single click in the "places" sidebar pane. + + -- Josselin Mouette Wed, 3 Jan 2007 00:31:00 +0100 + +nautilus (2.16.3-1) experimental; urgency=low + + [ Loic Minier ] + * Ship /usr/share/mime/application in nautilus. + * Merge 2.14.3-2, 2.14.3-3, and 2.14.3-4; credit + 10_nautilus-directory-cache-is-local in 2.14.3-4 appropriately. + * Fix watch file to use HTTP. + + [ Josselin Mouette ] + * Merge 2.14.3-6. + * Switch to quilt for patch handling. + * 02_umask.patch: use the recommended method upstream, which should be + thread-safe. + * 10_nautilus-directory-cache-is-local.patch: removed, integrated + upstream. + * 11_umount-progress-bar.patch: refresh translations. + + -- Josselin Mouette Fri, 8 Dec 2006 22:29:03 +0100 + +nautilus (2.16.1-1) experimental; urgency=low + + [ Josselin Mouette ] + * Brown paper bag update. + * 02_umask.patch: use and operator on not(umask), not the xor. + + [ Loic Minier ] + * Bump the Depends on libgnomevfs2-dev >= 2.16.0-1 as well. + * Reorder build-deps to please pbuilder. + * Add missing build-deps on libgnomeui-dev (>= 2.6.0), libglib2.0-dev (>= + 2.6.0), libgnome2-dev (>= 2.1.1), libpango1.0-dev (>= 1.1.2). + * Version the liborbit2-dev build-dep to >= 2.4.0. + * Bump the libgnomeui-dev build-dep to >= 2.16.0-2 for gtk+2.0 2.10. + * Bump the libbonobo2-dev build-dep to >= 2.15 for gnome-vfs2 >= 2.16.0-1. + * Add ${shlibs:Depends} to libnautilus-extension-dev. + * New upstream release; no API change. + + -- Loic Minier Thu, 5 Oct 2006 17:04:18 +0200 + +nautilus (2.16.0-2) experimental; urgency=low + + [ Marco Cabizza ] + * Bump libgnomevfs2-dev build-dep to 2.16.0-1 for selinux support. + + [ Loic Minier ] + * Upload. + + -- Loic Minier Sun, 24 Sep 2006 21:45:45 +0200 + +nautilus (2.16.0-1) experimental; urgency=low + + * New upstream release. + * Update watch file. + * Remove requirements on libpopt and libgsf. + * Update build-dependencies appropriately. + * Remove many unneeded dependencies for libnautilus-extension-dev. + * Build-depend on docbook-utils and libselinux1-dev. + * Build-depend on gnome-pkg-tools 0.7 and use clean-la.mk. + * Also use gnome-version.mk and use ${gnome:Version}. + * Bump shlibs to 2.15.90. + + -- Josselin Mouette Tue, 12 Sep 2006 23:42:15 +0200 + +nautilus (2.14.3-6) unstable; urgency=medium + + * Update patch 11_umount-progress-bar to fix an implicit pointer conversion + to int which would have likely caused crashes on 64-bits arches; thanks + Dann Frazier; closes: #400996. + + -- Loic Minier Thu, 30 Nov 2006 13:45:04 +0100 + +nautilus (2.14.3-5) unstable; urgency=low + + * New patch, 11_umount-progress-bar.patch, to display a progress bar when + umounting an USB stick (or other volumes); taken from the Ubuntu package as + well as the translations; thanks Sven Arvidsson; GNOME #313639; + closes: #396939, #398373. + + -- Loic Minier Wed, 29 Nov 2006 15:33:06 +0100 + +nautilus (2.14.3-4) unstable; urgency=low + + * New patch, 10_nautilus-directory-cache-is-local.patch, to cache the result + of islocal() on NautilusDirectory objects; this is called relatively often + and should speed up browsing of network shares; from upstream CVS; credits + to Alexander Larsson and Federico Mena Quintero. + + -- Loic Minier Wed, 15 Nov 2006 17:08:56 +0100 + +nautilus (2.14.3-3) unstable; urgency=low + + * Is there something like a double brown paper bag? + * 02_umask.patch: finally a correct expression, hopefully. Fixes + problem with file creation (closes: #390908). + + -- Josselin Mouette Wed, 4 Oct 2006 17:14:14 +0200 + +nautilus (2.14.3-2) unstable; urgency=low + + * 02_umask.patch: use & operator on umask, not ^. Silly me. + + -- Josselin Mouette Mon, 2 Oct 2006 14:39:03 +0200 + +nautilus (2.14.3-1) unstable; urgency=low + + * New upstream release. + * 02_umask.patch: honor umask when creating files (closes: #314796). + * 01_relibtoolise.patch: removed. + * Bump eel2 build-dependencies. + + -- Josselin Mouette Thu, 3 Aug 2006 21:41:00 +0200 + +nautilus (2.14.1-5) unstable; urgency=high + + [ Josselin Mouette ] + * nautilus-data depends on ${misc:Depends} (RC bug fix). + + [ Loic Minier ] + * Add a useless ${misc:Depends} to libnautilus-extension1, just in case. + + -- Loic Minier Wed, 14 Jun 2006 11:00:59 +0200 + +nautilus (2.14.1-4) unstable; urgency=low + + * nautilus-dbg replaces libnautilus-extension1-dbg (closes: #368304). + + -- Josselin Mouette Sun, 21 May 2006 20:53:43 +0200 + +nautilus (2.14.1-3) unstable; urgency=low + + * The "tame the beast" release. + + New maintainer. + * Remove dependency on broken gamin. + * Keep only fam as a Recommends:, nautilus now monitors correctly + local mounts even without it (closes: #353163). + * Standards version is 3.7.2. + * dirs: removed, useless. + * *.install: move architecture-independent data to nautilus-data + (closes: #314209). + + Add a conflict with earlier versions. + * rules, nautilus-data.dirs: don't install the initial-desktop stuff, + it isn't used at all. + * nautilus-data.install: use it to install the icon. + * README.Debian: removed, useless. + * nautilus.postinst: removed, deprecated. + * Use ${binary:Version} (yes, that's cosmetic). + * Put all debugging information in nautilus-dbg. + + Remove libnautilus-extension1-dbg entirely. + + Use debhelper 5 and depend on it. + * Set priority of the debugging package to extra, to match the + override. + * libnautilus-extension-dev.install: there is no .a file. + + -- Josselin Mouette Thu, 18 May 2006 06:40:47 +0200 + +nautilus (2.14.1-2) unstable; urgency=low + + [ Sebastien Bacher ] + * Upload + + [ Josselin Mouette ] + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version}. + + [ Loic Minier ] + * Stop shipping /usr/lib/*.la files in libnautilus-extension-dev. + [debian/libnautilus-extension-dev.install] + * Build with a fixed CDBS (0.4.39-0.1 for #365085) which should restore the + correct libnautilus-extension1 shlib dep. (Closes: #365740) + + -- Sebastien Bacher Sat, 13 May 2006 00:12:20 +0200 + +nautilus (2.14.1-1) unstable; urgency=low + + * New upstream version + * debian/control.in: + - updated requirements on libeel and libgtk according to configure + * debian/patches/01_relibtoolise.patch: + - updated + + -- Sebastien Bacher Sun, 30 Apr 2006 01:16:06 +0200 + +nautilus (2.14.0-1) unstable; urgency=low + + * New upstream version + * debian/control.in: + - updated the requirements on gnome-vfs, eel + - updated cdbs requirement so dh_installmime is used + * debian/nautilus-data.install: + - install the "application/x-gnome-saved-search" mimetype definition + * debian/patches/01_relibtoolise.patch: + - updated + * debian/rules: + - updated the shlibs argument + * debian/watch: + - updated + + [ Josselin Mouette ] + * Recommend librsvg2-common and libgnomevfs2-extra. + + [ Loic Minier ] + * Depend on gamin | fam since gnome-vfs deps are not enough to ensure it's + there. (Closes: #353163) + [debian/control, debian/control.in] + + -- Sebastien Bacher Sun, 9 Apr 2006 19:41:37 +0200 + +nautilus (2.12.2-3) unstable; urgency=low + + * Simple rebuild to get rid of references to Xcursor.la and Xrender.la. + + -- Loic Minier Mon, 24 Apr 2006 19:45:51 +0200 + +nautilus (2.12.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 00:30:27 +0100 + +nautilus (2.12.2-1) experimental; urgency=low + + [ Sjoerd Simons ] + * Up gnome-vfs2 build-depend to >= 2.12.0 + + [ Loic Minier ] + * New upstream release. + * Minor cleanups to debian/rules. + * Actually ship license information and distinguish between copyright and + license. + + -- Loic Minier Mon, 12 Dec 2005 22:42:27 +0100 + +nautilus (2.12.1-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - updated the Build-Depends on the eel2 package. + * debian/patches/01_relibtoolise.patch: + - updated. + * debian/patches/07_places_bookmarks.patch, + debian/patches/08_desktopborder.patch: + - fixed with the new version. + * debian/watch: + - updated. + + -- Sebastien Bacher Mon, 17 Oct 2005 16:00:40 +0200 + +nautilus (2.10.1-5) unstable; urgency=high + + [ Josselin Mouette ] + * Depend on ${misc:Depends} (high urgency fix). + * Add --as-needed again. + + [ Loic Minier ] + * Add CDBS' utils. + + -- Loic Minier Fri, 14 Oct 2005 11:24:06 +0200 + +nautilus (2.10.1-4) unstable; urgency=medium + + [ Sebastien Bacher ] + * debian/control.in: + - Build-Depends on the current exif (Closes: #321261). + * debian/rules: + - don't use "-as-needed", fix the current build issue (Closes: #320138). + + [ Josselin Mouette ] + * Don't recommend gnome-icon-theme, gnome-control-center already depends on + it. + * Updated Suggests, using evince | pdf-viewer instead of xpdf, and + totem | mp3-decoder instead of xmms (closes: #289252). + + -- Sebastien Bacher Fri, 5 Aug 2005 13:12:57 +0200 + +nautilus (2.10.1-3) unstable; urgency=medium + + * Pass --as-needed to ld. + * Remove most conflicts and replaces, they aren't useful anymore. + * Depend on gnome-control-center instead of capplets. + * Cosmetic fixes to the -dbg packages' description. + * Don't install the .so and .la for libnautilus-private. + * Standards-version is 3.6.2. + * copyright: correctly reference the authors and the GPL. + + -- Josselin Mouette Sat, 25 Jun 2005 18:03:04 +0200 + +nautilus (2.10.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Fri, 10 Jun 2005 15:26:25 +0200 + +nautilus (2.10.1-1) experimental; urgency=low + + * Changes by Sébastien Bacher: + * New upstream version. + * debian/patches/09_connect-server-auth-fix.patch: + - fixed upstream. + * Changes by Josselin Mouette: + * Conflict with libnautilus2-dev. + + -- Sebastien Bacher Mon, 9 May 2005 15:57:18 +0200 + +nautilus (2.10.0-1) experimental; urgency=low + + * New upstream release: + - better handling of DnD from web browsers (Closes: #269490). + - fix the icon layout on ia64 (Closes: #286039). + * debian/control.in: + - create a debug package. + - don't Build-Conflicts on libcdparanoia0-dev + - renamed libnautilus2-2 to libnautilus-extension1 to reflect the upstream + changes. + - updated the Build-Depends. + * debian/patches/01_relibtoolise.patch: + - updated. + * debian/patches/02_build_exif.patch: + - fixed upstream. + * debian/patches/07_places_bookmarks.patch: + - patch to add the GTK bookmarks to the places menu. + * debian/patches/08_desktopborder.patch: + - don't display a border around the desktop. + * debian/patches/09_connect-server-auth-fix.patch: + - don't display a warning when creating a share. + * debian/rules: + - updated the configure options. + - updated the shlibs. + * debian/watch: + - updated. + + -- Sebastien Bacher Fri, 8 Apr 2005 16:46:55 +0200 + +nautilus (2.8.2-2) unstable; urgency=medium + + * debian/nautilus.postrm: + - test if the directories are here before trying to remove them + (Closes: #283450). + + -- Sebastien Bacher Wed, 24 Nov 2004 16:09:08 +0100 + +nautilus (2.8.2-1) unstable; urgency=low + + * New upstream release. + * Upload to unstable. + * debian/patches/01_relibtoolise.patch: + - updated. + * debian/rules: + - updated the Build-Depends. + + -- Sebastien Bacher Thu, 18 Nov 2004 19:35:45 +0100 + +nautilus (2.8.1-1) experimental; urgency=low + + * New upstream release. + * debian/patches/01_relibtoolise.patch: + - updated. + + -- Sebastien Bacher Tue, 12 Oct 2004 00:16:22 +0200 + +nautilus (2.8.0-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - updated the Build-Depends on libeel2-dev to 2.8.0. + * debian/patches/01_relibtoolise.patch: + - updated. + + -- Sebastien Bacher Tue, 14 Sep 2004 21:38:18 +0200 + +nautilus (2.7.4-1) experimental; urgency=low + + * GNOME Team Upload. + * New upstream development release. + - now uses the freedesktop.org MIME specification. + * Switched to CDBS. + * debian/control.in: + - nautilus depends on desktop-file-utils (>= 0.7). + - updated the Build-Depends on libeel2-dev to 2.7.4. + * debian/patches/01_relibtoolise.patch: + - updated. + * debian/patches/03_desktop-launchers.patch: + - removed since included in the new upstream release. + * debian/patches/04_mime_warning.patch: + - removed, obsolete. + * debian/control.in: + - Build-Depends on cdbs instead of dbs. + - updated the Build-Depends on librsvg2 to 2.7 + * debian/*.files: + - replaced by *.install files. + * debian/rules: + - switched to CDBS. + * This update is based on Canonical's patch as found in + http://no-name-yet.com/patches/gnome2.7/nautilus271to272.patch + (closes: #265304). + + -- Jordi Mallach Tue, 17 Aug 2004 11:22:55 +0200 + +nautilus (2.7.1-2) experimental; urgency=low + + * GNOME Team Upload. + * debian/patches/02_build_exif.patch: + - updated to fix the crash on file properties for images with exif datas. + + -- Sebastien Bacher Wed, 30 Jun 2004 15:07:49 +0200 + +nautilus (2.7.1-1) experimental; urgency=low + + * GNOME Team Upload. + * New (development) upstream release. + * debian/patches/01_relibtoolise.patch: + - updated. + * debian/patches/02_show-mounts.patch: + - removed since the changes are in the new version. + * debian/patches/02_build_exif.patch: + - patch to fix the build with the new libexif. + + -- Sebastien Bacher Wed, 23 Jun 2004 18:41:33 +0200 + +nautilus (2.6.3-2) unstable; urgency=high + + * GNOME Team Upload. + * debian/control.in: + - conflicts with capplets (<< 2.6). + + -- Sebastien Bacher Fri, 18 Jun 2004 02:17:21 +0200 + +nautilus (2.6.3-1) unstable; urgency=low + + * GNOME Team Upload. + * New upstream release + - fix zoom and desktop problems (Closes: #253135, #253653). + - fix the problem with desktop icons marqued as read-only + (Closes: #249792, #251848). + * debian/control.in: + - recommands nautilus-cd-burner (Closes: #249503). + * debian/patches/01_relibtoolise.patch: + + updated. + * debian/patches/02_show-mounts.patch: + - patch from the CVS to allow to not show volumes on desktop + (gconf key to use: /apps/nautilus/desktop/volumes_visible). + (Closes: #253529). + * debian/patches/03_desktop-launchers.patch: + - patch from the CVS to allow to edit the launcher on the desktop again. + + -- Sebastien Bacher Wed, 16 Jun 2004 23:18:15 +0200 + +nautilus (2.6.2-1) unstable; urgency=low + + * Gnome Team Upload. + * New Upstream Release. + * debian/control.in: + + removed recommends on nautilus-gtkhtml (Closes: #252449). + * debian/patches/01_relibtoolise.patch: + + updated. + + -- Sebastien Bacher Sat, 5 Jun 2004 13:11:31 +0200 + +nautilus (2.6.1-3) unstable; urgency=low + + + * debian/control.in: + + updated Build-Depends (Closes: #251388). + + -- Sebastien Bacher Fri, 28 May 2004 22:02:14 +0200 + +nautilus (2.6.1-2) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + * debian/nautilus.1: + + updated by Dafydd Harries . + + -- Sebastien Bacher Wed, 26 May 2004 17:43:42 +0200 + +nautilus (2.6.1-1) experimental; urgency=low + + * New upstream release. + * GNOME Team Upload. + * debian/patches/01_relibtoolise.patch: + + updated. + + -- Sebastien Bacher Wed, 26 May 2004 17:43:40 +0200 + +nautilus (2.6.0-2) experimental; urgency=low + + * [debian/patches/01_relibtoolise.patch] New. Updated libtoolisation to cut + down on library dependencies. + + -- J.H.M. Dassen (Ray) Mon, 12 Apr 2004 21:01:55 +0200 + +nautilus (2.6.0-1) experimental; urgency=low + + * New upstream release: + + Fix crash when trying to access non-existing vfs-url (Closes: #222957). + + Fix file selection by typing name in column mode (Closes: #237066). + + Fix drag and drop between menu and desktop (Closes: #237414). + + Should fix background management (Closes: #217859, #230348). + * debian/control.in, debian/rules: + + Adapted for the Gnome Team. + + libnautilus2-2 conflitcs with nautilus (<< 2.6.0) (Closes: #200433). + + Depends on shared-mime-info. + + Removed gnome-vfs-extra2 Recommends. + * debian/nautilus.1: + + Updated references (Closes: #226677). + * debian/patches/nautilus-2.4.1-gnu_pathmax.patch: + + Removed since not needed by new version. + + -- Sebastien Bacher Sat, 27 Mar 2004 14:36:53 +0100 + +nautilus (2.4.2-2) unstable; urgency=low + + * [debian/control.in] Added Build-Depends: libxml-parser-perl, needed for + recent intltool. + + -- J.H.M. Dassen (Ray) Thu, 5 Feb 2004 21:50:27 +0100 + +nautilus (2.4.2-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Tue, 3 Feb 2004 21:40:02 +0100 + +nautilus (2.4.1-3) unstable; urgency=low + + * debian/control : + - Recommends eject (Closes: #171081). + - Removed nautilus-mozilla from Suggests since the package is not in + the archive (Closes: #180805). + - Updated Build-Depends. + - Updated descriptions (Closes: #172928, #206509, #210070). + * debian/nautilus.postrm + - Removed empty dir in /etc (Closes: #206508). + * debian/rules : + - Removed autogen.sh call to fix the -pthread problem. + - Removed --disable-mozilla-component option, since nautilus 2.4 doesn't + use it. + + -- Sebastien Bacher Sun, 26 Oct 2003 15:22:19 +0100 + +nautilus (2.4.1-2) unstable; urgency=low + + * Register the schema file, that fix the problem with missing options + (Closes: #184865, #197810, #212279). + + -- Sebastien Bacher Wed, 22 Oct 2003 19:02:36 +0200 + +nautilus (2.4.1-1) unstable; urgency=low + + * New upstream release. + * Updated Build-Depends. + * Removed Conflicts on libeel2. + * debian/patches: + - fix-ld: removed + - nautilus-2.1.5-cdburn.patch: removed + - nautilus-2.4.1-gnu_pathmax.patch: updated + - orbit28.patch: removed + + -- Sebastien Bacher Sun, 19 Oct 2003 17:42:49 +0200 + +nautilus (2.2.4-5) unstable; urgency=low + + * Added a patch to fix a bug with orbit2.8. + * Gnome Team Upload. + + -- Sebastien Bacher Thu, 16 Oct 2003 21:15:10 +0200 + +nautilus (2.2.4-4.1) unstable; urgency=medium + + * Non-Maintainer Upload, to try to finally get GNOME 2.2 entirely in Sarge. + * debian/control.in: make libnautilus2-dev depend on libgnome-desktop-dev + (closes: #209089). + + -- Jordi Mallach Sun, 28 Sep 2003 18:59:15 +0200 + +nautilus (2.2.4-4) unstable; urgency=low + + * remove cdda support, I've heard that is totally broken. + Build-Conflicts: libcdparanoia0-dev + * -dev: Depends on librsvg2-dev (closes: #208674) + + -- Takuo KITAME Mon, 8 Sep 2003 11:40:58 +0900 + +nautilus (2.2.4-3) unstable; urgency=low + + * Fix build dependency (closes: Bug#208713) + * -dev: depends on libcdparanoia0-dev (closes: Bug#208713) + + -- Takuo KITAME Fri, 5 Sep 2003 02:43:25 +0900 + +nautilus (2.2.4-2) unstable; urgency=low + + * Fix #187364: libnautilus2-2: libraries not correctly linked (closes: #187364) + * -dev: conflicts: libnautilus1.0-dev (closes: #172230) + + -- Takuo KITAME Wed, 3 Sep 2003 16:40:41 +0900 + +nautilus (2.2.4-1) unstable; urgency=low + + * New upstream release + * Fix build-depends (closes: #188888) + * Fix build problem on GNU/Hurd (closes: #190369) + * Fix dependency to eel (closes: #189255) + * Recommends gnome-vfs-extras2 (closes: #194491) + * Fix Debian menu icon (closes: #192630) + * Suggests pdf-viewer instead of xpdf (closes: #197202) + + -- Takuo KITAME Fri, 13 Jun 2003 14:54:56 +0900 + +nautilus (2.2.3.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 23 Apr 2003 15:51:03 +0900 + +nautilus (2.2.3-1) unstable; urgency=low + + * New upstream release + * Applied nautilus-cd-burner patch + + -- Takuo KITAME Thu, 10 Apr 2003 11:35:38 +0900 + +nautilus (2.2.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 14 Mar 2003 16:34:45 +0900 + +nautilus (2.2.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 13 Feb 2003 01:58:08 +0900 + +nautilus (2.2.0.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 31 Jan 2003 11:06:34 +0900 + +nautilus (2.2.0.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 24 Jan 2003 16:25:11 +0900 + +nautilus (2.2.0-2) unstable; urgency=low + + * fix miss packaging. tarball should be orig.tar.gz + + -- Takuo KITAME Thu, 23 Jan 2003 23:38:27 +0900 + +nautilus (2.2.0-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 23 Jan 2003 18:52:42 +0900 + +nautilus (2.1.91-1) unstable; urgency=low + + * New upstream release + * Rebuild against latest libraries (closes: #177485, #177415, #177326, #177325) + + -- Takuo KITAME Mon, 20 Jan 2003 11:14:49 +0900 + +nautilus (2.0.8-1) unstable; urgency=low + + * New upstream release + * applied patch to use desktop-base (closes: #166423) + * Fix menu entry (closes: #170572, #161798) + + -- Takuo KITAME Sat, 30 Nov 2002 13:07:38 +0900 + +nautilus (2.0.7-5) unstable; urgency=low + + * Update config.{guess,sub} (closes: #168651) + * Sugguests: eog not eog2 + + -- Takuo KITAME Fri, 15 Nov 2002 15:26:15 +0900 + +nautilus (2.0.7-4) unstable; urgency=low + + * upload into unstable/main + + -- Takuo KITAME Wed, 13 Nov 2002 09:49:33 +0900 + +nautilus (2.0.7-3) experimental; urgency=low + + * Change package name to nautilus + + -- Takuo KITAME Fri, 8 Nov 2002 16:09:34 +0900 + +nautilus2 (2.0.7-2) unstable; urgency=low + + * Replaces: nautilus (closes: #166074) + + -- Takuo KITAME Tue, 5 Nov 2002 16:31:22 +0900 + +nautilus2 (2.0.7-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 18 Sep 2002 15:23:25 +0900 + +nautilus2 (2.0.6-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 5 Sep 2002 14:16:42 +0900 + +nautilus2 (2.0.4-3) unstable; urgency=low + + * rebuild against gconf 1.2.1-3 + + -- Takuo KITAME Mon, 26 Aug 2002 16:01:26 +0900 + +nautilus2 (2.0.4-2) unstable; urgency=low + + * rebuild against gconf 1.2.1-2 + + -- Takuo KITAME Mon, 19 Aug 2002 14:45:22 +0900 + +nautilus2 (2.0.4-1) unstable; urgency=low + + * New upsream release + + -- Takuo KITAME Fri, 16 Aug 2002 17:12:26 +0900 + +nautilus2 (2.0.3-1) unstable; urgency=low + + * New upsream release + * don't compile with openssl (closes: #155614) + + -- Takuo KITAME Thu, 8 Aug 2002 10:50:23 +0900 + +nautilus2 (2.0.2-1) unstable; urgency=low + + * New upsream release (closes: #154606) + * Fix description (closes: #152290) + + -- Takuo KITAME Mon, 5 Aug 2002 18:47:17 +0900 + +nautilus2 (2.0.0-3) unstable; urgency=low + + * Upload to unstable/main + * nautilus2-data conflicts with nautilus 1.0 + + -- Takuo KITAME Wed, 3 Jul 2002 12:00:40 +0900 + +nautilus2 (2.0.0-2) experimental; urgency=low + + * build against librsvg2-2 + + -- Takuo KITAME Fri, 28 Jun 2002 14:14:11 +0900 + +nautilus2 (2.0.0-1) experimental; urgency=low + + * New upstream release + * change package name to nautilus2 + + -- Takuo KITAME Thu, 13 Jun 2002 03:21:57 +0900 + +nautilus1.1 (1.1.19-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 5 Jun 2002 11:35:23 +0900 + +nautilus1.1 (1.1.18-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 28 May 2002 15:55:22 +0900 + +nautilus1.1 (1.1.17-2) experimental; urgency=low + + * separate arch independent files into nautilus1.1-data + + -- Takuo KITAME Tue, 21 May 2002 14:26:45 +0900 + +nautilus1.1 (1.1.17-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 21 May 2002 13:21:26 +0900 + +nautilus1.1 (1.1.16-1) experimental; urgency=low + + * New upstream release + * some executable binaries in /usr/lib/nautilus + * remove nautilus1.1-{suggested,extra} package. + + -- Takuo KITAME Tue, 14 May 2002 10:30:51 +0900 + +nautilus1.1 (1.1.15-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 7 May 2002 14:30:16 +0900 + +nautilus1.1 (1.1.14-1) experimental; urgency=low + + * New upstream release + * fix menu and upstream infomation (closes: #144018,#144016) + + -- Takuo KITAME Mon, 29 Apr 2002 23:48:00 +0900 + +nautilus1.1 (1.1.13-1) experimental; urgency=low + + * New upstream release + * use dbs + + -- Takuo KITAME Mon, 22 Apr 2002 20:22:44 +0900 + +nautilus1.1 (1.1.12-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Sat, 20 Apr 2002 01:23:25 +0900 + +nautilus1.1 (1.1.11-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 26 Mar 2002 10:09:56 +0900 + +nautilus1.1 (1.1.9-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 11 Mar 2002 16:12:28 +0900 + +nautilus1.1 (1.1.8-2) experimental; urgency=low + + * bump package name libnautilus1.1-0 to -2 + + -- Takuo KITAME Fri, 8 Mar 2002 14:55:21 +0900 + +nautilus1.1 (1.1.8-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 7 Mar 2002 11:29:37 +0900 + +nautilus1.1 (1.1.6-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 28 Feb 2002 11:42:15 +0900 + +nautilus1.1 (1.1.5-2) experimental; urgency=low + + * build against gtk+ 1.3.14 and libgnome* 1.112.0 + + -- Takuo KITAME Sat, 23 Feb 2002 03:55:40 +0900 + +nautilus1.1 (1.1.5-1) experimental; urgency=low + + * New upstream release + * update build-depends + + -- Takuo KITAME Sun, 17 Feb 2002 14:40:17 +0900 + +nautilus1.1 (1.1.4-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 6 Feb 2002 03:01:38 +0900 + +nautilus1.1 (1.1.3-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 4 Feb 2002 00:42:38 +0900 + +nautilus1.1 (1.1.2-2) experimental; urgency=low + + * Build against latest libatk9 + + -- Takuo KITAME Thu, 24 Jan 2002 21:32:33 +0900 + +nautilus1.1 (1.1.2-1) experimental; urgency=low + + * New upstream release, GNOME2 version. + * upload to experimental + + -- Takuo KITAME Mon, 21 Jan 2002 17:57:33 +0000 + +nautilus (1.0.6-2) unstable; urgency=low + + * debian/rules: + - --enable-fam (closes: #116712) + * debian/control: + - added libfam-dev into build-depends + * remove gnome-*2html2 files (closes: #128083) + + -- Takuo KITAME Tue, 8 Jan 2002 02:19:45 +0900 + +nautilus (1.0.6-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 9 Nov 2001 04:18:33 +0000 + +nautilus (1.0.5-2) unstable; urgency=low + + * Fix and install overrides for lintian errors (closes: #116941) + * Changed debian menu category tools to system. (closes: #116370) + + -- Takuo KITAME Sat, 27 Oct 2001 04:10:54 +0900 + +nautilus (1.0.5-1) unstable; urgency=low + + * New upstream release + * Build-Depends: libcdparanoia0-dev (closes: #106350) + + -- Takuo KITAME Sat, 20 Oct 2001 17:34:38 +0900 + +nautilus (1.0.4-1) unstable; urgency=low + + * New upstream release + * closes again (closes: Bug#101387, Bug#102662, Bug#96610) + + -- Takuo KITAME Sat, 7 Jul 2001 22:07:43 +0900 + +nautilus (1.0.3.2cvs-1) unstable; urgency=low + + * New upstream release + * cvs update -r NAUTILUS_1_0_4 (1.0.3.2) + * closes: Bug#101387, Bug#102662 + * closes: Bug#96610 It's not software bug. + + -- Takuo KITAME Wed, 4 Jul 2001 11:12:05 +0900 + +nautilus (1.0.3-4) unstable; urgency=low + + * Fixed build-dependency (closes: Bug#99765) + * added depends libbonobo-dev for libnautilus-dev (closes: Bug#99654) + + -- Takuo KITAME Sun, 17 Jun 2001 21:53:02 +0900 + +nautilus (1.0.3-3) unstable; urgency=low + + * Fixed build-depends: (closes: Bug#98706, Bug#98846) + + -- Takuo KITAME Sun, 27 May 2001 15:14:26 +0900 + +nautilus (1.0.3-2) unstable; urgency=low + + * rebuid with libeel0 which is still in Incoming. + * remove libammonite-dev, librpm0-dev for Build-Depends + * also librsvg-dev, libfreetype6-dev. (libeel-dev follows it) + + -- Takuo KITAME Thu, 10 May 2001 21:49:18 +0900 + +nautilus (1.0-4) unstable; urgency=low + + * debian/control.in: Really nautilus-suggested move to contrib. + nautilus-suggested: Really Depends: nautilus-trilobite (>= 1.0-2) + * fix wrong symlink name /usr/share/man/man1/nautilus-verify-rpm.sh (closes: Bug#93579) + + -- Takuo KITAME Wed, 11 Apr 2001 10:53:01 +0900 + +nautilus (1.0-3) unstable; urgency=low + + * nautilus-suggested: move to contrib, Depends: nautilus-trilobite (>= 1.0-2) + * --disable-mozilla-component instead of --disable-mozilla + + -- Takuo KITAME Tue, 10 Apr 2001 14:52:43 +0900 + +nautilus (1.0-2) unstable; urgency=low + + * remove dependency to non-US package. + * nautilus-trilobite/mozilla: goes to it's own package and moved to non-US. + * --disable-mozilla. Sorry, remove mozilla support. We have not mozilla-0.8 in archive. (closes: Bug#92274) + * --disable-eazel-service, non-US part was moved to it's own package 'nautilus-nonus' + * Install nautilus-verify-rpm.sh (closes: Bug#90087) + * Build with -DDEBIAN (closes: Bug#84810) + * includes libvfs-help.so (closes: Bug#92766) + + * Notice to FTP maintainer, + Please remove nautilus-trilobite, nautilus-mozilla from main archive. + and move nautilus-suggested to contrib/x11. + + -- Takuo KITAME Thu, 5 Apr 2001 14:05:56 +0900 + +nautilus (1.0-1) unstable; urgency=low + + * New upstream release + * nautilus-extra: depends xpdf | xpdf-i (closes: Bug#84958) + * libnautilus-extention/nautilus-gnome-extensions.c: applied debian x-terminal-emurator patch (closes: Bug#84810) + * Fix "Tree view doesn't work in Nautilus" (closes: Bug#89087) + * upsteam fixed + closes: Bug#87069 xmms doesn't accept DND mp3 files from nautilus + closes: Bug#86422 nautilus: Font handling bug + closes: Bug#86452 nautilus: Nautilus doesn't choose correct fonts + * holefully fixed + closes: Bug#89372: Nautilus doesn't show up + + -- Takuo KITAME Wed, 14 Mar 2001 13:56:00 +0900 + +nautilus (0.8.2-1) unstable; urgency=low + + * New upstream release (not released, but cvs update -r NAUTILUS_0_8_2) + * Fix manpage install (closes: Bug#87394, Bug#87958) + + -- Takuo KITAME Sat, 3 Mar 2001 00:41:31 +0900 + +nautilus (0.8-2) unstable; urgency=low + + * libnautilus0 has versioned shlibs. (closes: Bug#84858) + * nautilus-mozilla depends on mozilla (>= 1:0.7) + * fixed freetype build dependency, --with-freetype2-include2=/usr/include/freetype2 (closes: Bug#85246) + * added manpages, removed all undocumented (closes: Bug#84807) + * Rebuild with Bonobo 0.36-2 and versioned depends. (close: Bug#84951, Bug#86562, ) + + -- Takuo KITAME Mon, 19 Feb 2001 22:43:46 +0900 + +nautilus (0.8-1) unstable; urgency=low + + * New upstream release (closes: Bug#84191) + * some bugs was hopefully fixed by upstream. + closes: Bug#79174, Bug#79110, Bug#79340, Bug#79940, Bug#80741, Bug#79057, Bug#79207, Bug#79248, Bug#79448, Bug#82752 + * Recommends -> Suggests ammonite (closes: Bug#80799) + * Build-Depends: rpm (closes: Bug#84302) + * separated component packages(like nautilus.spec) -mozilla, -trilobite, -extra and nautilus-suggested. + + -- Takuo KITAME Fri, 2 Feb 2001 11:13:00 +0900 + +nautilus (0.5-3) unstable; urgency=low + + * --enable-eazel-services=1, Recommends: ammonite (closes: Bug#79345) + * Added Build-Dpends (closes: Bug#79377) + + -- Takuo KITAME Wed, 27 Dec 2000 12:30:24 +0900 + +nautilus (0.5-2.1) unstable; urgency=low + + * Initial upload. + * Build with Debian's libfreetype6, libfreetype2-dev. + * Modifies for Bonobo 0.28 + + -- Takuo KITAME Tue, 28 Nov 2000 01:37:10 +0900 + +nautilus (0.5-2) unstable; urgency=low + + * --enable-mozilla-component + + -- Takuo KITAME Wed, 8 Nov 2000 12:57:18 +0900 + +nautilus (0.5-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 8 Nov 2000 10:38:37 +0900 + +nautilus (0.1.0-1) experimental; urgency=low + + * Initial Release. + + -- Takuo KITAME Thu, 17 Aug 2000 12:51:38 +0900 + + --- nautilus-2.27.4.orig/debian/mount-archive.desktop +++ nautilus-2.27.4/debian/mount-archive.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Archive Mounter +Exec=/usr/lib/gvfs/gvfsd-archive file=%u +MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/zip; +Terminal=false +StartupNotify=false +Type=Application +NoDisplay=true + --- nautilus-2.27.4.orig/debian/nautilus-data.install +++ nautilus-2.27.4/debian/nautilus-data.install @@ -0,0 +1,7 @@ +debian/tmp/etc +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/nautilus +debian/tmp/usr/share/locale +debian/tmp/usr/share/mime/packages/nautilus.xml +debian/tmp/usr/share/pixmaps +debian/nautilus.xpm /usr/share/pixmaps --- nautilus-2.27.4.orig/debian/nautilus-file-management-properties.1 +++ nautilus-2.27.4/debian/nautilus-file-management-properties.1 @@ -0,0 +1,49 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH nautilus-file-management-properties 1 "05 Jan 2008" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +nautilus-file-management-properties \- File Management Preferences +.SH SYNOPSIS +.B nautilus-file-management-properties +.RI [ options ] +.SH DESCRIPTION +This manual page documents briefly the +.B nautilus-file-management-properties +command. +.PP +File Management Preferences allows an user to configure the way nautilus looks. +.PP +You can specify a default view, and select sort options and display options. +You can also specify default settings for icon views and list views. +.SH OPTIONS +Nautilus follows the usual GNU command line syntax, with long options starting +with two dashes (`-'). A summary of options is included below. +.TP +.B \-\-help +Show a summary of options. +.TP +.B \-\-version +Show version. +.TP +Other standard GNOME options not listed here are also supported. +.SH SEE ALSO +File Management Preferences documentation can be found from the "Help" menu, or by pressing the +F1 key. Nautilus also has a website at http://www.gnome.org/projects/nautilus/ +.SH AUTHOR +This manual page was written by Julian Andres Klode for the +Debian GNU/Linux system (but may be used by others), based on a manpage by +Fernando Ribeiro . --- nautilus-2.27.4.orig/debian/watch +++ nautilus-2.27.4/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/nautilus/([\d\.]+)[024678]/ \ + nautilus-(.*)\.tar\.gz \ + debian uupdate --- nautilus-2.27.4.orig/debian/nautilus.install +++ nautilus-2.27.4/debian/nautilus.install @@ -0,0 +1,4 @@ +debian/mount-archive.desktop usr/share/applications +debian/tmp/usr/bin +debian/tmp/usr/share/applications +debian/tmp/usr/share/man --- nautilus-2.27.4.orig/debian/nautilus-connect-server.1 +++ nautilus-2.27.4/debian/nautilus-connect-server.1 @@ -0,0 +1,50 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH nautilus-connect-server 1 "05 Jan 2008" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +Nautilus Connect Server \- To Access a remote server +.SH SYNOPSIS +.B nautilus-connect-server +.RI [ options ] +.RI [ URI ] +.SH DESCRIPTION +This manual page documents briefly the +.B nautilus-connect-server +command. +.PP +Nautilus Connect Server is the connection manager for the GNOME desktop. +.PP +You can use the file manager to access a remote server, be it an FTP site, +a Windows share, a WebDav server or an SSH server. +.SH OPTIONS +Nautilus follows the usual GNU command line syntax, with long options starting +with two dashes (`-'). A summary of options is included below. +.TP +.B \-\-help +Show a summary of options. +.TP +.B \-\-version +Show version. +.TP +Other standard GNOME options not listed here are also supported. +.SH SEE ALSO +Nautilus Connect Server documentation can be found from the "Help" menu, or by pressing the +F1 key. Nautilus also has a website at http://www.gnome.org/projects/nautilus/ +.SH AUTHOR +This manual page was written by Julian Andres Klode for the +Debian GNU/Linux system (but may be used by others), based on a manpage by +Fernando Ribeiro . --- nautilus-2.27.4.orig/debian/mount-archive.desktop.in +++ nautilus-2.27.4/debian/mount-archive.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=Archive Mounter +Exec=/usr/lib/gvfs/gvfsd-archive file=%u +MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/zip; +Terminal=false +StartupNotify=false +Type=Application +NoDisplay=true + --- nautilus-2.27.4.orig/debian/copyright +++ nautilus-2.27.4/debian/copyright @@ -0,0 +1,38 @@ +This package was debianized by Takuo KITAME on +Fri, 19 May 2000 14:10:24 +0900. + +It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/nautilus + +Copyright Holders and Upstream Authors: + Alex Larsson + Dave Camp + Soren Sandmann + Jörg Billeter + James Willcox + Jan Arne Petersen + Mark McLoughlin + Darin Adler + Anders Carlsson + Michael Meeks + Jacob Berkman + and many others, especially the Eazel staff + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- nautilus-2.27.4.orig/debian/nautilus.postrm +++ nautilus-2.27.4/debian/nautilus.postrm @@ -0,0 +1,15 @@ +#!/bin/sh -e + +if [ "$1" = "purge" ] ; then + if [ -d /etc/X11/starthere ]; then + rmdir --ignore-fail-on-non-empty /etc/X11/starthere + fi + if [ -d /etc/X11/sysconfig ]; then + rmdir --ignore-fail-on-non-empty /etc/X11/sysconfig + fi + if [ -d /etc/X11/serverconfig ]; then + rmdir --ignore-fail-on-non-empty /etc/X11/serverconfig + fi +fi + +#DEBHELPER# --- nautilus-2.27.4.orig/debian/nautilus-data.gconf-defaults +++ nautilus-2.27.4/debian/nautilus-data.gconf-defaults @@ -0,0 +1,5 @@ +/apps/nautilus/preferences/always_use_browser true +/apps/nautilus/desktop/home_icon_visible false +/apps/nautilus/desktop/computer_icon_visible false +/apps/nautilus/desktop/trash_icon_visible false + --- nautilus-2.27.4.orig/debian/compat +++ nautilus-2.27.4/debian/compat @@ -0,0 +1 @@ +5 --- nautilus-2.27.4.orig/debian/nautilus.manpages +++ nautilus-2.27.4/debian/nautilus.manpages @@ -0,0 +1,3 @@ +debian/nautilus.1 +debian/nautilus-connect-server.1 +debian/nautilus-file-management-properties.1 --- nautilus-2.27.4.orig/debian/menu +++ nautilus-2.27.4/debian/menu @@ -0,0 +1,2 @@ +?package(nautilus):needs="X11" section="Applications/File Management" \ + title="Nautilus" command="/usr/bin/nautilus" icon="/usr/share/pixmaps/nautilus.xpm" --- nautilus-2.27.4.orig/debian/control.in +++ nautilus-2.27.4/debian/control.in @@ -0,0 +1,146 @@ +Source: nautilus +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + cdbs (>= 0.4.41), + quilt, + gnome-pkg-tools (>= 0.13), + dpkg-dev (>= 1.13.19), + libglib2.0-dev (>= 2.21.3), + libgnome-desktop-dev (>= 2.25.5), + libpango1.0-dev (>= 1.1.2), + libgtk2.0-dev (>= 2.16.0), + libxml2-dev (>= 2.4.7), + libexif-dev (>= 0.5.12), + libexempi-dev (>= 1.99.5), + libgail-dev (>= 0.16), + libunique-dev, + libdbus-glib-1-dev, + intltool (>= 0.40.1), + gtk-doc-tools (>= 1.4), + libxt-dev, + libx11-dev, + libselinux1-dev | not+linux-gnu, + libxrender-dev, + libxext-dev, + libgconf2-dev, + x11proto-core-dev, + shared-mime-info (>= 0.50), + liblaunchpad-integration-dev (>= 0.1.17), + libglib2.0-doc, + libgtk2.0-doc +Homepage: http://www.gnome.org/projects/nautilus/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu +Standards-Version: 3.8.1 + +Package: nautilus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + nautilus-data (>= ${gnome:Version}), + nautilus-data (<< ${gnome:NextVersion}), + shared-mime-info (>= 0.50), + desktop-file-utils (>= 0.7), + gvfs (>= 1.0.2) +Provides: nautilus-extensions-2.0 +Recommends: eject, + brasero (>= 2.26) | nautilus-cd-burner, + librsvg2-common, + gnome-app-install, + app-install-data, + gvfs-backends, + consolekit +Suggests: eog, + evince | pdf-viewer, + totem | mp3-decoder, + xdg-user-dirs +Conflicts: libnautilus2-2, + libnautilus2-dev +Breaks: gnome-volume-manager (<< 2.24), + rhythmbox (<< 0.12) +Replaces: libnautilus2-2 +Description: file manager and graphical shell for GNOME + Nautilus is the official file manager for the GNOME desktop. It allows + to browse directories, preview files and launch applications associated + with them. It is also responsible for handling the icons on the GNOME + desktop. It works on local and remote filesystems. + . + Several icon themes and components for viewing different kinds of files + are available in separate packages. + +Package: nautilus-dbg +Section: debug +Architecture: any +Priority: extra +Depends: nautilus (= ${binary:Version}) +Replaces: libnautilus-extension1-dbg +Description: file manager and graphical shell for GNOME - debugging version + Nautilus is the official file manager for the GNOME desktop. It allows + to browse directories, preview files and launch applications associated + with them. It is also responsible for handling the icons on the GNOME + desktop. It works on local and remote filesystems. + . + Several icon themes and components for viewing different kinds of files + are available in separate packages. + . + This development package contains unstripped binaries compiled with + debugging symbols needed by gdb. + +Package: libnautilus-extension1 +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libnautilus2-2 +Breaks: nautilus (<< 2.22), + gnome-mount (<< 0.8), + nautilus-cd-burner (<< 2.22), + file-roller (<< 2.24), + python-nautilus (<< 0.5), + nautilus-sendto (<< 0.14.0-2), + nautilus-open-terminal (<< 0.9), + nautilus-image-converter (<< 0.3), + nautilus-filename-repairer (<< 0.0.5-2), + eiciel (<< 0.9.6.1-3), + diff-ext (<= 0.2.3-3), + nautilus-gksu (<< 2.0.2-2+b1), + nautilus-actions (<< 1.4.1-1+b1), + nautilus-share (<< 0.7.2-4+b1), + seahorse-plugins (<< 2.24.1-3+b1) +Replaces: libnautilus2-2 +Description: libraries for nautilus components - runtime version + Nautilus is the official file manager and graphical shell for the + GNOME desktop. + . + This package contains a few runtime libraries needed by nautilus' extensions. + +Package: libnautilus-extension-dev +Architecture: any +Section: libdevel +Depends: libnautilus-extension1 (= ${binary:Version}), + libglib2.0-dev (>= 2.21.3), + libgtk2.0-dev (>= 2.16.0), + ${shlibs:Depends} +Conflicts: libnautilus2-dev +Replaces: libnautilus2-dev +Description: libraries for nautilus components - development version + Nautilus is the official file manager and graphical shell for the + GNOME desktop. + . + This package provides the necessary development libraries and include + files to develop and compile Nautilus extensions. + +Package: nautilus-data +Architecture: all +Depends: scrollkeeper, ${misc:Depends} +Conflicts: nautilus (<< 2.14.1-3) +Recommends: nautilus +Description: data files for nautilus + Nautilus is the official file manager and graphical shell for the + GNOME desktop. + . + This package contains pictures, localization files and other data + needed by nautilus. --- nautilus-2.27.4.orig/debian/libnautilus-extension1.install +++ nautilus-2.27.4/debian/libnautilus-extension1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnautilus-extension*.so.* --- nautilus-2.27.4.orig/debian/control +++ nautilus-2.27.4/debian/control @@ -0,0 +1,146 @@ +Source: nautilus +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette +Build-Depends: debhelper (>= 5), + cdbs (>= 0.4.41), + quilt, + gnome-pkg-tools (>= 0.13), + dpkg-dev (>= 1.13.19), + libglib2.0-dev (>= 2.21.3), + libgnome-desktop-dev (>= 2.25.5), + libpango1.0-dev (>= 1.1.2), + libgtk2.0-dev (>= 2.16.0), + libxml2-dev (>= 2.4.7), + libexif-dev (>= 0.5.12), + libexempi-dev (>= 1.99.5), + libgail-dev (>= 0.16), + libunique-dev, + libdbus-glib-1-dev, + intltool (>= 0.40.1), + gtk-doc-tools (>= 1.4), + libxt-dev, + libx11-dev, + libselinux1-dev | not+linux-gnu, + libxrender-dev, + libxext-dev, + libgconf2-dev, + x11proto-core-dev, + shared-mime-info (>= 0.50), + liblaunchpad-integration-dev (>= 0.1.17), + libglib2.0-doc, + libgtk2.0-doc +Homepage: http://www.gnome.org/projects/nautilus/ +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu +Standards-Version: 3.8.1 + +Package: nautilus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + nautilus-data (>= ${gnome:Version}), + nautilus-data (<< ${gnome:NextVersion}), + shared-mime-info (>= 0.50), + desktop-file-utils (>= 0.7), + gvfs (>= 1.0.2) +Provides: nautilus-extensions-2.0 +Recommends: eject, + brasero (>= 2.26) | nautilus-cd-burner, + librsvg2-common, + gnome-app-install, + app-install-data, + gvfs-backends, + consolekit +Suggests: eog, + evince | pdf-viewer, + totem | mp3-decoder, + xdg-user-dirs +Conflicts: libnautilus2-2, + libnautilus2-dev +Breaks: gnome-volume-manager (<< 2.24), + rhythmbox (<< 0.12) +Replaces: libnautilus2-2 +Description: file manager and graphical shell for GNOME + Nautilus is the official file manager for the GNOME desktop. It allows + to browse directories, preview files and launch applications associated + with them. It is also responsible for handling the icons on the GNOME + desktop. It works on local and remote filesystems. + . + Several icon themes and components for viewing different kinds of files + are available in separate packages. + +Package: nautilus-dbg +Section: debug +Architecture: any +Priority: extra +Depends: nautilus (= ${binary:Version}) +Replaces: libnautilus-extension1-dbg +Description: file manager and graphical shell for GNOME - debugging version + Nautilus is the official file manager for the GNOME desktop. It allows + to browse directories, preview files and launch applications associated + with them. It is also responsible for handling the icons on the GNOME + desktop. It works on local and remote filesystems. + . + Several icon themes and components for viewing different kinds of files + are available in separate packages. + . + This development package contains unstripped binaries compiled with + debugging symbols needed by gdb. + +Package: libnautilus-extension1 +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends} +Conflicts: libnautilus2-2 +Breaks: nautilus (<< 2.22), + gnome-mount (<< 0.8), + nautilus-cd-burner (<< 2.22), + file-roller (<< 2.24), + python-nautilus (<< 0.5), + nautilus-sendto (<< 0.14.0-2), + nautilus-open-terminal (<< 0.9), + nautilus-image-converter (<< 0.3), + nautilus-filename-repairer (<< 0.0.5-2), + eiciel (<< 0.9.6.1-3), + diff-ext (<= 0.2.3-3), + nautilus-gksu (<< 2.0.2-2+b1), + nautilus-actions (<< 1.4.1-1+b1), + nautilus-share (<< 0.7.2-4+b1), + seahorse-plugins (<< 2.24.1-3+b1) +Replaces: libnautilus2-2 +Description: libraries for nautilus components - runtime version + Nautilus is the official file manager and graphical shell for the + GNOME desktop. + . + This package contains a few runtime libraries needed by nautilus' extensions. + +Package: libnautilus-extension-dev +Architecture: any +Section: libdevel +Depends: libnautilus-extension1 (= ${binary:Version}), + libglib2.0-dev (>= 2.21.3), + libgtk2.0-dev (>= 2.16.0), + ${shlibs:Depends} +Conflicts: libnautilus2-dev +Replaces: libnautilus2-dev +Description: libraries for nautilus components - development version + Nautilus is the official file manager and graphical shell for the + GNOME desktop. + . + This package provides the necessary development libraries and include + files to develop and compile Nautilus extensions. + +Package: nautilus-data +Architecture: all +Depends: scrollkeeper, ${misc:Depends} +Conflicts: nautilus (<< 2.14.1-3) +Recommends: nautilus +Description: data files for nautilus + Nautilus is the official file manager and graphical shell for the + GNOME desktop. + . + This package contains pictures, localization files and other data + needed by nautilus. --- nautilus-2.27.4.orig/debian/libnautilus-extension-dev.install +++ nautilus-2.27.4/debian/libnautilus-extension-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/libnautilus-extension*.so +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/share/gtk-doc --- nautilus-2.27.4.orig/debian/nautilus.xpm +++ nautilus-2.27.4/debian/nautilus.xpm @@ -0,0 +1,234 @@ +/* XPM */ +static char * nautilus_xpm[] = { +"32 23 208 2", +" c None", +". c #F7E8E1", +"+ c #F3DDD2", +"@ c #E7BBA4", +"# c #DFA174", +"$ c #E3A77E", +"% c #E5AA7A", +"& c #E3AB84", +"* c #E3AC8C", +"= c #E3AD91", +"- c #F0D7CA", +"; c #FAF2ED", +"> c #EBC8B7", +", c #E49E6C", +"' c #E69E5C", +") c #ECA552", +"! c #EEAE53", +"~ c #F2B75A", +"{ c #F4C361", +"] c #F1C273", +"^ c #E9A665", +"/ c #E8BCA3", +"( c #EED1C1", +"_ c #FEFEFE", +": c #DB9A6A", +"< c #E28F51", +"[ c #E69442", +"} c #E79A47", +"| c #EBA34C", +"1 c #F2BD62", +"2 c #F5CA6E", +"3 c #EEA33F", +"4 c #E7923D", +"5 c #ECB976", +"6 c #E5B38C", +"7 c #FCF8F6", +"8 c #D79977", +"9 c #DD8D53", +"0 c #DA7E46", +"a c #D37B40", +"b c #D2753A", +"c c #CA7836", +"d c #D68336", +"e c #DE7726", +"f c #EDA242", +"g c #E9B986", +"h c #EED0BF", +"i c #CF9174", +"j c #C67144", +"k c #C87140", +"l c #C46D3C", +"m c #BA6536", +"n c #BB5D35", +"o c #B34F2B", +"p c #B3552C", +"q c #BB692D", +"r c #CD752F", +"s c #DE782E", +"t c #E48C34", +"u c #EA9D3E", +"v c #D97431", +"w c #D36528", +"x c #E6A973", +"y c #B76745", +"z c #B35C37", +"A c #AC5738", +"B c #A14E28", +"C c #A5462B", +"D c #AB4328", +"E c #B45B2C", +"F c #E3863A", +"G c #C85825", +"H c #E79846", +"I c #F0D5C7", +"J c #C9896C", +"K c #9B4A31", +"L c #8D3F28", +"M c #933E25", +"N c #9D4A2C", +"O c #A9482F", +"P c #C27335", +"Q c #CF7733", +"R c #DA7C33", +"S c #CA612D", +"T c #EFB869", +"U c #F4E1D8", +"V c #965A46", +"W c #7D3925", +"X c #853C25", +"Y c #AF5437", +"Z c #B24F32", +"` c #B5693B", +" . c #B46B41", +".. c #AC633E", +"+. c #A15339", +"@. c #A54D26", +"#. c #AF4823", +"$. c #D66C2F", +"%. c #EFB25B", +"&. c #E7BEAA", +"*. c #AE725A", +"=. c #753624", +"-. c #904028", +";. c #A34E31", +">. c #B75E3C", +",. c #C77E54", +"'. c #B67556", +"). c #BC7B5D", +"!. c #AD654D", +"~. c #8D422C", +"{. c #7C331E", +"]. c #C96734", +"^. c #F5F3F3", +"/. c #DFB4A0", +"(. c #995D47", +"_. c #793A28", +":. c #A65D43", +"<. c #AE6D4D", +"[. c #BC8366", +"}. c #C28167", +"|. c #A55336", +"1. c #B4643B", +"2. c #C26B42", +"3. c #D16B34", +"4. c #E17F30", +"5. c #A88C7E", +"6. c #D49D82", +"7. c #874434", +"8. c #AF714E", +"9. c #AC6846", +"0. c #A5623F", +"a. c #A56445", +"b. c #D4996C", +"c. c #D47E4B", +"d. c #E9A56C", +"e. c #8E6953", +"f. c #77382A", +"g. c #B26A49", +"h. c #BE7545", +"i. c #C47842", +"j. c #96502D", +"k. c #9D573F", +"l. c #D38E61", +"m. c #D8864C", +"n. c #E29452", +"o. c #EA9E58", +"p. c #C58A70", +"q. c #8E5442", +"r. c #6E3829", +"s. c #CD824B", +"t. c #C97A4A", +"u. c #8C4D30", +"v. c #AE7855", +"w. c #EBE8E6", +"x. c #B29281", +"y. c #A77962", +"z. c #A1735D", +"A. c #AA5C36", +"B. c #A56D56", +"C. c #C3835C", +"D. c #E5A068", +"E. c #85624F", +"F. c #575858", +"G. c #574136", +"H. c #A95F3A", +"I. c #854225", +"J. c #6E3823", +"K. c #DC843F", +"L. c #745749", +"M. c #090706", +"N. c #946954", +"O. c #733925", +"P. c #4D281E", +"Q. c #724A3C", +"R. c #95604A", +"S. c #74432C", +"T. c #DFA068", +"U. c #D98344", +"V. c #5C4539", +"W. c #B4714C", +"X. c #64311F", +"Y. c #522B21", +"Z. c #4B2A23", +"`. c #775846", +" + c #BE8554", +".+ c #A9542F", +"++ c #C19176", +"@+ c #A9AAAA", +"#+ c #4D3A30", +"$+ c #50281E", +"%+ c #673527", +"&+ c #9F735C", +"*+ c #59291F", +"=+ c #56271B", +"-+ c #E09B64", +";+ c #AA9184", +">+ c #9A583A", +",+ c #99512C", +"'+ c #C86F3C", +")+ c #D18956", +"!+ c #AC7B5E", +"~+ c #ECEBEB", +"{+ c #72594D", +"]+ c #984928", +"^+ c #88634C", +"/+ c #CB7E54", +"(+ c #684D3F", +"_+ c #DCDCDC", +" . + @ # $ % % % & * = - ; ", +" ; > = , ' ) ) ! ~ { ] ] ^ $ / ( _ ", +" ( = : < [ [ } | ) ~ 1 2 2 3 4 5 6 ( 7 ", +"_ ( 8 9 0 0 0 a b c d 4 | ! ~ 4 e f g g h _ ", +"> i j k l m n n o p q r s t u v w e ~ { x h 7 ", +"i y z A B C C C D o E q r d F v G w 4 u H 5 I ", +"J K K L L M N O D o m m P c Q R S G s t t T * U ", +"8 V W X X L N Y Z n k ` ...+.B @.#.S $.s %.5 / 7 ", +"&.*.=.=.W -.;.A >.y y ,.'.).!.~.{.M ].w $.) ! * ^. ", +"7 /.(.=._.~.K ;.K +.:.<.[.}.,.!.|.1.2.3.0 F 4.x 5. ", +" + 6.(.X X ~.-.7.L V !.8.9.0.a.b., 2.c.0 w v d.e. ", +" + = *.7._._.f.7.g.j h.i.` j.k.: l.m.3.3.n.o.e. ", +" 7 > p.q.r.r.:.` ` i.s.t.9.u.v.d.c.m.d.n.< e. ", +" w.x.y.z.(.g.A.j.` ).B.C.8.8.D.n., n.R n.E. ", +" F. G.y.H.I.J.(.<.z.'.l.l.m.9 K.K., d.L. ", +" M.N.9.O.P.Q.R.S.` T.m.m.m.U., d.8 V. ", +" E.W.X.Y.Z.`.v. +W..+m c.m.U.9 ++ ", +" @+ #+).J.$+P.P.%+O.X q m m ].a 8 `. ", +" &+B.*+Y.P.=+O.I.N ` t.m.-+z. ", +" ;+8 >+X.%+O.{.,+.+m '+)+!+ ", +" ~+{+[.W.]+]+]+@.1.t.l.^+ ", +" ^+C.,.,./+C.!+(+ ", +" _+ "}; --- nautilus-2.27.4.orig/debian/nautilus.1 +++ nautilus-2.27.4/debian/nautilus.1 @@ -0,0 +1,77 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH Nautilus 1 "24 May 2004" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +nautilus \- the GNOME File Manager +.SH SYNOPSIS +.B nautilus +.RI [ options ] " URIs" ... +.br +.SH DESCRIPTION +This manual page documents briefly the +.B nautilus +command. This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +Nautilus is the file manager for the GNOME desktop. +.br +.SH OPTIONS +Nautilus follows the usual GNU command line syntax, with long options starting +with two dashes (`-'). A summary of options is included below. +.TP +.B \-\-browser +Open a browser window. +.TP +.B \-c +.TP +.B \-\-check +Perform a quick set of self-check tests. +.TP +.B \-g +.TP +.B \-\-geometry=\fIGEOMETRY\fR +Create the initial window with the given geometry. +.TP +.B \-n +.TP +.B \-\-no-default-window +Only create windows for explicitly specified URIs. +.TP +.B \-\-no-desktop +Do not manage the desktop \(em ignore the preference set in the preferences +dialog. +.TP +.B \-q +.TP +.B \-\-quit +Quit Nautilus. +.TP +.B \-\-help +Show a summary of options. +.TP +.B \-\-version +Show Nautilus' version. +.TP +Other standard GNOME options not listed here are also supported. +.SH SEE ALSO +Nautilus documentation can be found from the "Help" menu, or by pressing the +F1 key. Nautilus also has a website at +http://www.gnome.org/projects/nautilus/ +.SH AUTHOR +This manual page was written by Takuo KITAME and Dafydd +Harries for the Debian GNU/Linux system (but may be used +by others). --- nautilus-2.27.4.orig/debian/patches/17_no_autorun_launcher.patch +++ nautilus-2.27.4/debian/patches/17_no_autorun_launcher.patch @@ -0,0 +1,24 @@ +Index: nautilus-2.26.0/data/nautilus-autorun-software.desktop.in +=================================================================== +--- nautilus-2.26.0.orig/data/nautilus-autorun-software.desktop.in 2009-04-01 11:15:32.000000000 +0200 ++++ nautilus-2.26.0/data/nautilus-autorun-software.desktop.in 2009-04-01 11:15:38.000000000 +0200 +@@ -5,6 +5,7 @@ + Exec=nautilus-autorun-software %u + Icon=application-x-executable + NoDisplay=true ++Hidden=true + Terminal=false + StartupNotify=true + Type=Application +Index: nautilus-2.26.0/data/nautilus-autorun-software.desktop.in.in +=================================================================== +--- nautilus-2.26.0.orig/data/nautilus-autorun-software.desktop.in.in 2009-04-01 11:15:32.000000000 +0200 ++++ nautilus-2.26.0/data/nautilus-autorun-software.desktop.in.in 2009-04-01 11:15:45.000000000 +0200 +@@ -5,6 +5,7 @@ + Exec=nautilus-autorun-software %u + Icon=application-x-executable + NoDisplay=true ++Hidden=true + Terminal=false + StartupNotify=true + Type=Application --- nautilus-2.27.4.orig/debian/patches/15_translations_list_update.patch +++ nautilus-2.27.4/debian/patches/15_translations_list_update.patch @@ -0,0 +1,15 @@ +# +# Description: translate the mount-archive menu entry +# +Index: nautilus-2.25.2/po/POTFILES.in +=================================================================== +--- nautilus-2.25.2.orig/po/POTFILES.in 2008-12-15 16:38:07.000000000 +0100 ++++ nautilus-2.25.2/po/POTFILES.in 2008-12-17 14:27:34.000000000 +0100 +@@ -5,6 +5,7 @@ + cut-n-paste-code/libegg/eggsmclient.c + data/browser.xml + data/nautilus.xml.in ++debian/mount-archive.desktop.in + eel/eel-alert-dialog.c + eel/eel-canvas.c + eel/eel-editable-label.c --- nautilus-2.27.4.orig/debian/patches/07_desktop_file_activation.patch +++ nautilus-2.27.4/debian/patches/07_desktop_file_activation.patch @@ -0,0 +1,112 @@ +Fixes two security issues about disguised .desktop files. +Debian #408556, GNOME #405291 +Debian #408948, GNOME #405052 +diff -Naur nautilus-2.22.0.old/libnautilus-private/nautilus-file.c nautilus-2.22.0/libnautilus-private/nautilus-file.c +--- nautilus-2.22.0.old/libnautilus-private/nautilus-file.c 2008-03-19 16:04:39.000000000 +0100 ++++ nautilus-2.22.0/libnautilus-private/nautilus-file.c 2008-03-19 16:06:54.000000000 +0100 +@@ -41,6 +41,7 @@ + #include "nautilus-link.h" + #include "nautilus-metadata.h" + #include "nautilus-module.h" ++#include "nautilus-program-choosing.h" + #include "nautilus-search-directory.h" + #include "nautilus-search-directory-file.h" + #include "nautilus-thumbnails.h" +@@ -1084,6 +1085,46 @@ + return g_file_get_child (dir, eel_ref_str_peek (file->details->name)); + } + ++static gboolean ++safe_to_launch_desktop_file (NautilusFile *file) ++{ ++ gboolean ret = TRUE; ++ GFile *uri = nautilus_file_get_location (file); ++ char *path = NULL; ++ char *scheme = NULL; ++ ++ if (uri) { ++ path = g_file_get_parse_name (uri); ++ } ++ ++ if (!path || ++ eel_str_has_prefix (path, "/mnt") || ++ eel_str_has_prefix (path, "/media") || ++ !eel_str_has_suffix (path, ".desktop")) { ++ ret = FALSE; ++ } ++ ++ scheme = g_file_get_uri_scheme (file); ++ if (scheme != NULL && strncmp (scheme, "file://", 7) == 0) { ++ char *path_tmp = path + 7; ++ ++ if (eel_str_has_prefix (path, "/mnt") || ++ eel_str_has_prefix (path, "/media")) { ++ ret = FALSE; ++ } ++ } ++ g_free (scheme); ++ ++ if (file->details->uid != -1 && ++ file->details->uid != 0 && ++ (uid_t) file->details->uid != geteuid ()) ++ ret = FALSE; ++ ++ g_object_unref (uri); ++ g_free (path); ++ return ret; ++} ++ + /* Return the actual uri associated with the passed-in file. */ + char * + nautilus_file_get_uri (NautilusFile *file) +@@ -3053,7 +3094,8 @@ + { + g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL); + +- if (file->details->activation_location != NULL) { ++ if (file->details->activation_location != NULL && ++ safe_to_launch_desktop_file (file)) { + return g_file_get_uri (file->details->activation_location); + } + +@@ -3065,7 +3107,8 @@ + { + g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL); + +- if (file->details->activation_location != NULL) { ++ if (file->details->activation_location != NULL && ++ safe_to_launch_desktop_file (file)) { + return g_object_ref (file->details->activation_location); + } + +diff -Naur nautilus-2.22.0.old/libnautilus-private/nautilus-mime-actions.c nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c +--- nautilus-2.22.0.old/libnautilus-private/nautilus-mime-actions.c 2008-03-19 16:04:39.000000000 +0100 ++++ nautilus-2.22.0/libnautilus-private/nautilus-mime-actions.c 2008-03-19 16:04:48.000000000 +0100 +@@ -727,7 +727,8 @@ + { + return (nautilus_file_is_directory (file) || + NAUTILUS_IS_DESKTOP_ICON_FILE (file) || +- nautilus_file_is_nautilus_link (file)); ++ (nautilus_file_is_nautilus_link (file) && ++ !nautilus_file_is_launcher (file))); + } + + static ActivationAction +diff -Naur nautilus-2.22.0.old/src/file-manager/fm-directory-view.c nautilus-2.22.0/src/file-manager/fm-directory-view.c +--- nautilus-2.22.0.old/src/file-manager/fm-directory-view.c 2008-03-19 16:04:39.000000000 +0100 ++++ nautilus-2.22.0/src/file-manager/fm-directory-view.c 2008-03-19 16:04:48.000000000 +0100 +@@ -4264,9 +4264,11 @@ + + file = NAUTILUS_FILE (node->data); + +- other_applications_visible &= +- (!nautilus_mime_file_opens_in_view (file) || +- nautilus_file_is_directory (file)); ++ if (nautilus_mime_file_opens_in_external_app (file) && ++ (NAUTILUS_IS_DESKTOP_ICON_FILE (file) || ++ nautilus_file_is_nautilus_link (file))) { ++ other_applications_visible = FALSE; ++ } + } + + default_app = NULL; --- nautilus-2.27.4.orig/debian/patches/series +++ nautilus-2.27.4/debian/patches/series @@ -0,0 +1,16 @@ +01_lpi.patch +02_autoconf.patch +03_menu_entry.patch +#10_location_titlebar.patch +01_manpage.patch +02_eel_libadd.patch +10_load_session.patch +11_restart_mode.patch +12_list-view_expand.patch +15_translations_list_update.patch +17_no_autorun_launcher.patch +80_suppress_umount_in_ltsp.patch +82_gnome-app-install.patch +90_relibtoolize.patch +95_no-initial-fade.patch +99_ltmain_as-needed.patch --- nautilus-2.27.4.orig/debian/patches/95_no-initial-fade.patch +++ nautilus-2.27.4/debian/patches/95_no-initial-fade.patch @@ -0,0 +1,17 @@ +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=575964 +# Patch: http://bugzilla.gnome.org/attachment.cgi?id=130970&action=view +# Description: remove initial background fade-in +# +Index: nautilus-2.27.4/eel/eel-background.c +=================================================================== +--- nautilus-2.27.4.orig/eel/eel-background.c 2009-06-25 00:00:10.000000000 +1000 ++++ nautilus-2.27.4/eel/eel-background.c 2009-07-14 16:14:26.000000000 +1000 +@@ -899,8 +899,6 @@ + } else { + background->details->use_common_pixmap = FALSE; + } +- +- init_fade (background, widget); + } + } + --- nautilus-2.27.4.orig/debian/patches/82_gnome-app-install.patch +++ nautilus-2.27.4/debian/patches/82_gnome-app-install.patch @@ -0,0 +1,45 @@ +Index: nautilus-2.27.4/libnautilus-private/nautilus-mime-actions.c +=================================================================== +--- nautilus-2.27.4.orig/libnautilus-private/nautilus-mime-actions.c 2009-07-14 05:47:03.000000000 +1000 ++++ nautilus-2.27.4/libnautilus-private/nautilus-mime-actions.c 2009-07-14 16:08:11.000000000 +1000 +@@ -1377,6 +1377,27 @@ + g_object_unref (proxy); + } + ++void launch_gnome_app_install_mimetype(GdkScreen *screen, ++ NautilusFile *file, ++ char *uri) { ++ char *qmimetype, *quri, *qduri, *command; ++ if (!screen) ++ screen = gdk_display_get_default_screen(gdk_display_get_default ()); ++ ++ qmimetype = g_shell_quote (nautilus_file_info_get_mime_type (file)); ++ quri = g_shell_quote (uri); ++ command = g_strconcat("gnome-app-install --mime-type=", ++ qmimetype, " ", quri, ++ (char*)0 /* NB NULL is wrong */); ++ g_free (qmimetype); ++ g_free (quri); ++ g_free (qduri); ++ ++ //eel_gnome_shell_execute_on_screen (command, screen); ++ gdk_spawn_command_line_on_screen (screen, command, NULL); ++ g_free (command); ++} ++ + static void + application_unhandled_uri (ActivateParameters *parameters, char *uri) + { +@@ -1425,6 +1446,12 @@ + goto out; + } + ++ // try g-a-i now ++ if (g_find_program_in_path("gnome-app-install")) { ++ launch_gnome_app_install_mimetype(NULL, file, uri); ++ goto out; ++ } ++ + /* Check whether PackageKit can be spawned */ + connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + if (connection == NULL) { --- nautilus-2.27.4.orig/debian/patches/10_rename_desktop.patch +++ nautilus-2.27.4/debian/patches/10_rename_desktop.patch @@ -0,0 +1,13 @@ +# Ubuntu: https://launchpad.net/bugs/39002 +# Description: renaming change due to language packs +# UbuntuSpecific: the change is due to the ubuntu gettext desktop changes +--- nautilus-2.21.1.orig/libnautilus-private/nautilus-link.c 2008-01-07 15:33:24.000000000 +0100 ++++ nautilus-2.21.1/libnautilus-private/nautilus-link.c 2008-01-07 15:33:46.000000000 +0100 +@@ -250,6 +250,7 @@ + } + + gnome_desktop_item_set_localestring (desktop_file, "Name", text); ++ gnome_desktop_item_set_string (desktop_file, "Name", text); + success = gnome_desktop_item_save (desktop_file, NULL, FALSE, NULL); + gnome_desktop_item_unref (desktop_file); + --- nautilus-2.27.4.orig/debian/patches/01_manpage.patch +++ nautilus-2.27.4/debian/patches/01_manpage.patch @@ -0,0 +1,13 @@ +Index: nautilus-2.24.1/docs/nautilus-connect-server.1 +=================================================================== +--- nautilus-2.24.1.orig/docs/nautilus-connect-server.1 2008-11-24 00:03:41.626383939 +0100 ++++ nautilus-2.24.1/docs/nautilus-connect-server.1 2008-11-24 00:03:50.316281888 +0100 +@@ -16,7 +16,7 @@ + .\" .sp insert n+1 empty lines + .\" for manpage-specific macros, see man(7) + .SH NAME +-Nautilus Connect Server \- To Access a remote server ++nautilus-connect-server \- To Access a remote server + .SH SYNOPSIS + .B nautilus-connect-server + .RI [ options ] --- nautilus-2.27.4.orig/debian/patches/99_ltmain_as-needed.patch +++ nautilus-2.27.4/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,32 @@ +Index: nautilus-2.26.2/ltmain.sh +=================================================================== +--- nautilus-2.26.2.orig/ltmain.sh 2009-04-25 00:42:44.377917286 +0200 ++++ nautilus-2.26.2/ltmain.sh 2009-04-25 00:42:45.637415968 +0200 +@@ -4716,6 +4716,11 @@ func_mode_link () + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -5070,6 +5075,15 @@ func_mode_link () + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- nautilus-2.27.4.orig/debian/patches/90_relibtoolize.patch +++ nautilus-2.27.4/debian/patches/90_relibtoolize.patch @@ -0,0 +1,6656 @@ +Index: nautilus-2.27.4/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/Makefile.in 2009-07-14 16:12:18.000000000 +1000 ++++ nautilus-2.27.4/Makefile.in 2009-07-14 16:12:39.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,9 +15,8 @@ + @SET_MAKE@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -53,7 +51,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -65,9 +62,6 @@ + ps-recursive uninstall-recursive + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir dist dist-all distcheck + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) +@@ -75,34 +69,9 @@ + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) + am__remove_distdir = \ +- { test ! -d "$(distdir)" \ +- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ +- && rm -fr "$(distdir)"; }; } +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" ++ { test ! -d $(distdir) \ ++ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ ++ && rm -fr $(distdir); }; } + DIST_ARCHIVES = $(distdir).tar.gz + GZIP_ENV = --best + distuninstallcheck_listfiles = find . -type f -print +@@ -350,15 +319,15 @@ + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ +- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ +- $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ ++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ ++ cd $(srcdir) && $(AUTOMAKE) --gnu \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -374,10 +343,9 @@ + $(SHELL) ./config.status --recheck + + $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) +- $(am__cd) $(srcdir) && $(AUTOCONF) ++ cd $(srcdir) && $(AUTOCONF) + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) +- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +-$(am__aclocal_m4_deps): ++ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + + config.h: stamp-h1 + @if test ! -f $@; then \ +@@ -389,7 +357,7 @@ + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(top_srcdir)/acconfig.h +- ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) ++ cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + +@@ -429,7 +397,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -463,16 +431,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -487,7 +455,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -499,7 +467,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ +@@ -508,41 +476,36 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) + $(am__remove_distdir) +- test -d "$(distdir)" || mkdir "$(distdir)" ++ test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -558,54 +521,38 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ +- am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +- -test -n "$(am__skip_mode_fix)" \ +- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ++ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ +- || chmod -R a+r "$(distdir)" ++ || chmod -R a+r $(distdir) + dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +@@ -618,10 +565,6 @@ + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + +-dist-xz: distdir +- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz +- $(am__remove_distdir) +- + dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) +@@ -650,8 +593,6 @@ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ +- *.tar.xz*) \ +- xz -dc $(distdir).tar.xz | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ +@@ -663,11 +604,9 @@ + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) +- test -d $(distdir)/_build || exit 0; \ + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ +- && am__cwd=`pwd` \ +- && $(am__cd) $(distdir)/_build \ ++ && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ +@@ -689,15 +628,13 @@ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ +- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ +- && cd "$$am__cwd" \ +- || exit 1 ++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' + distuninstallcheck: +- @$(am__cd) '$(distuninstallcheck_dir)' \ ++ @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ +@@ -739,7 +676,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -761,8 +697,6 @@ + + html: html-recursive + +-html-am: +- + info: info-recursive + + info-am: +@@ -771,28 +705,18 @@ + + install-dvi: install-dvi-recursive + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-recursive + +-install-html-am: +- + install-info: install-info-recursive + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-recursive + +-install-pdf-am: +- + install-ps: install-ps-recursive + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -815,25 +739,24 @@ + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ +- ctags-recursive install-am install-strip tags-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ +- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \ +- distcheck distclean distclean-generic distclean-hdr \ +- distclean-libtool distclean-local distclean-tags \ +- distcleancheck distdir distuninstallcheck dvi dvi-am html \ +- html-am info info-am install install-am install-data \ +- install-data-am install-dvi install-dvi-am install-exec \ +- install-exec-am install-html install-html-am install-info \ +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip installcheck \ +- installcheck-am installdirs installdirs-am maintainer-clean \ +- maintainer-clean-generic mostlyclean mostlyclean-generic \ +- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ +- uninstall uninstall-am ++ dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ ++ distclean distclean-generic distclean-hdr distclean-libtool \ ++ distclean-local distclean-tags distcleancheck distdir \ ++ distuninstallcheck dvi dvi-am html html-am info info-am \ ++ install install-am install-data install-data-am install-dvi \ ++ install-dvi-am install-exec install-exec-am install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip installcheck installcheck-am installdirs \ ++ installdirs-am maintainer-clean maintainer-clean-generic \ ++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ++ ps ps-am tags tags-recursive uninstall uninstall-am + + + distclean-local: +@@ -856,7 +779,6 @@ + fi + + .PHONY: ChangeLog +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/aclocal.m4 +=================================================================== +--- nautilus-2.27.4.orig/aclocal.m4 2009-07-14 16:12:21.000000000 +1000 ++++ nautilus-2.27.4/aclocal.m4 2009-07-14 16:12:33.000000000 +1000 +@@ -1,7 +1,7 @@ +-# generated automatically by aclocal 1.11 -*- Autoconf -*- ++# generated automatically by aclocal 1.10.2 -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -597,14 +597,16 @@ + # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) + # --------------------------------------------- + m4_define([_PKG_CONFIG], +-[if test -n "$$1"; then +- pkg_cv_[]$1="$$1" +- elif test -n "$PKG_CONFIG"; then +- PKG_CHECK_EXISTS([$3], +- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], +- [pkg_failed=yes]) +- else +- pkg_failed=untried ++[if test -n "$PKG_CONFIG"; then ++ if test -n "$$1"; then ++ pkg_cv_[]$1="$$1" ++ else ++ PKG_CHECK_EXISTS([$3], ++ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], ++ [pkg_failed=yes]) ++ fi ++else ++ pkg_failed=untried + fi[]dnl + ])# _PKG_CONFIG + +@@ -648,9 +650,9 @@ + if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +@@ -697,10 +699,10 @@ + # generated from the m4 files accompanying Automake X.Y. + # (This private macro should not be called outside this file.) + AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.11' ++[am__api_version='1.10' + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to + dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11], [], ++m4_if([$1], [1.10.2], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + ]) + +@@ -716,7 +718,7 @@ + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11])dnl ++[AM_AUTOMAKE_VERSION([1.10.2])dnl + m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +@@ -776,14 +778,14 @@ + + # AM_CONDITIONAL -*- Autoconf -*- + +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 9 ++# serial 8 + + # AM_CONDITIONAL(NAME, SHELL-CONDITION) + # ------------------------------------- +@@ -796,7 +798,6 @@ + AC_SUBST([$1_FALSE])dnl + _AM_SUBST_NOTMAKE([$1_TRUE])dnl + _AM_SUBST_NOTMAKE([$1_FALSE])dnl +-m4_define([_AM_COND_VALUE_$1], [$2])dnl + if $2; then + $1_TRUE= + $1_FALSE='#' +@@ -810,14 +811,14 @@ + Usually this means the macro was only invoked conditionally.]]) + fi])]) + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 10 ++# serial 9 + + # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be + # written in clear, in which case automake, when reading aclocal.m4, +@@ -874,16 +875,6 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi +- am__universal=false +- m4_case([$1], [CC], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac], +- [CXX], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac]) +- + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -901,17 +892,7 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" + case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -921,23 +902,19 @@ + break + fi + ;; +- msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; + none) break ;; + esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -1075,13 +1052,13 @@ + # Do all the work for Automake. -*- Autoconf -*- + + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. ++# 2005, 2006, 2008 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 16 ++# serial 13 + + # This macro actually does too much. Some checks are only needed if + # your package does certain things. But this isn't really a big deal. +@@ -1098,7 +1075,7 @@ + # arguments mandatory, and then we can depend on a new Autoconf + # release and drop the old call support. + AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.62])dnl ++[AC_PREREQ([2.60])dnl + dnl Autoconf wants to disallow AM_ names. We explicitly allow + dnl the ones we care about. + m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +@@ -1149,8 +1126,8 @@ + AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) + AM_MISSING_PROG(AUTOHEADER, autoheader) + AM_MISSING_PROG(MAKEINFO, makeinfo) +-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl ++AM_PROG_INSTALL_SH ++AM_PROG_INSTALL_STRIP + AC_REQUIRE([AM_PROG_MKDIR_P])dnl + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. +@@ -1158,37 +1135,24 @@ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AM_SET_LEADING_DOT])dnl + _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) + _AM_IF_OPTION([no-dependencies],, + [AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + ]) +-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +-AC_CONFIG_COMMANDS_PRE(dnl +-[m4_provide_if([_AM_COMPILER_EXEEXT], +- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + ]) + +-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +-dnl mangled by Autoconf and run in a shell conditional statement. +-m4_define([_AC_COMPILER_EXEEXT], +-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +- + + # When config.status generates a header, we must update the stamp-h file. + # This file resides in the same directory as the config header +@@ -1211,7 +1175,7 @@ + done + echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, +@@ -1222,14 +1186,7 @@ + # Define $install_sh. + AC_DEFUN([AM_PROG_INSTALL_SH], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac +-fi ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + AC_SUBST(install_sh)]) + + # Copyright (C) 2003, 2005 Free Software Foundation, Inc. +@@ -1256,38 +1213,27 @@ + # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- + # From Jim Meyering + +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# serial 4 + +-# AM_MAINTAINER_MODE([DEFAULT-MODE]) +-# ---------------------------------- +-# Control maintainer-specific portions of Makefiles. +-# Default is to disable them, unless `enable' is passed literally. +-# For symmetry, `disable' may be passed as well. Anyway, the user +-# can override the default with the --enable/--disable switch. + AC_DEFUN([AM_MAINTAINER_MODE], +-[m4_case(m4_default([$1], [disable]), +- [enable], [m4_define([am_maintainer_other], [disable])], +- [disable], [m4_define([am_maintainer_other], [enable])], +- [m4_define([am_maintainer_other], [enable]) +- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +- dnl maintainer-mode's default is 'disable' unless 'enable' is passed +- AC_ARG_ENABLE([maintainer-mode], +-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful ++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode is disabled by default ++ AC_ARG_ENABLE(maintainer-mode, ++[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], +- [USE_MAINTAINER_MODE=$enableval], +- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ USE_MAINTAINER_MODE=$enableval, ++ USE_MAINTAINER_MODE=no) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++ AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST([MAINT])dnl ++ AC_SUBST(MAINT)dnl + ] + ) + +@@ -1295,13 +1241,13 @@ + + # Check to see how 'make' treats includes. -*- Autoconf -*- + +-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. ++# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 4 ++# serial 3 + + # AM_MAKE_INCLUDE() + # ----------------- +@@ -1310,7 +1256,7 @@ + [am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo this is the am__doit target ++ @echo done + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +@@ -1320,24 +1266,24 @@ + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi + fi + AC_SUBST([am__include]) + AC_SUBST([am__quote]) +@@ -1347,14 +1293,14 @@ + + # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 6 ++# serial 5 + + # AM_MISSING_PROG(NAME, PROGRAM) + # ------------------------------ +@@ -1371,14 +1317,7 @@ + AC_DEFUN([AM_MISSING_HAS_RUN], + [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl + AC_REQUIRE_AUX_FILE([missing])dnl +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +@@ -1466,14 +1405,14 @@ + + # Check to make sure that the build environment is sane. -*- Autoconf -*- + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 + # Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 5 ++# serial 4 + + # AM_SANITY_CHECK + # --------------- +@@ -1482,29 +1421,16 @@ + # Just in case + sleep 1 + echo timestamp > conftest.file +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[[\\\"\#\$\&\'\`$am_lf]]*) +- AC_MSG_ERROR([unsafe absolute working directory name]);; +-esac +-case $srcdir in +- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) +- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +-esac +- + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` ++ set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ +@@ -1557,25 +1483,18 @@ + INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +-# Copyright (C) 2006, 2008 Free Software Foundation, Inc. ++# Copyright (C) 2006 Free Software Foundation, Inc. + # + # This file is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. + +-# serial 2 +- + # _AM_SUBST_NOTMAKE(VARIABLE) + # --------------------------- + # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. + # This macro is traced by Automake. + AC_DEFUN([_AM_SUBST_NOTMAKE]) + +-# AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Public sister of _AM_SUBST_NOTMAKE. +-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +- + # Check how to create a tarball. -*- Autoconf -*- + + # Copyright (C) 2004, 2005 Free Software Foundation, Inc. +Index: nautilus-2.27.4/configure +=================================================================== +--- nautilus-2.27.4.orig/configure 2009-07-14 16:12:21.000000000 +1000 ++++ nautilus-2.27.4/configure 2009-07-14 16:12:36.000000000 +1000 +@@ -786,9 +786,7 @@ + # include + #endif" + +-ac_subst_vars='am__EXEEXT_FALSE +-am__EXEEXT_TRUE +-LTLIBOBJS ++ac_subst_vars='LTLIBOBJS + LIBOBJS + Q + V +@@ -2222,7 +2220,7 @@ + + + +-am__api_version='1.11' ++am__api_version='1.10' + + ac_aux_dir= + for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +@@ -2353,33 +2351,16 @@ + # Just in case + sleep 1 + echo timestamp > conftest.file +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[\\\"\#\$\&\'\`$am_lf]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5 +-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;} +- { (exit 1); exit 1; }; };; +-esac +-case $srcdir in +- *[\\\"\#\$\&\'\`$am_lf\ \ ]*) +- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5 +-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;} +- { (exit 1); exit 1; }; };; +-esac +- + # Do `set' in a subshell so we don't clobber the current shell's + # arguments. Must try -L first in case configure is actually a + # symlink; some systems play weird games with the mod time of symlinks + # (eg FreeBSD returns the mod time of the symlink's containing + # directory). + if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` ++ set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ +@@ -2423,14 +2404,7 @@ + # expand $ac_aux_dir to an absolute path + am_aux_dir=`cd $ac_aux_dir && pwd` + +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi ++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" + # Use eval to expand $SHELL + if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +@@ -2440,115 +2414,6 @@ + $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac +-fi +- +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-if test "$cross_compiling" != no; then +- if test -n "$ac_tool_prefix"; then +- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +-set dummy ${ac_tool_prefix}strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$STRIP"; then +- ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_STRIP="${ac_tool_prefix}strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-STRIP=$ac_cv_prog_STRIP +-if test -n "$STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +-$as_echo "$STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-fi +-if test -z "$ac_cv_prog_STRIP"; then +- ac_ct_STRIP=$STRIP +- # Extract the first word of "strip", so it can be a program name with args. +-set dummy strip; ac_word=$2 +-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then +- $as_echo_n "(cached) " >&6 +-else +- if test -n "$ac_ct_STRIP"; then +- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +-else +-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_prog_ac_ct_STRIP="strip" +- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +-done +-IFS=$as_save_IFS +- +-fi +-fi +-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +-if test -n "$ac_ct_STRIP"; then +- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +-$as_echo "$ac_ct_STRIP" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- if test "x$ac_ct_STRIP" = x; then +- STRIP=":" +- else +- case $cross_compiling:$ac_tool_warned in +-yes:) +-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +-ac_tool_warned=yes ;; +-esac +- STRIP=$ac_ct_STRIP +- fi +-else +- STRIP="$ac_cv_prog_STRIP" +-fi +- +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +- + { $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 + $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + if test -z "$MKDIR_P"; then +@@ -2731,6 +2596,108 @@ + + MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + ++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} ++ ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++if test "$cross_compiling" != no; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. ++set dummy ${ac_tool_prefix}strip; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_STRIP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$STRIP"; then ++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_STRIP="${ac_tool_prefix}strip" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++STRIP=$ac_cv_prog_STRIP ++if test -n "$STRIP"; then ++ { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 ++$as_echo "$STRIP" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_STRIP"; then ++ ac_ct_STRIP=$STRIP ++ # Extract the first word of "strip", so it can be a program name with args. ++set dummy strip; ac_word=$2 ++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_STRIP"; then ++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_STRIP="strip" ++ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP ++if test -n "$ac_ct_STRIP"; then ++ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 ++$as_echo "$ac_ct_STRIP" >&6; } ++else ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_STRIP" = x; then ++ STRIP=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ STRIP=$ac_ct_STRIP ++ fi ++else ++ STRIP="$ac_cv_prog_STRIP" ++fi ++ ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++ + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + # Always define AMTAR for backward compatibility. +@@ -2824,7 +2791,6 @@ + + + +- + { $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 + $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +@@ -2873,7 +2839,7 @@ + am_make=${MAKE-make} + cat > confinc << 'END' + am__doit: +- @echo this is the am__doit target ++ @echo done + .PHONY: am__doit + END + # If we don't find an include directive, just comment out the code. +@@ -2884,24 +2850,24 @@ + _am_result=none + # First try GNU make style include. + echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac ++# We grep out `Entering directory' and `Leaving directory' ++# messages which can occur if `w' ends up in MAKEFLAGS. ++# In particular we don't look at `^make:' because GNU make might ++# be invoked under some other name (usually "gmake"), in which ++# case it prints its new name instead of `make'. ++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then ++ am__include=include ++ am__quote= ++ _am_result=GNU ++fi + # Now try BSD make style include. + if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac ++ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ fi + fi + + +@@ -3890,11 +3856,6 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi +- am__universal=false +- case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac +- + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -3912,17 +3873,7 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" + case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -3932,23 +3883,19 @@ + break + fi + ;; +- msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; + none) break ;; + esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -5836,11 +5783,6 @@ + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi +- am__universal=false +- case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac +- + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and +@@ -5858,17 +5800,7 @@ + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" + case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested +@@ -5878,23 +5810,19 @@ + break + fi + ;; +- msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; + none) break ;; + esac ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. + if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ ++ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message +@@ -7206,13 +7134,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:7209: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:7137: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:7212: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:7140: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:7215: output\"" >&5) ++ (eval echo "\"\$as_me:7143: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7668,7 +7596,7 @@ + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -8403,7 +8331,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 8406 "configure"' > conftest.$ac_ext ++ echo '#line 8334 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -9740,11 +9668,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9743: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9671: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:9747: \$? = $ac_status" >&5 ++ echo "$as_me:9675: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -10079,11 +10007,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10082: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10010: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:10086: \$? = $ac_status" >&5 ++ echo "$as_me:10014: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -10184,11 +10112,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10187: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10115: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10191: \$? = $ac_status" >&5 ++ echo "$as_me:10119: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10239,11 +10167,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:10242: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:10170: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:10246: \$? = $ac_status" >&5 ++ echo "$as_me:10174: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -10358,6 +10286,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -10540,7 +10471,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -10715,6 +10646,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -11129,7 +11061,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -12091,13 +12023,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -12109,6 +12038,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -13042,7 +12983,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 13045 "configure" ++#line 12986 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -13138,7 +13079,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 13141 "configure" ++#line 13082 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -13528,10 +13469,11 @@ + { $as_echo "$as_me:$LINENO: checking for ALL" >&5 + $as_echo_n "checking for ALL... " >&6; } + +-if test -n "$ALL_CFLAGS"; then +- pkg_cv_ALL_CFLAGS="$ALL_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$ALL_CFLAGS"; then ++ pkg_cv_ALL_CFLAGS="$ALL_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= 2.21.3 + gnome-desktop-2.0 >= 2.25.5 +@@ -13577,13 +13519,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$ALL_LIBS"; then +- pkg_cv_ALL_LIBS="$ALL_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$ALL_LIBS"; then ++ pkg_cv_ALL_LIBS="$ALL_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= 2.21.3 + gnome-desktop-2.0 >= 2.25.5 +@@ -13629,8 +13573,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -13643,7 +13588,7 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- ALL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors " ++ ALL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " + glib-2.0 >= 2.21.3 + gnome-desktop-2.0 >= 2.25.5 + gthread-2.0 +@@ -13655,9 +13600,9 @@ + gail >= 0.16 + unique-1.0 + dbus-glib-1 +-" 2>&1` ++"` + else +- ALL_PKG_ERRORS=`$PKG_CONFIG --print-errors " ++ ALL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + glib-2.0 >= 2.21.3 + gnome-desktop-2.0 >= 2.25.5 + gthread-2.0 +@@ -13669,7 +13614,7 @@ + gail >= 0.16 + unique-1.0 + dbus-glib-1 +-" 2>&1` ++"` + fi + # Put the nasty error message in config.log where it belongs + echo "$ALL_PKG_ERRORS" >&5 +@@ -18042,10 +17987,11 @@ + { $as_echo "$as_me:$LINENO: checking for EXIF" >&5 + $as_echo_n "checking for EXIF... " >&6; } + +-if test -n "$EXIF_CFLAGS"; then +- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXIF_CFLAGS"; then ++ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libexif > 0.5.12") 2>&5 + ac_status=$? +@@ -18055,13 +18001,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$EXIF_LIBS"; then +- pkg_cv_EXIF_LIBS="$EXIF_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXIF_LIBS"; then ++ pkg_cv_EXIF_LIBS="$EXIF_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif > 0.5.12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libexif > 0.5.12") 2>&5 + ac_status=$? +@@ -18071,8 +18019,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18085,9 +18034,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif > 0.5.12" 2>&1` ++ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif > 0.5.12"` + else +- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif > 0.5.12" 2>&1` ++ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif > 0.5.12"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EXIF_PKG_ERRORS" >&5 +@@ -18100,10 +18049,11 @@ + { $as_echo "$as_me:$LINENO: checking for EXIF" >&5 + $as_echo_n "checking for EXIF... " >&6; } + +-if test -n "$EXIF_CFLAGS"; then +- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXIF_CFLAGS"; then ++ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5 + ac_status=$? +@@ -18113,13 +18063,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$EXIF_LIBS"; then +- pkg_cv_EXIF_LIBS="$EXIF_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXIF_LIBS"; then ++ pkg_cv_EXIF_LIBS="$EXIF_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5 + ac_status=$? +@@ -18129,8 +18081,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18143,9 +18096,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif = 0.5.12" 2>&1` ++ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif = 0.5.12"` + else +- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif = 0.5.12" 2>&1` ++ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif = 0.5.12"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EXIF_PKG_ERRORS" >&5 +@@ -18198,10 +18151,11 @@ + { $as_echo "$as_me:$LINENO: checking for EXIF" >&5 + $as_echo_n "checking for EXIF... " >&6; } + +-if test -n "$EXIF_CFLAGS"; then +- pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXIF_CFLAGS"; then ++ pkg_cv_EXIF_CFLAGS="$EXIF_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5 + ac_status=$? +@@ -18211,13 +18165,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$EXIF_LIBS"; then +- pkg_cv_EXIF_LIBS="$EXIF_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXIF_LIBS"; then ++ pkg_cv_EXIF_LIBS="$EXIF_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexif = 0.5.12\"") >&5 + ($PKG_CONFIG --exists --print-errors "libexif = 0.5.12") 2>&5 + ac_status=$? +@@ -18227,8 +18183,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18241,9 +18198,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libexif = 0.5.12" 2>&1` ++ EXIF_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libexif = 0.5.12"` + else +- EXIF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libexif = 0.5.12" 2>&1` ++ EXIF_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libexif = 0.5.12"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EXIF_PKG_ERRORS" >&5 +@@ -18337,10 +18294,11 @@ + { $as_echo "$as_me:$LINENO: checking for EXEMPI" >&5 + $as_echo_n "checking for EXEMPI... " >&6; } + +-if test -n "$EXEMPI_CFLAGS"; then +- pkg_cv_EXEMPI_CFLAGS="$EXEMPI_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXEMPI_CFLAGS"; then ++ pkg_cv_EXEMPI_CFLAGS="$EXEMPI_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.2") 2>&5 + ac_status=$? +@@ -18350,13 +18308,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$EXEMPI_LIBS"; then +- pkg_cv_EXEMPI_LIBS="$EXEMPI_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXEMPI_LIBS"; then ++ pkg_cv_EXEMPI_LIBS="$EXEMPI_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.2\"") >&5 + ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.2") 2>&5 + ac_status=$? +@@ -18366,8 +18326,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18380,9 +18341,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exempi-2.0 >= 1.99.2" 2>&1` ++ EXEMPI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.2"` + else +- EXEMPI_PKG_ERRORS=`$PKG_CONFIG --print-errors "exempi-2.0 >= 1.99.2" 2>&1` ++ EXEMPI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EXEMPI_PKG_ERRORS" >&5 +@@ -18434,10 +18395,11 @@ + { $as_echo "$as_me:$LINENO: checking for EXEMPI_NEW_API" >&5 + $as_echo_n "checking for EXEMPI_NEW_API... " >&6; } + +-if test -n "$EXEMPI_NEW_API_CFLAGS"; then +- pkg_cv_EXEMPI_NEW_API_CFLAGS="$EXEMPI_NEW_API_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXEMPI_NEW_API_CFLAGS"; then ++ pkg_cv_EXEMPI_NEW_API_CFLAGS="$EXEMPI_NEW_API_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\"") >&5 + ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.5") 2>&5 + ac_status=$? +@@ -18447,13 +18409,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$EXEMPI_NEW_API_LIBS"; then +- pkg_cv_EXEMPI_NEW_API_LIBS="$EXEMPI_NEW_API_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$EXEMPI_NEW_API_LIBS"; then ++ pkg_cv_EXEMPI_NEW_API_LIBS="$EXEMPI_NEW_API_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"exempi-2.0 >= 1.99.5\"") >&5 + ($PKG_CONFIG --exists --print-errors "exempi-2.0 >= 1.99.5") 2>&5 + ac_status=$? +@@ -18463,8 +18427,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18477,9 +18442,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "exempi-2.0 >= 1.99.5" 2>&1` ++ EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.5"` + else +- EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --print-errors "exempi-2.0 >= 1.99.5" 2>&1` ++ EXEMPI_NEW_API_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "exempi-2.0 >= 1.99.5"` + fi + # Put the nasty error message in config.log where it belongs + echo "$EXEMPI_NEW_API_PKG_ERRORS" >&5 +@@ -18528,10 +18493,11 @@ + { $as_echo "$as_me:$LINENO: checking for TRACKER" >&5 + $as_echo_n "checking for TRACKER... " >&6; } + +-if test -n "$TRACKER_CFLAGS"; then +- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$TRACKER_CFLAGS"; then ++ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "tracker >= 0.0.1") 2>&5 + ac_status=$? +@@ -18541,13 +18507,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$TRACKER_LIBS"; then +- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$TRACKER_LIBS"; then ++ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.0.1\"") >&5 + ($PKG_CONFIG --exists --print-errors "tracker >= 0.0.1") 2>&5 + ac_status=$? +@@ -18557,8 +18525,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18571,9 +18540,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker >= 0.0.1" 2>&1` ++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker >= 0.0.1"` + else +- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker >= 0.0.1" 2>&1` ++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker >= 0.0.1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$TRACKER_PKG_ERRORS" >&5 +@@ -18654,10 +18623,11 @@ + { $as_echo "$as_me:$LINENO: checking for BEAGLE" >&5 + $as_echo_n "checking for BEAGLE... " >&6; } + +-if test -n "$BEAGLE_CFLAGS"; then +- pkg_cv_BEAGLE_CFLAGS="$BEAGLE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BEAGLE_CFLAGS"; then ++ pkg_cv_BEAGLE_CFLAGS="$BEAGLE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BEAGLE_PKGCONFIG >= 0.2.4\"") >&5 + ($PKG_CONFIG --exists --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4") 2>&5 + ac_status=$? +@@ -18667,13 +18637,15 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$BEAGLE_LIBS"; then +- pkg_cv_BEAGLE_LIBS="$BEAGLE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$BEAGLE_LIBS"; then ++ pkg_cv_BEAGLE_LIBS="$BEAGLE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$BEAGLE_PKGCONFIG >= 0.2.4\"") >&5 + ($PKG_CONFIG --exists --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4") 2>&5 + ac_status=$? +@@ -18683,8 +18655,9 @@ + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -18697,9 +18670,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4" 2>&1` ++ BEAGLE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4"` + else +- BEAGLE_PKG_ERRORS=`$PKG_CONFIG --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4" 2>&1` ++ BEAGLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$BEAGLE_PKGCONFIG >= 0.2.4"` + fi + # Put the nasty error message in config.log where it belongs + echo "$BEAGLE_PKG_ERRORS" >&5 +@@ -19881,14 +19854,6 @@ + LTLIBOBJS=$ac_ltlibobjs + + +- if test -n "$EXEEXT"; then +- am__EXEEXT_TRUE= +- am__EXEEXT_FALSE='#' +-else +- am__EXEEXT_TRUE='#' +- am__EXEEXT_FALSE= +-fi +- + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +Index: nautilus-2.27.4/cut-n-paste-code/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/cut-n-paste-code/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/cut-n-paste-code/Makefile.in 2009-07-14 16:12:37.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,9 +15,8 @@ + @SET_MAKE@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -46,7 +44,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -58,38 +55,10 @@ + ps-recursive uninstall-recursive + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_CFLAGS = @ALL_CFLAGS@ +@@ -293,9 +262,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cut-n-paste-code/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu cut-n-paste-code/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cut-n-paste-code/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu cut-n-paste-code/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -313,7 +282,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -345,7 +313,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -379,16 +347,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -403,7 +371,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -415,7 +383,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -424,34 +392,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -472,44 +435,29 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ +- am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -539,7 +487,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -558,8 +505,6 @@ + + html: html-recursive + +-html-am: +- + info: info-recursive + + info-am: +@@ -568,28 +513,18 @@ + + install-dvi: install-dvi-recursive + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-recursive + +-install-html-am: +- + install-info: install-info-recursive + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-recursive + +-install-pdf-am: +- + install-ps: install-ps-recursive + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -610,8 +545,8 @@ + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-strip tags-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ +@@ -627,7 +562,6 @@ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/cut-n-paste-code/libegg/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/cut-n-paste-code/libegg/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/cut-n-paste-code/libegg/Makefile.in 2009-07-14 16:12:37.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,9 +16,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -47,7 +45,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = + libegg_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -64,7 +61,6 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -321,9 +317,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cut-n-paste-code/libegg/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu cut-n-paste-code/libegg/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cut-n-paste-code/libegg/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu cut-n-paste-code/libegg/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -341,7 +337,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +@@ -367,52 +362,52 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + + libegg_la-eggtreemultidnd.lo: eggtreemultidnd.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -MT libegg_la-eggtreemultidnd.lo -MD -MP -MF $(DEPDIR)/libegg_la-eggtreemultidnd.Tpo -c -o libegg_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libegg_la-eggtreemultidnd.Tpo $(DEPDIR)/libegg_la-eggtreemultidnd.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -MT libegg_la-eggtreemultidnd.lo -MD -MP -MF $(DEPDIR)/libegg_la-eggtreemultidnd.Tpo -c -o libegg_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libegg_la-eggtreemultidnd.Tpo $(DEPDIR)/libegg_la-eggtreemultidnd.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggtreemultidnd.c' object='libegg_la-eggtreemultidnd.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -c -o libegg_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -c -o libegg_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c + + libegg_la-eggdesktopfile.lo: eggdesktopfile.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -MT libegg_la-eggdesktopfile.lo -MD -MP -MF $(DEPDIR)/libegg_la-eggdesktopfile.Tpo -c -o libegg_la-eggdesktopfile.lo `test -f 'eggdesktopfile.c' || echo '$(srcdir)/'`eggdesktopfile.c +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libegg_la-eggdesktopfile.Tpo $(DEPDIR)/libegg_la-eggdesktopfile.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -MT libegg_la-eggdesktopfile.lo -MD -MP -MF $(DEPDIR)/libegg_la-eggdesktopfile.Tpo -c -o libegg_la-eggdesktopfile.lo `test -f 'eggdesktopfile.c' || echo '$(srcdir)/'`eggdesktopfile.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libegg_la-eggdesktopfile.Tpo $(DEPDIR)/libegg_la-eggdesktopfile.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggdesktopfile.c' object='libegg_la-eggdesktopfile.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -c -o libegg_la-eggdesktopfile.lo `test -f 'eggdesktopfile.c' || echo '$(srcdir)/'`eggdesktopfile.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -c -o libegg_la-eggdesktopfile.lo `test -f 'eggdesktopfile.c' || echo '$(srcdir)/'`eggdesktopfile.c + + libegg_la-eggsmclient.lo: eggsmclient.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -MT libegg_la-eggsmclient.lo -MD -MP -MF $(DEPDIR)/libegg_la-eggsmclient.Tpo -c -o libegg_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libegg_la-eggsmclient.Tpo $(DEPDIR)/libegg_la-eggsmclient.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -MT libegg_la-eggsmclient.lo -MD -MP -MF $(DEPDIR)/libegg_la-eggsmclient.Tpo -c -o libegg_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libegg_la-eggsmclient.Tpo $(DEPDIR)/libegg_la-eggsmclient.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggsmclient.c' object='libegg_la-eggsmclient.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -c -o libegg_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -c -o libegg_la-eggsmclient.lo `test -f 'eggsmclient.c' || echo '$(srcdir)/'`eggsmclient.c + + libegg_la-eggsmclient-xsmp.lo: eggsmclient-xsmp.c +-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -MT libegg_la-eggsmclient-xsmp.lo -MD -MP -MF $(DEPDIR)/libegg_la-eggsmclient-xsmp.Tpo -c -o libegg_la-eggsmclient-xsmp.lo `test -f 'eggsmclient-xsmp.c' || echo '$(srcdir)/'`eggsmclient-xsmp.c +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libegg_la-eggsmclient-xsmp.Tpo $(DEPDIR)/libegg_la-eggsmclient-xsmp.Plo ++@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -MT libegg_la-eggsmclient-xsmp.lo -MD -MP -MF $(DEPDIR)/libegg_la-eggsmclient-xsmp.Tpo -c -o libegg_la-eggsmclient-xsmp.lo `test -f 'eggsmclient-xsmp.c' || echo '$(srcdir)/'`eggsmclient-xsmp.c ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libegg_la-eggsmclient-xsmp.Tpo $(DEPDIR)/libegg_la-eggsmclient-xsmp.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eggsmclient-xsmp.c' object='libegg_la-eggsmclient-xsmp.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -c -o libegg_la-eggsmclient-xsmp.lo `test -f 'eggsmclient-xsmp.c' || echo '$(srcdir)/'`eggsmclient-xsmp.c ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libegg_la_CFLAGS) $(CFLAGS) -c -o libegg_la-eggsmclient-xsmp.lo `test -f 'eggsmclient-xsmp.c' || echo '$(srcdir)/'`eggsmclient-xsmp.c + + mostlyclean-libtool: + -rm -f *.lo +@@ -432,7 +427,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -440,34 +435,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -488,17 +478,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -526,7 +512,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -548,8 +533,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -558,28 +541,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -621,7 +594,6 @@ + regenerate-built-sources: + EGGFILES="$(EGG_TREE_DND_FILES)" EGGDIR="$(EGG_TREE_DND_DIR)" $(srcdir)/update-from-egg.sh + EGGFILES="$(EGG_SMCLIENT_FILES)" EGGDIR="$(EGG_SMCLIENT_DIR)" $(srcdir)/update-from-egg.sh +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/data/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/data/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/data/Makefile.in 2009-07-14 16:12:37.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,9 +16,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -58,7 +56,6 @@ + nautilus-home.desktop.in nautilus.desktop.in \ + nautilus-folder-handler.desktop.in nautilus-browser.desktop.in \ + nautilus-autorun-software.desktop.in +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -73,59 +70,19 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +-am__install_max = 40 +-am__nobase_strip_setup = \ +- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +-am__nobase_strip = \ +- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +-am__nobase_list = $(am__nobase_strip_setup); \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ +- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ +- if (++n[$$2] == $(am__install_max)) \ +- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ +- END { for (dir in files) print dir, files[dir] }' +-am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" \ + "$(DESTDIR)$(nautilusdatadir)" ++desktopDATA_INSTALL = $(INSTALL_DATA) ++mimeDATA_INSTALL = $(INSTALL_DATA) ++nautilusdataDATA_INSTALL = $(INSTALL_DATA) + DATA = $(desktop_DATA) $(mime_DATA) $(nautilusdata_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_CFLAGS = @ALL_CFLAGS@ +@@ -367,9 +324,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu data/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu data/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -387,7 +344,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + nautilus-computer.desktop.in: $(top_builddir)/config.status $(srcdir)/nautilus-computer.desktop.in.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + nautilus-file-management-properties.desktop.in: $(top_builddir)/config.status $(srcdir)/nautilus-file-management-properties.desktop.in.in +@@ -411,63 +367,54 @@ + install-desktopDATA: $(desktop_DATA) + @$(NORMAL_INSTALL) + test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" +- @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ +- for p in $$list; do \ ++ @list='$(desktop_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ ++ $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ + done + + uninstall-desktopDATA: + @$(NORMAL_UNINSTALL) +- @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(desktopdir)" && rm -f $$files ++ @list='$(desktop_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ ++ done + install-mimeDATA: $(mime_DATA) + @$(NORMAL_INSTALL) + test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)" +- @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \ +- for p in $$list; do \ ++ @list='$(mime_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(mimeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mimedir)/$$f'"; \ ++ $(mimeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mimedir)/$$f"; \ + done + + uninstall-mimeDATA: + @$(NORMAL_UNINSTALL) +- @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(mimedir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(mimedir)" && rm -f $$files ++ @list='$(mime_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(mimedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(mimedir)/$$f"; \ ++ done + install-nautilusdataDATA: $(nautilusdata_DATA) + @$(NORMAL_INSTALL) + test -z "$(nautilusdatadir)" || $(MKDIR_P) "$(DESTDIR)$(nautilusdatadir)" +- @list='$(nautilusdata_DATA)'; test -n "$(nautilusdatadir)" || list=; \ +- for p in $$list; do \ ++ @list='$(nautilusdata_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nautilusdatadir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(nautilusdatadir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(nautilusdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(nautilusdatadir)/$$f'"; \ ++ $(nautilusdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(nautilusdatadir)/$$f"; \ + done + + uninstall-nautilusdataDATA: + @$(NORMAL_UNINSTALL) +- @list='$(nautilusdata_DATA)'; test -n "$(nautilusdatadir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(nautilusdatadir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(nautilusdatadir)" && rm -f $$files ++ @list='$(nautilusdata_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(nautilusdatadir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(nautilusdatadir)/$$f"; \ ++ done + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -493,7 +440,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -527,16 +474,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -551,7 +498,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -563,7 +510,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -572,34 +519,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -620,44 +562,29 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ +- am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -691,7 +618,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -710,8 +636,6 @@ + + html: html-recursive + +-html-am: +- + info: info-recursive + + info-am: +@@ -720,30 +644,21 @@ + install-nautilusdataDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-data-hook +-install-dvi: install-dvi-recursive + +-install-dvi-am: ++install-dvi: install-dvi-recursive + + install-exec-am: + + install-html: install-html-recursive + +-install-html-am: +- + install-info: install-info-recursive + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-recursive + +-install-pdf-am: +- + install-ps: install-ps-recursive + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -766,9 +681,9 @@ + uninstall-nautilusdataDATA + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-hook +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-data-am install-strip tags-recursive \ +- uninstall-am ++ ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-data-am install-strip uninstall-am + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ +@@ -795,7 +710,6 @@ + + uninstall-hook: + @ENABLE_UPDATE_MIMEDB_TRUE@ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/data/icons/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/data/icons/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/data/icons/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,9 +16,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -47,7 +45,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DATA = $(noinst_DATA) +@@ -288,9 +285,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu data/icons/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/icons/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu data/icons/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -308,7 +305,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -338,17 +334,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -376,7 +368,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -395,8 +386,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -405,28 +394,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -512,7 +491,6 @@ + install-data-local: install-icons update-icon-cache + + uninstall-local: uninstall-icons update-icon-cache +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/data/patterns/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/data/patterns/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/data/patterns/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,9 +16,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -47,7 +45,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +@@ -55,23 +52,9 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +-am__install_max = 40 +-am__nobase_strip_setup = \ +- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +-am__nobase_strip = \ +- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +-am__nobase_list = $(am__nobase_strip_setup); \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ +- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ +- if (++n[$$2] == $(am__install_max)) \ +- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ +- END { for (dir in files) print dir, files[dir] }' +-am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(backdir)" ++backDATA_INSTALL = $(INSTALL_DATA) + DATA = $(back_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +@@ -313,9 +296,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/patterns/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu data/patterns/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/patterns/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu data/patterns/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -333,7 +316,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -343,23 +325,20 @@ + install-backDATA: $(back_DATA) + @$(NORMAL_INSTALL) + test -z "$(backdir)" || $(MKDIR_P) "$(DESTDIR)$(backdir)" +- @list='$(back_DATA)'; test -n "$(backdir)" || list=; \ +- for p in $$list; do \ ++ @list='$(back_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(backdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(backdir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(backDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(backdir)/$$f'"; \ ++ $(backDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(backdir)/$$f"; \ + done + + uninstall-backDATA: + @$(NORMAL_UNINSTALL) +- @list='$(back_DATA)'; test -n "$(backdir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(backdir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(backdir)" && rm -f $$files ++ @list='$(back_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(backdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(backdir)/$$f"; \ ++ done + tags: TAGS + TAGS: + +@@ -383,17 +362,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -424,7 +399,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -443,8 +417,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -453,28 +425,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -509,7 +471,6 @@ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-backDATA + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/docs/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/docs/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/docs/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,9 +15,8 @@ + @SET_MAKE@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -46,7 +44,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -56,65 +53,16 @@ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +-am__vpath_adj = case $$p in \ +- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ +- *) f=$$p;; \ +- esac; +-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +-am__install_max = 40 +-am__nobase_strip_setup = \ +- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +-am__nobase_strip = \ +- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +-am__nobase_list = $(am__nobase_strip_setup); \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ +- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ +- if (++n[$$2] == $(am__install_max)) \ +- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ +- END { for (dir in files) print dir, files[dir] }' +-am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + man1dir = $(mandir)/man1 + am__installdirs = "$(DESTDIR)$(man1dir)" + NROFF = nroff + MANS = $(man_MANS) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_CFLAGS = @ALL_CFLAGS@ +@@ -341,9 +289,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu docs/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu docs/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -361,51 +309,57 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo + + clean-libtool: + -rm -rf .libs _libs +-install-man1: $(man_MANS) ++install-man1: $(man1_MANS) $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" +- @list=''; test -n "$(man1dir)" || exit 0; \ +- { for i in $$list; do echo "$$i"; done; \ +- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ +- sed -n '/\.1[a-z]*$$/p'; \ +- } | while read p; do \ +- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; echo "$$p"; \ +- done | \ +- sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ +- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ +- sed 'N;N;s,\n, ,g' | { \ +- list=; while read file base inst; do \ +- if test "$$base" = "$$inst"; then list="$$list $$file"; else \ +- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ +- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ +- fi; \ ++ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ ++ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ ++ for i in $$l2; do \ ++ case "$$i" in \ ++ *.1*) list="$$list $$i" ;; \ ++ esac; \ + done; \ +- for i in $$list; do echo "$$i"; done | $(am__base_list) | \ +- while read files; do \ +- test -z "$$files" || { \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ +- done; } +- ++ for i in $$list; do \ ++ if test -f $$i; then file=$$i; \ ++ else file=$(srcdir)/$$i; fi; \ ++ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ ++ case "$$ext" in \ ++ 1*) ;; \ ++ *) ext='1' ;; \ ++ esac; \ ++ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ ++ inst=`echo $$inst | sed -e 's/^.*\///'`; \ ++ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ ++ done + uninstall-man1: + @$(NORMAL_UNINSTALL) +- @list=''; test -n "$(man1dir)" || exit 0; \ +- files=`{ for i in $$list; do echo "$$i"; done; \ +- l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ +- sed -n '/\.1[a-z]*$$/p'; \ +- } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ +- -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ +- test -z "$$files" || { \ +- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } ++ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ ++ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ ++ for i in $$l2; do \ ++ case "$$i" in \ ++ *.1*) list="$$list $$i" ;; \ ++ esac; \ ++ done; \ ++ for i in $$list; do \ ++ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ ++ case "$$ext" in \ ++ 1*) ;; \ ++ *) ext='1' ;; \ ++ esac; \ ++ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ ++ inst=`echo $$inst | sed -e 's/^.*\///'`; \ ++ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ ++ echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ ++ rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ ++ done + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -431,7 +385,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -465,16 +419,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -489,7 +443,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -501,7 +455,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -510,52 +464,34 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + + distdir: $(DISTFILES) +- @list='$(MANS)'; if test -n "$$list"; then \ +- list=`for p in $$list; do \ +- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ +- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ +- if test -n "$$list" && \ +- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ +- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ +- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ +- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ +- echo " typically \`make maintainer-clean' will remove them" >&2; \ +- exit 1; \ +- else :; fi; \ +- else :; fi + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ +@@ -571,44 +507,29 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ +- am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -641,7 +562,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -660,8 +580,6 @@ + + html: html-recursive + +-html-am: +- + info: info-recursive + + info-am: +@@ -670,28 +588,18 @@ + + install-dvi: install-dvi-recursive + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-recursive + +-install-html-am: +- + install-info: install-info-recursive + +-install-info-am: +- + install-man: install-man1 + + install-pdf: install-pdf-recursive + +-install-pdf-am: +- + install-ps: install-ps-recursive + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -714,8 +622,8 @@ + + uninstall-man: uninstall-man1 + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-strip tags-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ +@@ -732,7 +640,6 @@ + tags tags-recursive uninstall uninstall-am uninstall-man \ + uninstall-man1 + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/docs/reference/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/docs/reference/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/docs/reference/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,9 +15,8 @@ + @SET_MAKE@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -46,7 +44,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ +@@ -58,38 +55,10 @@ + ps-recursive uninstall-recursive + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_CFLAGS = @ALL_CFLAGS@ +@@ -293,9 +262,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu docs/reference/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu docs/reference/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -313,7 +282,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -345,7 +313,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -379,16 +347,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -403,7 +371,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -415,7 +383,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -424,34 +392,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -472,44 +435,29 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ +- am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -539,7 +487,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -558,8 +505,6 @@ + + html: html-recursive + +-html-am: +- + info: info-recursive + + info-am: +@@ -568,28 +513,18 @@ + + install-dvi: install-dvi-recursive + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-recursive + +-install-html-am: +- + install-info: install-info-recursive + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-recursive + +-install-pdf-am: +- + install-ps: install-ps-recursive + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -610,8 +545,8 @@ + + uninstall-am: + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ +- install-am install-strip tags-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ +@@ -627,7 +562,6 @@ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/docs/reference/libnautilus-extension/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/docs/reference/libnautilus-extension/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/docs/reference/libnautilus-extension/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -22,9 +21,8 @@ + #################################### + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -53,7 +51,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = version.xml +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -376,9 +373,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/libnautilus-extension/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu docs/reference/libnautilus-extension/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/reference/libnautilus-extension/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu docs/reference/libnautilus-extension/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -396,7 +393,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + version.xml: $(top_builddir)/config.status $(srcdir)/version.xml.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +@@ -428,17 +424,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -470,7 +462,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -489,8 +480,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -499,28 +488,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -699,7 +678,6 @@ + gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/eel/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/eel/Makefile.in 2009-07-14 16:12:18.000000000 +1000 ++++ nautilus-2.27.4/eel/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,9 +17,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,9 +48,10 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) +-libeel_2_la_LIBADD = ++am__DEPENDENCIES_1 = ++libeel_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + am__objects_1 = + am_libeel_2_la_OBJECTS = eel-accessibility.lo eel-alert-dialog.lo \ + eel-art-extensions.lo eel-art-gtk-extensions.lo \ +@@ -82,7 +81,6 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -96,8 +94,6 @@ + DIST_SOURCES = $(libeel_2_la_SOURCES) $(check_program_SOURCES) + ETAGS = etags + CTAGS = ctags +-am__tty_colors = \ +-red=; grn=; lgn=; blu=; std= + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +@@ -306,6 +302,9 @@ + + libeel_2_la_LDFLAGS = \ + -no-undefined \ ++ $(NULL) ++ ++libeel_2_la_LIBADD = \ + $(CORE_LIBS) \ + $(RENDER_LIBS) \ + $(X_LIBS) \ +@@ -440,9 +439,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu eel/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu eel/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu eel/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu eel/Makefile + .PRECIOUS: Makefile + + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +@@ -452,7 +451,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +@@ -466,13 +464,11 @@ + $(libeel_2_la_LINK) $(libeel_2_la_OBJECTS) $(libeel_2_la_LIBADD) $(LIBS) + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ +- echo " rm -f" $$list; \ +- rm -f $$list || exit $$?; \ +- test -n "$(EXEEXT)" || exit 0; \ +- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f" $$list; \ +- rm -f $$list ++ @list='$(noinst_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done + check-program$(EXEEXT): $(check_program_OBJECTS) $(check_program_DEPENDENCIES) + @rm -f check-program$(EXEEXT) + $(check_program_LINK) $(check_program_OBJECTS) $(check_program_LDADD) $(LIBS) +@@ -522,21 +518,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -559,7 +555,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -567,34 +563,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -603,7 +594,6 @@ + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ +- $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -615,10 +605,10 @@ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ +- col=$$red; res=XPASS; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- col=$$grn; res=PASS; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ +@@ -626,18 +616,17 @@ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ +- col=$$lgn; res=XFAIL; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ +- col=$$red; res=FAIL; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ +- col=$$blu; res=SKIP; \ ++ echo "SKIP: $$tst"; \ + fi; \ +- echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ +@@ -679,15 +668,11 @@ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ +- if test "$$failed" -eq 0; then \ +- echo "$$grn$$dashes"; \ +- else \ +- echo "$$red$$dashes"; \ +- fi; \ ++ echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ +- echo "$$dashes$$std"; \ ++ echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + +@@ -707,17 +692,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -750,7 +731,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -772,8 +752,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -782,28 +760,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -826,7 +794,7 @@ + + uninstall-am: + +-.MAKE: check-am install-am install-strip ++.MAKE: install-am install-strip + + .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ +@@ -880,7 +848,6 @@ + for file in $(DONT_DIST_FILES) ; do \ + rm -f $(distdir)/$$file ; \ + done +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/icons/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/icons/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/icons/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,9 +16,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -47,7 +45,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +@@ -55,23 +52,9 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +-am__install_max = 40 +-am__nobase_strip_setup = \ +- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +-am__nobase_strip = \ +- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +-am__nobase_list = $(am__nobase_strip_setup); \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ +- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ +- if (++n[$$2] == $(am__install_max)) \ +- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ +- END { for (dir in files) print dir, files[dir] }' +-am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(icondir)" ++iconDATA_INSTALL = $(INSTALL_DATA) + DATA = $(icon_DATA) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + ACLOCAL = @ACLOCAL@ +@@ -290,9 +273,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu icons/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu icons/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu icons/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -310,7 +293,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + mostlyclean-libtool: + -rm -f *.lo +@@ -320,23 +302,20 @@ + install-iconDATA: $(icon_DATA) + @$(NORMAL_INSTALL) + test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)" +- @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ +- for p in $$list; do \ ++ @list='$(icon_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \ ++ $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \ + done + + uninstall-iconDATA: + @$(NORMAL_UNINSTALL) +- @list='$(icon_DATA)'; test -n "$(icondir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(icondir)" && rm -f $$files ++ @list='$(icon_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(icondir)/$$f"; \ ++ done + tags: TAGS + TAGS: + +@@ -360,17 +339,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -401,7 +376,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -420,8 +394,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -430,28 +402,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -486,7 +448,6 @@ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-iconDATA + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/libnautilus-extension/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/libnautilus-extension/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/libnautilus-extension/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -19,9 +18,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -54,30 +52,15 @@ + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = libnautilus-extension.pc \ + libnautilus-extension-uninstalled.pc +-CONFIG_CLEAN_VPATH_FILES = + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; + am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +-am__install_max = 40 +-am__nobase_strip_setup = \ +- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +-am__nobase_strip = \ +- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +-am__nobase_list = $(am__nobase_strip_setup); \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ +- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ +- if (++n[$$2] == $(am__install_max)) \ +- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ +- END { for (dir in files) print dir, files[dir] }' +-am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(libnautilus_extension_includedir)" ++libLTLIBRARIES_INSTALL = $(INSTALL) + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + libnautilus_extension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -96,7 +79,6 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -108,7 +90,9 @@ + $(LDFLAGS) -o $@ + SOURCES = $(libnautilus_extension_la_SOURCES) + DIST_SOURCES = $(libnautilus_extension_la_SOURCES) ++pkgconfigDATA_INSTALL = $(INSTALL_DATA) + DATA = $(pkgconfig_DATA) ++libnautilus_extension_includeHEADERS_INSTALL = $(INSTALL_HEADER) + HEADERS = $(libnautilus_extension_include_HEADERS) + ETAGS = etags + CTAGS = ctags +@@ -368,9 +352,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libnautilus-extension/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu libnautilus-extension/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libnautilus-extension/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu libnautilus-extension/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -388,7 +372,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + libnautilus-extension.pc: $(top_builddir)/config.status $(srcdir)/libnautilus-extension.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + libnautilus-extension-uninstalled.pc: $(top_builddir)/config.status $(srcdir)/libnautilus-extension-uninstalled.pc.in +@@ -396,24 +379,20 @@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" +- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ +- list2=; for p in $$list; do \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ +- list2="$$list2 $$p"; \ ++ f=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ +- done; \ +- test -z "$$list2" || { \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ +- } ++ done + + uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) +- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ +- for p in $$list; do \ +- $(am__strip_dir) \ +- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ +- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ ++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ++ p=$(am__strip_dir) \ ++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ ++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + + clean-libLTLIBRARIES: +@@ -447,21 +426,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -474,43 +453,37 @@ + install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" +- @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ +- for p in $$list; do \ ++ @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ ++ $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + + uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) +- @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files ++ @list='$(pkgconfig_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ ++ done + install-libnautilus_extension_includeHEADERS: $(libnautilus_extension_include_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(libnautilus_extension_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libnautilus_extension_includedir)" +- @list='$(libnautilus_extension_include_HEADERS)'; test -n "$(libnautilus_extension_includedir)" || list=; \ +- for p in $$list; do \ ++ @list='$(libnautilus_extension_include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libnautilus_extension_includedir)'"; \ +- $(INSTALL_HEADER) $$files "$(DESTDIR)$(libnautilus_extension_includedir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(libnautilus_extension_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libnautilus_extension_includedir)/$$f'"; \ ++ $(libnautilus_extension_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libnautilus_extension_includedir)/$$f"; \ + done + + uninstall-libnautilus_extension_includeHEADERS: + @$(NORMAL_UNINSTALL) +- @list='$(libnautilus_extension_include_HEADERS)'; test -n "$(libnautilus_extension_includedir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(libnautilus_extension_includedir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(libnautilus_extension_includedir)" && rm -f $$files ++ @list='$(libnautilus_extension_include_HEADERS)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(libnautilus_extension_includedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(libnautilus_extension_includedir)/$$f"; \ ++ done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -524,7 +497,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -532,34 +505,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -580,17 +548,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -621,7 +585,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -643,8 +606,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -654,28 +615,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: install-libLTLIBRARIES + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -720,7 +671,6 @@ + uninstall-libnautilus_extension_includeHEADERS \ + uninstall-pkgconfigDATA + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/libnautilus-private/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/libnautilus-private/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/libnautilus-private/Makefile.in 2009-07-14 16:12:38.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,9 +17,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -51,7 +49,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + am__DEPENDENCIES_1 = + am__DEPENDENCIES_2 = \ +@@ -194,7 +191,6 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -211,23 +207,9 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +-am__install_max = 40 +-am__nobase_strip_setup = \ +- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +-am__nobase_strip = \ +- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +-am__nobase_list = $(am__nobase_strip_setup); \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ +- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ +- if (++n[$$2] == $(am__install_max)) \ +- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ +- END { for (dir in files) print dir, files[dir] }' +-am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(schemadir)" ++schemaDATA_INSTALL = $(INSTALL_DATA) + DATA = $(schema_DATA) + ETAGS = etags + CTAGS = ctags +@@ -576,9 +558,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libnautilus-private/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu libnautilus-private/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libnautilus-private/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu libnautilus-private/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -596,7 +578,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +@@ -693,21 +674,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -720,23 +701,20 @@ + install-schemaDATA: $(schema_DATA) + @$(NORMAL_INSTALL) + test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" +- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ +- for p in $$list; do \ ++ @list='$(schema_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(schemaDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemadir)/$$f'"; \ ++ $(schemaDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemadir)/$$f"; \ + done + + uninstall-schemaDATA: + @$(NORMAL_UNINSTALL) +- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(schemadir)" && rm -f $$files ++ @list='$(schema_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(schemadir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(schemadir)/$$f"; \ ++ done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -750,7 +728,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -758,34 +736,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -806,17 +779,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -851,7 +820,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -874,8 +842,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -884,28 +850,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -967,7 +923,6 @@ + + dist-hook: + cd $(distdir); rm -f $(CLEANFILES) +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/m4/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/m4/Makefile.in 2009-07-14 16:12:18.000000000 +1000 ++++ nautilus-2.27.4/m4/Makefile.in 2009-07-14 16:12:39.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -16,9 +15,8 @@ + @SET_MAKE@ + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -47,7 +45,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = shave-libtool shave +-CONFIG_CLEAN_VPATH_FILES = + SOURCES = + DIST_SOURCES = + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -261,9 +258,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu m4/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu m4/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -281,7 +278,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + shave-libtool: $(top_builddir)/config.status $(srcdir)/shave-libtool.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + shave: $(top_builddir)/config.status $(srcdir)/shave.in +@@ -315,17 +311,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -353,7 +345,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + + maintainer-clean-generic: +@@ -373,8 +364,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -383,28 +372,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -439,7 +418,6 @@ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + + shave +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/src/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/src/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/src/Makefile.in 2009-07-14 16:12:39.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,9 +17,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -53,9 +51,9 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(schemedir)" \ + "$(DESTDIR)$(uidir)" ++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) + PROGRAMS = $(bin_PROGRAMS) + am__objects_1 = + am_nautilus_OBJECTS = ephy-spinner.$(OBJEXT) \ +@@ -137,7 +135,6 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -166,59 +163,16 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +-am__install_max = 40 +-am__nobase_strip_setup = \ +- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +-am__nobase_strip = \ +- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +-am__nobase_list = $(am__nobase_strip_setup); \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ +- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ +- if (++n[$$2] == $(am__install_max)) \ +- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ +- END { for (dir in files) print dir, files[dir] }' +-am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; ++schemeDATA_INSTALL = $(INSTALL_DATA) ++uiDATA_INSTALL = $(INSTALL_DATA) + DATA = $(scheme_DATA) $(ui_DATA) + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ +- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +- distdir + ETAGS = etags + CTAGS = ctags +-am__tty_colors = \ +-red=; grn=; lgn=; blu=; std= + DIST_SUBDIRS = $(SUBDIRS) + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +-am__relativize = \ +- dir0=`pwd`; \ +- sed_first='s,^\([^/]*\)/.*$$,\1,'; \ +- sed_rest='s,^[^/]*/*,,'; \ +- sed_last='s,^.*/\([^/]*\)$$,\1,'; \ +- sed_butlast='s,/*[^/]*$$,,'; \ +- while test -n "$$dir1"; do \ +- first=`echo "$$dir1" | sed -e "$$sed_first"`; \ +- if test "$$first" != "."; then \ +- if test "$$first" = ".."; then \ +- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ +- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ +- else \ +- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ +- if test "$$first2" = "$$first"; then \ +- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ +- else \ +- dir2="../$$dir2"; \ +- fi; \ +- dir0="$$dir0"/"$$first"; \ +- fi; \ +- fi; \ +- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ +- done; \ +- reldir="$$dir2" + ACLOCAL = @ACLOCAL@ + ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ + ALL_CFLAGS = @ALL_CFLAGS@ +@@ -587,9 +541,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -607,50 +561,34 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" +- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed 's/$(EXEEXT)$$//' | \ +- while read p p1; do if test -f $$p || test -f $$p1; \ +- then echo "$$p"; echo "$$p"; else :; fi; \ +- done | \ +- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ +- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ +- sed 'N;N;N;s,\n, ,g' | \ +- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ +- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ +- if ($$2 == $$4) files[d] = files[d] " " $$1; \ +- else { print "f", $$3 "/" $$4, $$1; } } \ +- END { for (d in files) print "f", d, files[d] }' | \ +- while read type dir files; do \ +- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ +- test -z "$$files" || { \ +- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ +- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ +- } \ +- ; done ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ if test -f $$p \ ++ || test -f $$p1 \ ++ ; then \ ++ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ ++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ ++ else :; fi; \ ++ done + + uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) +- @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ +- files=`for p in $$list; do echo "$$p"; done | \ +- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ +- -e 's/$$/$(EXEEXT)/' `; \ +- test -n "$$list" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(bindir)" && rm -f $$files ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ++ echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(bindir)/$$f"; \ ++ done + + clean-binPROGRAMS: +- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ +- echo " rm -f" $$list; \ +- rm -f $$list || exit $$?; \ +- test -n "$(EXEEXT)" || exit 0; \ +- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f" $$list; \ +- rm -f $$list ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done + nautilus$(EXEEXT): $(nautilus_OBJECTS) $(nautilus_DEPENDENCIES) + @rm -f nautilus$(EXEEXT) + $(LINK) $(nautilus_OBJECTS) $(nautilus_LDADD) $(LIBS) +@@ -718,21 +656,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -745,43 +683,37 @@ + install-schemeDATA: $(scheme_DATA) + @$(NORMAL_INSTALL) + test -z "$(schemedir)" || $(MKDIR_P) "$(DESTDIR)$(schemedir)" +- @list='$(scheme_DATA)'; test -n "$(schemedir)" || list=; \ +- for p in $$list; do \ ++ @list='$(scheme_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemedir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(schemedir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(schemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(schemedir)/$$f'"; \ ++ $(schemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(schemedir)/$$f"; \ + done + + uninstall-schemeDATA: + @$(NORMAL_UNINSTALL) +- @list='$(scheme_DATA)'; test -n "$(schemedir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(schemedir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(schemedir)" && rm -f $$files ++ @list='$(scheme_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(schemedir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(schemedir)/$$f"; \ ++ done + install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) + test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" +- @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ +- for p in $$list; do \ ++ @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ ++ $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ + done + + uninstall-uiDATA: + @$(NORMAL_UNINSTALL) +- @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(uidir)" && rm -f $$files ++ @list='$(ui_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(uidir)/$$f"; \ ++ done + + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. +@@ -807,7 +739,7 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ +@@ -841,16 +773,16 @@ + else \ + local_target="$$target"; \ + fi; \ +- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ ++ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ +- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ ++ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) +@@ -865,7 +797,7 @@ + + TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ +@@ -877,7 +809,7 @@ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ +- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ ++ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -886,34 +818,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -922,7 +849,6 @@ + @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ +- $(am__tty_colors); \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ +@@ -934,10 +860,10 @@ + *[\ \ ]$$tst[\ \ ]*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ +- col=$$red; res=XPASS; \ ++ echo "XPASS: $$tst"; \ + ;; \ + *) \ +- col=$$grn; res=PASS; \ ++ echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ +@@ -945,18 +871,17 @@ + case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$tst[\ \ ]*) \ + xfail=`expr $$xfail + 1`; \ +- col=$$lgn; res=XFAIL; \ ++ echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ +- col=$$red; res=FAIL; \ ++ echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ +- col=$$blu; res=SKIP; \ ++ echo "SKIP: $$tst"; \ + fi; \ +- echo "$${col}$$res$${std}: $$tst"; \ + done; \ + if test "$$all" -eq 1; then \ + tests="test"; \ +@@ -998,15 +923,11 @@ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ +- if test "$$failed" -eq 0; then \ +- echo "$$grn$$dashes"; \ +- else \ +- echo "$$red$$dashes"; \ +- fi; \ ++ echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ +- echo "$$dashes$$std"; \ ++ echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + +@@ -1026,44 +947,29 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ ++ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ +- fi; \ +- done +- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ +- if test "$$subdir" = .; then :; else \ +- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ +- $(am__relativize); \ +- new_distdir=$$reldir; \ +- dir1=$$subdir; dir2="$(top_distdir)"; \ +- $(am__relativize); \ +- new_top_distdir=$$reldir; \ +- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ +- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ +- ($(am__cd) $$subdir && \ ++ distdir=`$(am__cd) $(distdir) && pwd`; \ ++ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ ++ (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ +- top_distdir="$$new_top_distdir" \ +- distdir="$$new_distdir" \ ++ top_distdir="$$top_distdir" \ ++ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ +- am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ +@@ -1103,7 +1009,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -1125,8 +1030,6 @@ + + html: html-recursive + +-html-am: +- + info: info-recursive + + info-am: +@@ -1135,28 +1038,18 @@ + + install-dvi: install-dvi-recursive + +-install-dvi-am: +- + install-exec-am: install-binPROGRAMS + + install-html: install-html-recursive + +-install-html-am: +- + install-info: install-info-recursive + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-recursive + +-install-pdf-am: +- + install-ps: install-ps-recursive + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-recursive +@@ -1180,9 +1073,8 @@ + uninstall-am: uninstall-binPROGRAMS uninstall-schemeDATA \ + uninstall-uiDATA + +-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ +- check-am ctags-recursive install install-am install-strip \ +- tags-recursive ++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ ++ install-strip + + .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-TESTS check-am clean clean-binPROGRAMS \ +@@ -1209,7 +1101,6 @@ + + dist-hook: + cd $(distdir); rm -f $(CLEANFILES) +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/src/file-manager/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/src/file-manager/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/src/file-manager/Makefile.in 2009-07-14 16:12:39.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -18,9 +17,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -50,7 +48,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + LTLIBRARIES = $(noinst_LTLIBRARIES) + libnautilus_file_manager_la_LIBADD = + am__libnautilus_file_manager_la_SOURCES_DIST = fm-actions.h \ +@@ -76,7 +73,6 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -93,23 +89,9 @@ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +-am__install_max = 40 +-am__nobase_strip_setup = \ +- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +-am__nobase_strip = \ +- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +-am__nobase_list = $(am__nobase_strip_setup); \ +- for p in $$list; do echo "$$p $$p"; done | \ +- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ +- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ +- if (++n[$$2] == $(am__install_max)) \ +- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ +- END { for (dir in files) print dir, files[dir] }' +-am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; + am__installdirs = "$(DESTDIR)$(uidir)" ++uiDATA_INSTALL = $(INSTALL_DATA) + DATA = $(ui_DATA) + ETAGS = etags + CTAGS = ctags +@@ -351,9 +333,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/file-manager/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu src/file-manager/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/file-manager/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu src/file-manager/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -371,7 +353,6 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) +@@ -405,21 +386,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -432,23 +413,20 @@ + install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) + test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" +- @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ +- for p in $$list; do \ ++ @list='$(ui_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ ++ f=$(am__strip_dir) \ ++ echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \ ++ $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \ + done + + uninstall-uiDATA: + @$(NORMAL_UNINSTALL) +- @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- test -n "$$files" || exit 0; \ +- echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ +- cd "$(DESTDIR)$(uidir)" && rm -f $$files ++ @list='$(ui_DATA)'; for p in $$list; do \ ++ f=$(am__strip_dir) \ ++ echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \ ++ rm -f "$(DESTDIR)$(uidir)/$$f"; \ ++ done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ +@@ -462,7 +440,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -470,34 +448,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -518,17 +491,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -559,7 +528,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -581,8 +549,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -591,28 +557,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -651,7 +607,6 @@ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-uiDATA + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +Index: nautilus-2.27.4/test/Makefile.in +=================================================================== +--- nautilus-2.27.4.orig/test/Makefile.in 2009-07-14 16:12:19.000000000 +1000 ++++ nautilus-2.27.4/test/Makefile.in 2009-07-14 16:12:39.000000000 +1000 +@@ -1,9 +1,8 @@ +-# Makefile.in generated by automake 1.11 from Makefile.am. ++# Makefile.in generated by automake 1.10.2 from Makefile.am. + # @configure_input@ + + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +-# Inc. ++# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation + # gives unlimited permission to copy and/or distribute it, + # with or without modifications, as long as this notice is preserved. +@@ -17,9 +16,8 @@ + + VPATH = @srcdir@ + pkgdatadir = $(datadir)/@PACKAGE@ +-pkgincludedir = $(includedir)/@PACKAGE@ + pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkgincludedir = $(includedir)/@PACKAGE@ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +@@ -55,7 +53,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-CONFIG_CLEAN_VPATH_FILES = + am__EXEEXT_1 = + PROGRAMS = $(noinst_PROGRAMS) + am_test_eel_background_OBJECTS = test-eel-background.$(OBJEXT) +@@ -133,7 +130,6 @@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-am__mv = mv -f + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ +@@ -392,9 +388,9 @@ + exit 1;; \ + esac; \ + done; \ +- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ +- $(am__cd) $(top_srcdir) && \ +- $(AUTOMAKE) --gnu test/Makefile ++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu test/Makefile'; \ ++ cd $(top_srcdir) && \ ++ $(AUTOMAKE) --gnu test/Makefile + .PRECIOUS: Makefile + Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ +@@ -412,16 +408,13 @@ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +-$(am__aclocal_m4_deps): + + clean-noinstPROGRAMS: +- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ +- echo " rm -f" $$list; \ +- rm -f $$list || exit $$?; \ +- test -n "$(EXEEXT)" || exit 0; \ +- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ +- echo " rm -f" $$list; \ +- rm -f $$list ++ @list='$(noinst_PROGRAMS)'; for p in $$list; do \ ++ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ++ echo " rm -f $$p $$f"; \ ++ rm -f $$p $$f ; \ ++ done + test-eel-background$(EXEEXT): $(test_eel_background_OBJECTS) $(test_eel_background_DEPENDENCIES) + @rm -f test-eel-background$(EXEEXT) + $(LINK) $(test_eel_background_OBJECTS) $(test_eel_background_LDADD) $(LIBS) +@@ -473,21 +466,21 @@ + + .c.o: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c $< + + .c.obj: + @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + + .c.lo: + @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo ++@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo + @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@@ -510,7 +503,7 @@ + + TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) +- set x; \ ++ tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ +@@ -518,34 +511,29 @@ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- shift; \ +- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ ++ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ +- if test $$# -gt 0; then \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- "$$@" $$unique; \ +- else \ +- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ +- $$unique; \ +- fi; \ ++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ ++ $$tags $$unique; \ + fi + ctags: CTAGS + CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) ++ tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ +- test -z "$(CTAGS_ARGS)$$unique" \ ++ test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ +- $$unique ++ $$tags $$unique + + GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ +- && $(am__cd) $(top_srcdir) \ +- && gtags -i $(GTAGS_ARGS) "$$here" ++ && cd $(top_srcdir) \ ++ && gtags -i $(GTAGS_ARGS) $$here + + distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@@ -566,17 +554,13 @@ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ +- if test -d "$(distdir)/$$file"; then \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ +- fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ +- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ +- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ ++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ +- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ ++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ +- test -f "$(distdir)/$$file" \ +- || cp -p $$d/$$file "$(distdir)/$$file" \ ++ test -f $(distdir)/$$file \ ++ || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +@@ -604,7 +588,6 @@ + + distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) +- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + + maintainer-clean-generic: + @echo "This command is intended for maintainers to use" +@@ -626,8 +609,6 @@ + + html: html-am + +-html-am: +- + info: info-am + + info-am: +@@ -636,28 +617,18 @@ + + install-dvi: install-dvi-am + +-install-dvi-am: +- + install-exec-am: + + install-html: install-html-am + +-install-html-am: +- + install-info: install-info-am + +-install-info-am: +- + install-man: + + install-pdf: install-pdf-am + +-install-pdf-am: +- + install-ps: install-ps-am + +-install-ps-am: +- + installcheck-am: + + maintainer-clean: maintainer-clean-am +@@ -695,7 +666,6 @@ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am + +- + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: --- nautilus-2.27.4.orig/debian/patches/11_restart_mode.patch +++ nautilus-2.27.4/debian/patches/11_restart_mode.patch @@ -0,0 +1,31 @@ +Index: nautilus-2.27.4/src/nautilus-main.c +=================================================================== +--- nautilus-2.27.4.orig/src/nautilus-main.c 2009-06-25 00:00:12.000000000 +1000 ++++ nautilus-2.27.4/src/nautilus-main.c 2009-07-14 16:07:57.000000000 +1000 +@@ -406,10 +406,6 @@ + + g_set_prgname ("nautilus"); + +- if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) { +- egg_set_desktop_file (DATADIR "/applications/nautilus.desktop"); +- } +- + context = g_option_context_new (_("\n\nBrowse the file system with the file manager")); + g_option_context_add_main_entries (context, options, NULL); + +@@ -484,6 +480,15 @@ + (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE); + } + ++ /* Which .desktop file contains the relevant session management ++ information? */ ++ if ((no_desktop || !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) ++ && g_file_test (DATADIR "/applications/nautilus-home.desktop", G_FILE_TEST_EXISTS)) { ++ egg_set_desktop_file (DATADIR "/applications/nautilus-home.desktop"); ++ } else if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) { ++ egg_set_desktop_file (DATADIR "/applications/nautilus.desktop"); ++ } ++ + application = NULL; + + /* Do either the self-check or the real work. */ --- nautilus-2.27.4.orig/debian/patches/02_autoconf.patch +++ nautilus-2.27.4/debian/patches/02_autoconf.patch @@ -0,0 +1,16 @@ +# Description: configure update due to launchpad integration changes +# UbuntuSpecific: launchpad +# +Index: nautilus-2.27.4/configure +=================================================================== +--- nautilus-2.27.4.orig/configure 2009-07-14 09:10:02.000000000 +1000 ++++ nautilus-2.27.4/configure 2009-07-14 16:07:43.000000000 +1000 +@@ -19370,7 +19370,7 @@ + LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`" + + +-CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES" ++CORE_MODULES="glib-2.0 gnome-desktop-2.0 launchpad-integration gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES" + CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS" + + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" --- nautilus-2.27.4.orig/debian/patches/02_eel_libadd.patch +++ nautilus-2.27.4/debian/patches/02_eel_libadd.patch @@ -0,0 +1,14 @@ +Index: nautilus-2.26.2/eel/Makefile.am +=================================================================== +--- nautilus-2.26.2.orig/eel/Makefile.am 2009-03-17 10:20:25.000000000 +0100 ++++ nautilus-2.26.2/eel/Makefile.am 2009-04-25 00:01:57.757468721 +0200 +@@ -17,6 +17,9 @@ INCLUDES = \ + + libeel_2_la_LDFLAGS = \ + -no-undefined \ ++ $(NULL) ++ ++libeel_2_la_LIBADD = \ + $(CORE_LIBS) \ + $(RENDER_LIBS) \ + $(X_LIBS) \ --- nautilus-2.27.4.orig/debian/patches/81_gnome-app-install.patch +++ nautilus-2.27.4/debian/patches/81_gnome-app-install.patch @@ -0,0 +1,59 @@ +--- nautilus-2.21.1.orig/libnautilus-private/nautilus-program-choosing.c 2007-12-14 11:24:07.000000000 +0100 ++++ nautilus-2.21.1/libnautilus-private/nautilus-program-choosing.c 2008-01-07 16:31:13.000000000 +0100 +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -228,6 +229,29 @@ + } + + ++void launch_gnome_app_install_mimetype(GdkScreen *screen, ++ NautilusFile *file, ++ char *uri, char *uri_for_display) { ++ char *qmimetype, *quri, *qduri, *command; ++ if (!screen) ++ screen = gdk_display_get_default_screen(gdk_display_get_default ()); ++ ++ qmimetype = g_shell_quote (nautilus_file_info_get_mime_type (file)); ++ quri = g_shell_quote (uri); ++ qduri = g_shell_quote (uri_for_display); ++ command = g_strconcat("gnome-app-install --mime-type=", ++ qmimetype, " ", quri, " ", qduri, ++ (char*)0 /* NB NULL is wrong */); ++ g_free (qmimetype); ++ g_free (quri); ++ g_free (qduri); ++ ++ eel_gnome_shell_execute_on_screen (command, screen); ++ g_free (command); ++} ++ ++ ++ + /** + * nautilus_launch_application: + * +@@ -306,12 +330,18 @@ + parent_window); + g_free (uri_scheme); + } else { ++ launch_gnome_app_install_mimetype (screen, ++ file, ++ uri, ++ uri_for_display); ++#if 0 + #ifdef NEW_MIME_COMPLETE + nautilus_program_chooser_show_invalid_message + (GNOME_VFS_MIME_ACTION_TYPE_APPLICATION, file, parent_window); + #else + g_warning ("Can't open app: %s\n", error->message); + #endif ++#endif + } + } else { + for (l = files; l != NULL; l = l->next) { --- nautilus-2.27.4.orig/debian/patches/08_display_mimetype_warning.patch +++ nautilus-2.27.4/debian/patches/08_display_mimetype_warning.patch @@ -0,0 +1,59 @@ +# Ubuntu: https://launchpad.net/bugs/19101 +# Description: allow users to disable the mimetype mistmatch warnings +# +diff -Nur nautilus-2.18.0.1/libnautilus-private/apps_nautilus_preferences.schemas.in nautilus-2.18.0.1.new/libnautilus-private/apps_nautilus_preferences.schemas.in +--- nautilus-2.18.0.1/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-03-29 16:05:33.000000000 +0200 ++++ nautilus-2.18.0.1.new/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-03-29 16:12:04.000000000 +0200 +@@ -457,6 +457,20 @@ + + + ++ ++ ++ /schemas/apps/nautilus/preferences/display_mimetype_warning ++ /apps/nautilus/preferences/display_mimetype_warning ++ nautilus ++ bool ++ true ++ ++ Display mimetype warning ++ ++ Whether to open the file or display a warning dialog when the filename and the real mimetype are different ++ ++ ++ + + + +diff -Nur nautilus-2.18.0.1/libnautilus-private/nautilus-global-preferences.h nautilus-2.18.0.1.new/libnautilus-private/nautilus-global-preferences.h +--- nautilus-2.18.0.1/libnautilus-private/nautilus-global-preferences.h 2007-03-29 16:05:33.000000000 +0200 ++++ nautilus-2.18.0.1.new/libnautilus-private/nautilus-global-preferences.h 2007-03-29 16:07:43.000000000 +0200 +@@ -77,6 +77,9 @@ + /* Ubuntu spatial change */ + #define NAUTILUS_PREFERENCES_NO_UBUNTU_SPATIAL "preferences/no_ubuntu_spatial" + ++/* Open file when mimetype mismatch */ ++#define NAUTILUS_PREFERENCES_DISPLAY_MIMETYPE_WARNING "preferences/display_mimetype_warning" ++ + /* Activating executable text files */ + #define NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION "preferences/executable_text_activation" + +diff -Nur nautilus-2.18.0.1/src/file-manager/fm-directory-view.c nautilus-2.18.0.1.new/src/file-manager/fm-directory-view.c +--- nautilus-2.18.0.1/src/file-manager/fm-directory-view.c 2007-03-29 16:05:34.000000000 +0200 ++++ nautilus-2.18.0.1.new/src/file-manager/fm-directory-view.c 2007-03-29 16:19:11.000000000 +0200 +@@ -5053,10 +5053,12 @@ + if (default_app != NULL && + guessed_default_app != NULL && + !gnome_vfs_mime_application_equal (default_app, guessed_default_app)) { +- if (warn_on_mismatch) { +- warn_mismatched_mime_types (view, file); ++ if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_DISPLAY_MIMETYPE_WARNING)) { ++ if (warn_on_mismatch) { ++ warn_mismatched_mime_types (view, file); ++ } ++ ret = FALSE; + } +- ret = FALSE; + } + } + --- nautilus-2.27.4.orig/debian/patches/03_menu_entry.patch +++ nautilus-2.27.4/debian/patches/03_menu_entry.patch @@ -0,0 +1,51 @@ +# +# Description: simplify menus by not listing some entries by default +# +Index: nautilus-2.25.3/data/nautilus-file-management-properties.desktop.in +=================================================================== +--- nautilus-2.25.3.orig/data/nautilus-file-management-properties.desktop.in 2009-01-19 20:49:48.000000000 +0100 ++++ nautilus-2.25.3/data/nautilus-file-management-properties.desktop.in 2009-01-19 23:08:45.000000000 +0100 +@@ -9,6 +9,7 @@ + StartupNotify=true + Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings; + OnlyShowIn=GNOME; ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=nautilus + X-GNOME-Bugzilla-Component=Preferences +Index: nautilus-2.25.3/data/nautilus-file-management-properties.desktop.in.in +=================================================================== +--- nautilus-2.25.3.orig/data/nautilus-file-management-properties.desktop.in.in 2008-09-14 14:14:27.000000000 +0200 ++++ nautilus-2.25.3/data/nautilus-file-management-properties.desktop.in.in 2009-01-19 23:08:45.000000000 +0100 +@@ -9,6 +9,7 @@ + StartupNotify=true + Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings; + OnlyShowIn=GNOME; ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=nautilus + X-GNOME-Bugzilla-Component=Preferences +Index: nautilus-2.25.3/data/nautilus-browser.desktop.in +=================================================================== +--- nautilus-2.25.3.orig/data/nautilus-browser.desktop.in 2009-01-19 20:49:48.000000000 +0100 ++++ nautilus-2.25.3/data/nautilus-browser.desktop.in 2009-01-19 23:08:45.000000000 +0100 +@@ -8,6 +8,7 @@ + Terminal=false + StartupNotify=true + Type=Application ++NoDisplay=true + Categories=GNOME;GTK;System;Utility;Core; + OnlyShowIn=GNOME; + X-GNOME-Bugzilla-Bugzilla=GNOME +Index: nautilus-2.25.3/data/nautilus-browser.desktop.in.in +=================================================================== +--- nautilus-2.25.3.orig/data/nautilus-browser.desktop.in.in 2008-10-02 14:26:49.000000000 +0200 ++++ nautilus-2.25.3/data/nautilus-browser.desktop.in.in 2009-01-19 23:08:45.000000000 +0100 +@@ -8,6 +8,7 @@ + Terminal=false + StartupNotify=true + Type=Application ++NoDisplay=true + Categories=GNOME;GTK;System;Utility;Core; + OnlyShowIn=GNOME; + X-GNOME-Bugzilla-Bugzilla=GNOME --- nautilus-2.27.4.orig/debian/patches/10_load_session.patch +++ nautilus-2.27.4/debian/patches/10_load_session.patch @@ -0,0 +1,15 @@ +Index: nautilus-2.26.2/cut-n-paste-code/libegg/eggsmclient.c +=================================================================== +--- nautilus-2.26.2.orig/cut-n-paste-code/libegg/eggsmclient.c 2009-04-25 02:18:21.289920137 +0200 ++++ nautilus-2.26.2/cut-n-paste-code/libegg/eggsmclient.c 2009-04-25 02:19:21.805416302 +0200 +@@ -240,6 +240,10 @@ egg_sm_client_get_option_group (void) + { "sm-config-prefix", 0, G_OPTION_FLAG_HIDDEN, + G_OPTION_ARG_STRING, &sm_config_prefix, + NULL, NULL }, ++ /* Compatibility with the old nautilus code */ ++ { "load-session", 0, G_OPTION_FLAG_HIDDEN, ++ G_OPTION_ARG_FILENAME, &sm_client_state_file, ++ NULL, NULL }, + { NULL } + }; + GOptionGroup *group; --- nautilus-2.27.4.orig/debian/patches/01_lpi.patch +++ nautilus-2.27.4/debian/patches/01_lpi.patch @@ -0,0 +1,50 @@ +# Description: launchpad integration items +# UbuntuSpecific: launchpad +# +Index: nautilus-2.27.4/configure.in +=================================================================== +--- nautilus-2.27.4.orig/configure.in 2009-07-14 09:09:13.000000000 +1000 ++++ nautilus-2.27.4/configure.in 2009-07-14 16:07:39.000000000 +1000 +@@ -384,7 +384,7 @@ + AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS) + + dnl core nautilus +-CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES" ++CORE_MODULES="glib-2.0 gnome-desktop-2.0 launchpad-integration gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 dbus-glib-1 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES" + CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS" + AC_SUBST(CORE_CFLAGS) + CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" +Index: nautilus-2.27.4/src/nautilus-shell-ui.xml +=================================================================== +--- nautilus-2.27.4.orig/src/nautilus-shell-ui.xml 2009-06-25 00:00:12.000000000 +1000 ++++ nautilus-2.27.4/src/nautilus-shell-ui.xml 2009-07-14 16:07:39.000000000 +1000 +@@ -63,6 +63,7 @@ + + + ++ + + + +Index: nautilus-2.27.4/src/nautilus-window-menus.c +=================================================================== +--- nautilus-2.27.4.orig/src/nautilus-window-menus.c 2009-06-25 00:00:12.000000000 +1000 ++++ nautilus-2.27.4/src/nautilus-window-menus.c 2009-07-14 16:07:39.000000000 +1000 +@@ -56,6 +56,7 @@ + #include + #include + #include ++#include + + #define MENU_PATH_EXTENSION_ACTIONS "/MenuBar/File/Extension Actions" + #define POPUP_PATH_EXTENSION_ACTIONS "/background/Before Zoom Items/Extension Actions" +@@ -922,6 +923,9 @@ + + ui = nautilus_ui_string_get ("nautilus-shell-ui.xml"); + gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL); ++ ++ launchpad_integration_add_ui (ui_manager, ++ "/MenuBar/Help/LaunchpadItems"); + + nautilus_window_initialize_trash_icon_monitor (window); + nautilus_window_initialize_bookmarks_menu (window); --- nautilus-2.27.4.orig/debian/patches/10_location_titlebar.patch +++ nautilus-2.27.4/debian/patches/10_location_titlebar.patch @@ -0,0 +1,193 @@ +Debian #413018 +GNOME #142087 +Option to show the full location in the title bar +Index: nautilus-2.20.0/libnautilus-private/apps_nautilus_preferences.schemas.in +=================================================================== +--- nautilus-2.20.0.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-09-18 08:51:48.000000000 +0200 ++++ nautilus-2.20.0/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-09-24 11:39:14.871645609 +0200 +@@ -720,6 +720,21 @@ + + + ++ ++ /schemas/apps/nautilus/preferences/location_in_title_bar ++ /apps/nautilus/preferences/location_in_title_bar ++ nautilus ++ bool ++ false ++ ++ Show current location in title bar ++ ++ If set to true, windows will have the full location displayed ++ in their title bar. Otherwise it will only show the folder name. ++ ++ ++ ++ + + /schemas/apps/nautilus/preferences/start_with_sidebar + /apps/nautilus/preferences/start_with_sidebar +Index: nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.c +=================================================================== +--- nautilus-2.20.0.orig/libnautilus-private/nautilus-global-preferences.c 2007-06-27 09:12:34.000000000 +0200 ++++ nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.c 2007-09-24 11:39:14.875645837 +0200 +@@ -378,6 +378,10 @@ + PREFERENCE_BOOLEAN, + GINT_TO_POINTER (TRUE) + }, ++ { NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR, ++ PREFERENCE_BOOLEAN, ++ GINT_TO_POINTER (TRUE) ++ }, + { NAUTILUS_PREFERENCES_START_WITH_SIDEBAR, + PREFERENCE_BOOLEAN, + GINT_TO_POINTER (TRUE) +Index: nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.h +=================================================================== +--- nautilus-2.20.0.orig/libnautilus-private/nautilus-global-preferences.h 2007-06-27 09:12:34.000000000 +0200 ++++ nautilus-2.20.0/libnautilus-private/nautilus-global-preferences.h 2007-09-24 11:39:14.875645837 +0200 +@@ -84,6 +84,7 @@ + #define NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR "preferences/start_with_location_bar" + #define NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY "preferences/always_use_location_entry" + #define NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR "preferences/start_with_status_bar" ++#define NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR "preferences/location_in_title_bar" + #define NAUTILUS_PREFERENCES_START_WITH_SIDEBAR "preferences/start_with_sidebar" + #define NAUTILUS_PREFERENCES_START_WITH_TOOLBAR "preferences/start_with_toolbar" + #define NAUTILUS_PREFERENCES_SIDE_PANE_VIEW "preferences/side_pane_view" +Index: nautilus-2.20.0/src/nautilus-navigation-window.c +=================================================================== +--- nautilus-2.20.0.orig/src/nautilus-navigation-window.c 2007-09-03 16:49:27.000000000 +0200 ++++ nautilus-2.20.0/src/nautilus-navigation-window.c 2007-09-24 11:39:14.875645837 +0200 +@@ -914,20 +914,25 @@ + static gboolean + real_set_title (NautilusWindow *window, const char *title) + { +- char *full_title; +- char *window_title; + gboolean changed; + + changed = EEL_CALL_PARENT_WITH_RETURN_VALUE + (NAUTILUS_WINDOW_CLASS, set_title, (window, title)); + + if (changed) { +- full_title = g_strdup_printf (_("%s - File Browser"), title); ++ char *full_title; ++ char *window_title; ++ char *location_titlebar; ++ ++ location_titlebar = nautilus_window_set_location_in_titlebar (window, title); ++ ++ full_title = g_strdup_printf (_("%s - File Browser"), location_titlebar); + + window_title = eel_str_middle_truncate (full_title, MAX_TITLE_LENGTH); + gtk_window_set_title (GTK_WINDOW (window), window_title); + g_free (window_title); + g_free (full_title); ++ g_free (location_titlebar); + } + + return changed; +Index: nautilus-2.20.0/src/nautilus-spatial-window.c +=================================================================== +--- nautilus-2.20.0.orig/src/nautilus-spatial-window.c 2007-09-10 08:56:43.000000000 +0200 ++++ nautilus-2.20.0/src/nautilus-spatial-window.c 2007-09-24 11:39:14.875645837 +0200 +@@ -430,10 +430,14 @@ + gtk_window_set_title (GTK_WINDOW (window), _("Nautilus")); + } else if (changed) { + char *window_title; ++ char *location_titlebar; + +- window_title = eel_str_middle_truncate (title, MAX_TITLE_LENGTH); ++ location_titlebar = nautilus_window_set_location_in_titlebar (window, title); ++ ++ window_title = eel_str_middle_truncate (location_titlebar, MAX_TITLE_LENGTH); + gtk_window_set_title (GTK_WINDOW (window), window_title); + g_free (window_title); ++ g_free (location_titlebar); + } + + return changed; +--- nautilus-2.22.0/src/nautilus-window.c.old 2008-03-17 10:49:47.000000000 +0100 ++++ nautilus-2.22.0/src/nautilus-window.c 2008-03-17 11:11:29.000000000 +0100 +@@ -1709,3 +1709,71 @@ + { + return (nautilus_window_get_window_type (window) != NAUTILUS_WINDOW_DESKTOP); + } ++ ++char * ++nautilus_window_set_location_in_titlebar (NautilusWindow *window, const char *title) ++{ ++ char *location_title; ++ GFile *uri = NULL; ++ char *location = NULL; ++ const char *path; ++ const char *scheme = NULL; ++ const char *display_location; ++ const char *tmp_location; ++ const char *location_prefix; ++ int tmp_location_len; ++ int tilde = 0; ++ ++ location_title = g_strdup (title); ++ ++ if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) != TRUE ++ || (uri = nautilus_window_get_location (window)) == NULL ++ || (location = g_file_get_parse_name (uri)) == NULL ++ || location[0] == 0 ++ || location[1] == 0) ++ goto done; ++ ++ if ((tmp_location = g_get_home_dir()) == NULL) { ++ display_location = location; ++ goto construct_title; ++ } ++ ++ if (strcmp (location, tmp_location) == 0) { ++ tilde = 1; ++ display_location = ""; ++ goto construct_title; ++ } ++ ++ tmp_location_len = strlen (tmp_location); ++ if (eel_str_has_prefix (location, tmp_location) == FALSE ++ || location[tmp_location_len] != G_DIR_SEPARATOR) { ++ display_location = location; ++ goto construct_title; ++ } ++ ++ tilde = 1; ++ display_location = location + tmp_location_len; ++ ++ construct_title: ++ ++ g_free (location_title); ++ ++ if(scheme != NULL) ++ location_prefix = scheme; ++ else if(tilde == 1) ++ location_prefix = "~"; ++ else ++ location_prefix = ""; ++ ++ location_title = g_strdup_printf ("%s (%s%s%s)", title, location_prefix, scheme != NULL ? " - " : "", display_location); ++ ++ done: ++ if (uri != NULL) ++ g_object_unref (uri); ++ ++ if (location != NULL) ++ g_free (location); ++ ++ return (location_title); ++} ++ +--- nautilus-2.22.0/src/nautilus-window.h.old 2008-03-17 10:49:50.000000000 +0100 ++++ nautilus-2.22.0/src/nautilus-window.h 2008-03-17 10:51:45.000000000 +0100 +@@ -152,5 +152,7 @@ + void nautilus_window_add_extra_location_widget (NautilusWindow *window, + GtkWidget *widget); + gboolean nautilus_window_has_menubar_and_statusbar (NautilusWindow *window); ++char * nautilus_window_set_location_in_titlebar (NautilusWindow *window, ++ const char *title); + + #endif --- nautilus-2.27.4.orig/debian/patches/80_suppress_umount_in_ltsp.patch +++ nautilus-2.27.4/debian/patches/80_suppress_umount_in_ltsp.patch @@ -0,0 +1,29 @@ +# Description: don't list volumes option on ltsp configs +# Ubuntu: https://launchpad.net/bugs/220564 +# +Index: nautilus-2.27.4/libnautilus-private/nautilus-file.c +=================================================================== +--- nautilus-2.27.4.orig/libnautilus-private/nautilus-file.c 2009-07-14 05:47:03.000000000 +1000 ++++ nautilus-2.27.4/libnautilus-private/nautilus-file.c 2009-07-14 16:08:08.000000000 +1000 +@@ -1012,6 +1012,10 @@ + { + g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); + ++ if (getenv("LTSP_CLIENT")) { ++ return FALSE; ++ } ++ + return file->details->can_unmount || + (file->details->mount != NULL && + g_mount_can_unmount (file->details->mount)); +@@ -1022,6 +1026,10 @@ + { + g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE); + ++ if (getenv("LTSP_CLIENT")) { ++ return FALSE; ++ } ++ + return file->details->can_eject || + (file->details->mount != NULL && + g_mount_can_eject (file->details->mount)); --- nautilus-2.27.4.orig/debian/patches/12_list-view_expand.patch +++ nautilus-2.27.4/debian/patches/12_list-view_expand.patch @@ -0,0 +1,46 @@ +Revert upstream commits r12779 and r13045. +We can do this because we fix GNOME #316087 in our GTK+ packages. +Index: nautilus-2.27.4/src/file-manager/fm-list-view.c +=================================================================== +--- nautilus-2.27.4.orig/src/file-manager/fm-list-view.c 2009-06-25 00:00:12.000000000 +1000 ++++ nautilus-2.27.4/src/file-manager/fm-list-view.c 2009-07-14 16:08:01.000000000 +1000 +@@ -58,7 +58,6 @@ + #include + #include + #include +-#include + + struct FMListViewDetails { + GtkTreeView *tree_view; +@@ -1421,7 +1420,7 @@ + + for (l = nautilus_columns; l != NULL; l = l->next) { + NautilusColumn *nautilus_column; +- int column_num; ++ int column_num, font_size; + char *name; + char *label; + float xalign; +@@ -1444,6 +1443,9 @@ + view->details->pixbuf_cell = (GtkCellRendererPixbuf *)cell; + + view->details->file_name_column = gtk_tree_view_column_new (); ++ gtk_tree_view_column_set_expand (view->details->file_name_column, TRUE); ++ font_size = PANGO_PIXELS (pango_font_description_get_size (GTK_WIDGET(view)->style->font_desc)); ++ gtk_tree_view_column_set_min_width (view->details->file_name_column, 20*font_size); + g_object_ref (view->details->file_name_column); + view->details->file_name_column_num = column_num; + +@@ -1464,7 +1466,11 @@ + "pixbuf_emblem", FM_LIST_MODEL_SMALLEST_EMBLEM_COLUMN, + NULL); + +- cell = nautilus_cell_renderer_text_ellipsized_new (); ++ cell = gtk_cell_renderer_text_new (); ++ g_object_set (cell, ++ "ellipsize", PANGO_ELLIPSIZE_END, ++ "ellipsize-set", TRUE, ++ NULL); + view->details->file_name_cell = (GtkCellRendererText *)cell; + g_signal_connect (cell, "edited", G_CALLBACK (cell_renderer_edited), view); + g_signal_connect (cell, "editing-canceled", G_CALLBACK (cell_renderer_editing_canceled), view);