--- nautilus-2.20.0.orig/debian/menu +++ nautilus-2.20.0/debian/menu @@ -0,0 +1,2 @@ +?package(nautilus):needs="X11" section="Apps/System" \ + title="Nautilus" command="/usr/bin/nautilus" icon="/usr/share/pixmaps/nautilus.xpm" --- nautilus-2.20.0.orig/debian/control +++ nautilus-2.20.0/debian/control @@ -0,0 +1,136 @@ +Source: nautilus +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers +Build-Depends: debhelper (>= 5), + cdbs (>= 0.4.41), + quilt, + gettext, + libgtk2.0-dev (>= 2.10.0), + libgnomeui-dev (>= 2.16.0-2), + libbonobo2-dev (>= 2.15), + libgnomevfs2-dev (>= 1:2.16.0-1), + libeel2-dev (>= 2.16.0), + librsvg2-dev (>= 2.16.0-2), + libgnome-desktop-dev (>= 2.9.91), + libesd0-dev (>= 0.2.27), + libgconf2-dev (>= 2.6.1-2), + librsvg2-common (>= 2.16.0-2), + desktop-base (>= 0.2), + libxml-parser-perl, + gnome-pkg-tools (>= 0.10), + dpkg-dev (>= 1.13.19), + libxt-dev, + libexif-dev (>= 0.6.12), + libart-2.0-dev (>= 2.3.10), + liborbit2-dev (>= 2.4.0), + libxml2-dev (>= 2.4.7), + libstartup-notification0-dev (>= 0.8), + docbook-utils, + libselinux1-dev, + libglib2.0-dev (>= 2.6.0), + libgnome2-dev (>= 2.14.0), + libpango1.0-dev (>= 1.1.2), + x11proto-core-dev, + liblaunchpad-integration-dev, + libbeagle-dev [amd64 i386 ia64 powerpc sparc], + libtrackerclient-dev, + intltool +Standards-Version: 3.7.2 + +Package: nautilus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + nautilus-data (>= ${gnome:Version}), + nautilus-data (<< ${gnome:NextVersion}), + shared-mime-info, + gnome-control-center (>= 2.6), + desktop-file-utils (>= 0.7) +Recommends: desktop-base (>= 0.2), + eject, + nautilus-cd-burner (>= 2.6), + librsvg2-common, + libgnomevfs2-extra, + gamin | fam, + gnome-app-install (>= 0.2.6~), + xdg-user-dirs +Suggests: eog, + evince | pdf-viewer, + totem | mp3-decoder, + beagle +Conflicts: libnautilus2-2, + libnautilus2-dev +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. + . + URL: http://www.gnome.org/projects/nautilus/ + +Package: nautilus-dbg +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. + . + URL: http://www.gnome.org/projects/nautilus/ + . + 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 +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}), + libgtk2.0-dev (>= 2.10.0), + libgnomevfs2-dev (>= 1:2.16.0-1), + ${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.20.0.orig/debian/nautilus-data.install +++ nautilus-2.20.0/debian/nautilus-data.install @@ -0,0 +1,8 @@ +debian/tmp/etc +debian/tmp/usr/lib/bonobo +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.20.0.orig/debian/rules +++ nautilus-2.20.0/debian/rules @@ -0,0 +1,17 @@ +#!/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 + +# debug lib +DEB_DH_STRIP_ARGS += --dbg-package=nautilus-dbg + +DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed +DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.17.90)' --- nautilus-2.20.0.orig/debian/watch +++ nautilus-2.20.0/debian/watch @@ -0,0 +1,4 @@ +version=2 +ftp://ftp.gnome.org/pub/GNOME/sources/nautilus/([\d\.]+)[02468]/ \ + nautilus-(.*)\.tar\.gz \ + debian uupdate --- nautilus-2.20.0.orig/debian/libnautilus-extension-dev.install +++ nautilus-2.20.0/debian/libnautilus-extension-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libnautilus-extension*.so +debian/tmp/usr/include +debian/tmp/usr/lib/pkgconfig --- nautilus-2.20.0.orig/debian/changelog +++ nautilus-2.20.0/debian/changelog @@ -0,0 +1,1336 @@ +nautilus (1:2.20.0-0ubuntu6) gutsy; urgency=low + + * Add debian/patches/12_vfat_no_free_space.patch: Do not show the free space + for VFAT volumes in the file browser. This avoids the most prominent + incarnation of the "statfs() takes minutes after mounting a vfat + partition" kernel bug. (LP: #133567) + + -- Martin Pitt Thu, 04 Oct 2007 17:08:53 +0200 + +nautilus (1:2.20.0-0ubuntu5) gutsy; urgency=low + + * debian/patches/90_from_bugzilla_beep_on_backspace.patch: + - patch from Joachim Sauer, don't beep on backspace or delete key events + (LP: #141226) + + -- Sebastien Bacher Wed, 03 Oct 2007 15:53:55 +0200 + +nautilus (1:2.20.0-0ubuntu4) gutsy; urgency=low + + * debian/patches/91_from_svn_not_clear_thumbnails.patch: + - patch from SVN, fix thumbnails not being correctly displayed sometimes + (LP: #145212) + + -- Sebastien Bacher Tue, 02 Oct 2007 18:08:03 +0200 + +nautilus (1:2.20.0-0ubuntu3) gutsy; urgency=low + + * debian/control.in: + - Build-Depends on intltool so the translations template is updated + (LP: #145822) + + -- Sebastien Bacher Fri, 28 Sep 2007 13:18:58 +0200 + +nautilus (1:2.20.0-0ubuntu2) gutsy; urgency=low + + * debian/patches/90_from_bugzilla_thumbnails_have_frames.patch: + - patch from bugzilla #478363, display frames around thumbnails + (LP: #141170) + + -- Sebastien Bacher Wed, 26 Sep 2007 15:46:03 +0200 + +nautilus (1:2.20.0-0ubuntu1) gutsy; urgency=low + + * New upstream version: + - Load thumbnails asynchronously (LP: #26198) + - Support direct save DnD (XDS) (LP: #13199) + - Fix up octal permission display + - Store window keep-above and stickines state across sessions + + -- Sebastien Bacher Tue, 18 Sep 2007 12:29:55 +0200 + +nautilus (1:2.19.91-0ubuntu1) gutsy; urgency=low + + * New upstream version: + - Be more robust against broken extensions + - Set current working directory right on desktop when running scripts + - Fix crash on file:///# (LP: #21410) + - Update to cope with the new size of emblem icons + + -- Sebastien Bacher Mon, 27 Aug 2007 12:37:10 +0200 + +nautilus (1:2.19.90-0ubuntu1) gutsy; urgency=low + + * New upstream version: + - Auto-size list view filename column again (LP: #93381) + - New message for service unavailable error + - UI terminology consistency fix + - Build fix + * debian/patches/12_list-view_expand.patch: + - dropped, fixed with the new version + * debian/patches/90_from_svn_fix_combo_crasher.patch: + - dropped, fixed with the new version + + -- Sebastien Bacher Tue, 14 Aug 2007 12:46:02 +0200 + +nautilus (1:2.19.6-0ubuntu2) gutsy; urgency=low + + * debian/control.in: + - Build-Depends on libtrackerclient-dev (LP: #83876) + + -- Sebastien Bacher Tue, 07 Aug 2007 16:57:33 +0200 + +nautilus (1:2.19.6-0ubuntu1) gutsy; urgency=low + + * New upstream release: + - Fixes to UI manager usage + - Better string ellipsation + - Consistent focus behaviour for toolbar buttons + - Support for XMP image metadata + - Improved keyboard handling in connect to server dialog (LP: #93247) + - I18n fixes and string clarifications + - Add more tooltips and use new gtk+ tootips API (LP: #49183) + - Better handling of unreadable directories during search + - Fix various crashes (LP: #120753) + - Translation updates + * debian/patches/90_from_svn_fix_combo_crasher.patch: + - dropped as got fixed upstream + + -- Aron Sisak Tue, 31 Jul 2007 09:18:01 +0200 + +nautilus (1:2.19.5-0ubuntu2) gutsy; urgency=low + + * debian/patches/90_from_svn_fix_combo_crasher.patch: + - patch from SVN, fix a crash with the new GTK version (LP: #127826) + + -- Sebastien Bacher Tue, 24 Jul 2007 15:17:58 +0200 + +nautilus (1:2.19.5-0ubuntu1) gutsy; urgency=low + + * New upstream release + - Build fixes + - Fix leaks + - Fix crash + - Improved JPEG metadata handling + - Fix information sidebar layout + - Translation updates + * debian/patches/01_lpi.patch: + - update + * debian/patches/02_autoconf.patch: + - configure update. + + -- Aron Sisak Sat, 21 Jul 2007 11:41:58 +0200 + +nautilus (1:2.19.4-0ubuntu2) gutsy; urgency=low + + * Sync with Debian + * debian/control.in: + - Build-Depends on liblaunchpad-integration-dev, libbeagle-dev [amd64 i386 ia64 powerpc sparc] + - maintainer is the Ubuntu Desktop Team + - nautilus Recommends gamin before fam, gnome-app-install (>= 0.2.6~), + and xdg-user-dirs + - nautilus Suggests beagle + * debian/nautilus.manpages, debian/nautilus-connect-server.1: + - manpage to nautilus-connect-server + * 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/02_ubuntuspatial.patch: + - ubuntu spatial mode. + * debian/patches/03_menu_entry.patch: + - change the menu item category. + * debian/patches/05_places-sidebar_single-click.patch: + - dropped, conflict with upstream changes + * debian/patches/08_display_mimetype_warning.patch: + - new "preferences/display_mimetype_warning" gconf key which allow to use + or not the mismatching mimetype warning dialog (Ubuntu: #19101) + * debian/patches/10_rename_desktop.patch: + - patch by Gary Coady , make renaming of a .desktop + work with the language packs too (Ubuntu: #39002) + * debian/patches/80_suppress_umount_in_ltsp.patch: + - don't list umount or eject actions on ltsp, + patch by Oliver Grawert + * debian/patches/81_gnome-app-install.patch: + - Invoke gnome-app-install when no application known for file. + - patch by Ian Jackson + + -- Sebastien Bacher Fri, 29 Jun 2007 15:37:45 +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.20.0.orig/debian/nautilus.postrm +++ nautilus-2.20.0/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.20.0.orig/debian/nautilus-connect-server.1 +++ nautilus-2.20.0/debian/nautilus-connect-server.1 @@ -0,0 +1,52 @@ +.\" 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 "01 Jun 2007" +.\" 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 ] +.br +.SH DESCRIPTION +This manual page documents briefly the +.B nautilus-connect-server +command. This manual page was written for the Ubuntu distribution +because the original program does not have a manual page. +.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. +.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 \-\-display +X display to use +.TP +.B \-\-help +Show a summary of options. +.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 Fernando Ribeiro +for the Ubuntu system (but may be used by others). --- nautilus-2.20.0.orig/debian/nautilus-data.gconf-defaults +++ nautilus-2.20.0/debian/nautilus-data.gconf-defaults @@ -0,0 +1,4 @@ +/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.20.0.orig/debian/compat +++ nautilus-2.20.0/debian/compat @@ -0,0 +1 @@ +5 --- nautilus-2.20.0.orig/debian/nautilus.install +++ nautilus-2.20.0/debian/nautilus.install @@ -0,0 +1,3 @@ +debian/tmp/usr/bin +debian/tmp/usr/share/applications +debian/tmp/usr/share/mime/application --- nautilus-2.20.0.orig/debian/nautilus.manpages +++ nautilus-2.20.0/debian/nautilus.manpages @@ -0,0 +1,2 @@ +debian/nautilus.1 +debian/nautilus-connect-server.1 --- nautilus-2.20.0.orig/debian/nautilus.1 +++ nautilus-2.20.0/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.20.0.orig/debian/control.in +++ nautilus-2.20.0/debian/control.in @@ -0,0 +1,136 @@ +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, + gettext, + libgtk2.0-dev (>= 2.10.0), + libgnomeui-dev (>= 2.16.0-2), + libbonobo2-dev (>= 2.15), + libgnomevfs2-dev (>= 1:2.16.0-1), + libeel2-dev (>= 2.16.0), + librsvg2-dev (>= 2.16.0-2), + libgnome-desktop-dev (>= 2.9.91), + libesd0-dev (>= 0.2.27), + libgconf2-dev (>= 2.6.1-2), + librsvg2-common (>= 2.16.0-2), + desktop-base (>= 0.2), + libxml-parser-perl, + gnome-pkg-tools (>= 0.10), + dpkg-dev (>= 1.13.19), + libxt-dev, + libexif-dev (>= 0.6.12), + libart-2.0-dev (>= 2.3.10), + liborbit2-dev (>= 2.4.0), + libxml2-dev (>= 2.4.7), + libstartup-notification0-dev (>= 0.8), + docbook-utils, + libselinux1-dev, + libglib2.0-dev (>= 2.6.0), + libgnome2-dev (>= 2.14.0), + libpango1.0-dev (>= 1.1.2), + x11proto-core-dev, + liblaunchpad-integration-dev, + libbeagle-dev [amd64 i386 ia64 powerpc sparc], + libtrackerclient-dev, + intltool +Standards-Version: 3.7.2 + +Package: nautilus +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + nautilus-data (>= ${gnome:Version}), + nautilus-data (<< ${gnome:NextVersion}), + shared-mime-info, + gnome-control-center (>= 2.6), + desktop-file-utils (>= 0.7) +Recommends: desktop-base (>= 0.2), + eject, + nautilus-cd-burner (>= 2.6), + librsvg2-common, + libgnomevfs2-extra, + gamin | fam, + gnome-app-install (>= 0.2.6~), + xdg-user-dirs +Suggests: eog, + evince | pdf-viewer, + totem | mp3-decoder, + beagle +Conflicts: libnautilus2-2, + libnautilus2-dev +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. + . + URL: http://www.gnome.org/projects/nautilus/ + +Package: nautilus-dbg +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. + . + URL: http://www.gnome.org/projects/nautilus/ + . + 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 +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}), + libgtk2.0-dev (>= 2.10.0), + libgnomevfs2-dev (>= 1:2.16.0-1), + ${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.20.0.orig/debian/libnautilus-extension1.install +++ nautilus-2.20.0/debian/libnautilus-extension1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libnautilus-extension*.so.* --- nautilus-2.20.0.orig/debian/patches/01_lpi.patch +++ nautilus-2.20.0/debian/patches/01_lpi.patch @@ -0,0 +1,49 @@ +Index: nautilus-2.19.5/configure.in +=================================================================== +--- nautilus-2.19.5.orig/configure.in 2007-07-21 13:28:44.671203251 +0200 ++++ nautilus-2.19.5/configure.in 2007-07-21 13:29:34.173215722 +0200 +@@ -391,7 +391,7 @@ + AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS) + + dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires") +-CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gnome-vfs-module-2.0 $EXTRA_CORE_MODULES" ++CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 launchpad-integration libbonobo-2.0 esound gnome-desktop-2.0 gnome-vfs-module-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.19.5/src/nautilus-shell-ui.xml +=================================================================== +--- nautilus-2.19.5.orig/src/nautilus-shell-ui.xml 2007-07-21 13:28:51.671487517 +0200 ++++ nautilus-2.19.5/src/nautilus-shell-ui.xml 2007-07-21 13:29:03.671975289 +0200 +@@ -63,6 +63,9 @@ + + + ++ ++ ++ + + + +Index: nautilus-2.19.5/src/nautilus-window-menus.c +=================================================================== +--- nautilus-2.19.5.orig/src/nautilus-window-menus.c 2007-07-21 13:28:51.671487517 +0200 ++++ nautilus-2.19.5/src/nautilus-window-menus.c 2007-07-21 13:29:03.671975289 +0200 +@@ -69,6 +69,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" +@@ -728,6 +729,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_bookmarks_menu (window); + } + --- nautilus-2.20.0.orig/debian/patches/10_rename_desktop.patch +++ nautilus-2.20.0/debian/patches/10_rename_desktop.patch @@ -0,0 +1,11 @@ +diff -Nur nautilus-2.14.1/libnautilus-private/nautilus-link-desktop-file.c nautilus-2.14.1.new/libnautilus-private/nautilus-link-desktop-file.c +--- nautilus-2.14.1/libnautilus-private/nautilus-link-desktop-file.c 2006-03-18 07:45:15.000000000 +0100 ++++ nautilus-2.14.1.new/libnautilus-private/nautilus-link-desktop-file.c 2006-04-12 23:02:37.000000000 +0200 +@@ -173,6 +173,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.20.0.orig/debian/patches/81_gnome-app-install.patch +++ nautilus-2.20.0/debian/patches/81_gnome-app-install.patch @@ -0,0 +1,59 @@ +diff -Nur nautilus-2.18.0/libnautilus-private/nautilus-program-choosing.c nautilus-2.18.0.new/libnautilus-private/nautilus-program-choosing.c +--- nautilus-2.18.0/libnautilus-private/nautilus-program-choosing.c 2007-03-02 12:12:16.000000000 +0100 ++++ nautilus-2.18.0.new/libnautilus-private/nautilus-program-choosing.c 2007-03-12 12:30:37.000000000 +0100 +@@ -45,6 +45,7 @@ + #include + #include + #include ++#include + + /* This number controls a maximum character count for a URL that is + * displayed as part of a dialog. It's fairly arbitrary -- big enough +@@ -414,8 +415,27 @@ + #endif /* HAVE_STARTUP_NOTIFICATION */ + + ++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_show_file: +@@ -569,16 +589,8 @@ + + case GNOME_VFS_ERROR_NO_DEFAULT: + case GNOME_VFS_ERROR_NO_HANDLER: +-#ifdef NEW_MIME_COMPLETE +- nautilus_program_chooser_show_no_choices_message +- (action_type, file, parent_window); +- break; +-#endif +- error_message = g_strdup_printf (_("Couldn't display \"%s\"."), +- uri_for_display); +- /* TODO: This really needs to be something saying "no app +- * handling this file type", but there is a string freeze. */ +- detail_message = g_strdup (""); ++ launch_gnome_app_install_mimetype (screen, file, uri, ++ uri_for_display); + break; + + case GNOME_VFS_ERROR_LAUNCH: --- nautilus-2.20.0.orig/debian/patches/07_desktop_file_activation.patch +++ nautilus-2.20.0/debian/patches/07_desktop_file_activation.patch @@ -0,0 +1,115 @@ +Index: nautilus-2.18.1/libnautilus-private/nautilus-file.c +=================================================================== +--- nautilus-2.18.1.orig/libnautilus-private/nautilus-file.c 2007-04-10 14:06:07.000000000 +0200 ++++ nautilus-2.18.1/libnautilus-private/nautilus-file.c 2007-04-26 00:31:03.621655500 +0200 +@@ -40,6 +40,7 @@ + #include "nautilus-link-desktop-file.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" +@@ -2754,6 +2755,33 @@ + monitor_remove, (file, client)); + } + ++static gboolean ++safe_to_launch_desktop_file (NautilusFile *file) ++{ ++ gboolean ret = TRUE; ++ char *uri = nautilus_file_get_uri (file); ++ char *path = NULL; ++ ++ if (uri) { ++ path = gnome_vfs_get_local_path_from_uri (uri); ++ } ++ ++ if (!path || ++ eel_str_has_prefix (path, "/mnt") || ++ eel_str_has_prefix (path, "/media") || ++ !eel_str_has_suffix (path, ".desktop")) { ++ ret = FALSE; ++ } ++ ++ if (file->details->info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_IDS && ++ file->details->info->uid && ++ (uid_t) file->details->info->uid != geteuid ()) ++ ret = FALSE; ++ ++ g_free (uri); ++ g_free (path); ++ return ret; ++} + + /* Return the uri associated with the passed-in file, which may not be + * the actual uri if the file is an desktop file or a nautilus +@@ -2768,7 +2796,9 @@ + return NULL; + } + +- if (file->details->activation_uri != NULL) { ++ if (file->details->activation_uri != NULL && ++ (!eel_str_has_prefix (file->details->activation_uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER) || ++ safe_to_launch_desktop_file (file))) { + return g_strdup (file->details->activation_uri); + } + +@@ -5226,6 +5256,12 @@ + return nautilus_file_is_mime_type (file, "application/x-desktop"); + } + ++gboolean ++nautilus_file_is_desktop_launcher (NautilusFile *file) ++{ ++ return eel_str_has_prefix (file->details->activation_uri, NAUTILUS_DESKTOP_COMMAND_SPECIFIER); ++} ++ + /** + * nautilus_file_is_directory + * +Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c +=================================================================== +--- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c 2007-04-26 00:30:47.528649750 +0200 ++++ nautilus-2.18.1/src/file-manager/fm-directory-view.c 2007-04-26 00:31:03.625655750 +0200 +@@ -4606,7 +4606,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_desktop_launcher (file))); + } + + static ActivationAction +@@ -4687,12 +4688,14 @@ + for (node = selection; node != NULL; node = node->next) { + file = NAUTILUS_FILE (node->data); + +- other_applications_visible &= +- (!can_use_component_for_file (file) || +- nautilus_file_is_directory (file)); +- + activation_action = get_activation_action (file); + ++ if (activation_action != ACTIVATION_ACTION_OPEN_IN_APPLICATION && ++ (NAUTILUS_IS_DESKTOP_ICON_FILE (file) || ++ nautilus_file_is_nautilus_link (file))) { ++ other_applications_visible = FALSE; ++ } ++ + /* Only use the default app for open if there is not + a mime mismatch, otherwise we can't use it in the + open with menu */ +Index: nautilus-2.18.1/libnautilus-private/nautilus-file.h +=================================================================== +--- nautilus-2.18.1.orig/libnautilus-private/nautilus-file.h 2007-04-10 14:06:07.000000000 +0200 ++++ nautilus-2.18.1/libnautilus-private/nautilus-file.h 2007-04-26 00:31:03.629656000 +0200 +@@ -155,6 +155,7 @@ + char * nautilus_file_get_symbolic_link_target_uri (NautilusFile *file); + gboolean nautilus_file_is_broken_symbolic_link (NautilusFile *file); + gboolean nautilus_file_is_nautilus_link (NautilusFile *file); ++gboolean nautilus_file_is_desktop_launcher (NautilusFile *file); + gboolean nautilus_file_is_executable (NautilusFile *file); + gboolean nautilus_file_is_directory (NautilusFile *file); + gboolean nautilus_file_is_in_trash (NautilusFile *file); --- nautilus-2.20.0.orig/debian/patches/90_from_bugzilla_beep_on_backspace.patch +++ nautilus-2.20.0/debian/patches/90_from_bugzilla_beep_on_backspace.patch @@ -0,0 +1,13 @@ +--- nautilus-2.20.0/libnautilus-private/nautilus-icon-container.c 2007-09-10 12:49:01.000000000 +0200 ++++ nautilus-mod/libnautilus-private/nautilus-icon-container.c 2007-10-03 15:06:56.000000000 +0200 +@@ -4378,7 +4378,9 @@ + * start the typeahead find capabilities. + * Copied from NautilusIconContainer */ + if (!handled && +- event->keyval != GDK_slash /* don't steal slash key event, used for "go to" */) { ++ event->keyval != GDK_slash /* don't steal slash key event, used for "go to" */ && ++ event->keyval != GDK_BackSpace && ++ event->keyval != GDK_Delete) { + GdkEvent *new_event; + char *old_text; + const char *new_text; --- nautilus-2.20.0.orig/debian/patches/90_from_bugzilla_thumbnails_have_frames.patch +++ nautilus-2.20.0/debian/patches/90_from_bugzilla_thumbnails_have_frames.patch @@ -0,0 +1,26 @@ +Index: libnautilus-private/nautilus-icon-factory.c +=================================================================== +--- libnautilus-private/nautilus-icon-factory.c (Revision 13137) ++++ nautilus-2.20.0/libnautilus-private/nautilus-icon-factory.c (Arbeitskopie) +@@ -384,9 +384,21 @@ async_thumbnail_load_func (NautilusThumb + goto out; + } + ++ if (!gdk_pixbuf_get_has_alpha (pixbuf)) { ++ /* we don't own the pixbuf, but nautilus_thumbnail_frame_image() assumes so and unrefs it. */ ++ g_object_ref (pixbuf); ++ ++ nautilus_thumbnail_frame_image (&pixbuf); ++ /* at this point, we own a pixbuf, which is the framed version of the passed-in pixbuf. */ ++ } ++ + cached_icon = cache_icon_new (pixbuf, NULL, scale_x, scale_y); + cached_icon->mtime = statbuf.st_mtime; + ++ if (!gdk_pixbuf_get_has_alpha (pixbuf)) { ++ g_object_unref (pixbuf); ++ } ++ + if (cached_icon != NULL) { + key = g_new (CacheKey, 1); + key->name = g_strdup (path); --- nautilus-2.20.0.orig/debian/patches/08_folder_handler.patch +++ nautilus-2.20.0/debian/patches/08_folder_handler.patch @@ -0,0 +1,9 @@ +Index: nautilus-2.16.3/nautilus-folder-handler.desktop.in.in +=================================================================== +--- nautilus-2.16.3.orig/nautilus-folder-handler.desktop.in.in 2007-02-17 00:16:34.000000000 +0100 ++++ nautilus-2.16.3/nautilus-folder-handler.desktop.in.in 2007-02-17 00:17:12.000000000 +0100 +@@ -12,3 +12,4 @@ + X-GNOME-Bugzilla-Product=nautilus + X-GNOME-Bugzilla-Component=general + X-GNOME-Bugzilla-Version=@VERSION@ ++OnlyShowIn=GNOME --- nautilus-2.20.0.orig/debian/patches/20_upstream_nautilus-dnd-user-owned.patch +++ nautilus-2.20.0/debian/patches/20_upstream_nautilus-dnd-user-owned.patch @@ -0,0 +1,64 @@ +Index: libnautilus-private/nautilus-dnd.c +=================================================================== +--- libnautilus-private/nautilus-dnd.c.orig 2007-04-10 14:06:07.000000000 +0200 ++++ libnautilus-private/nautilus-dnd.c 2007-04-26 00:31:56.596966250 +0200 +@@ -303,6 +303,26 @@ + return context->suggested_action; + } + ++static gboolean ++uri_is_user_owned (GnomeVFSURI *uri) ++{ ++ gboolean user_owned; ++ ++ user_owned = FALSE; ++ ++ if (uri != NULL && !strcmp (gnome_vfs_uri_get_scheme (uri), "file")) { ++ GnomeVFSFileInfo *info; ++ ++ info = gnome_vfs_file_info_new (); ++ if (gnome_vfs_get_file_info_uri (uri, info, GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS) == GNOME_VFS_OK) { ++ user_owned = (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_IDS) && ++ geteuid () == info->uid; ++ } ++ gnome_vfs_file_info_unref (info); ++ } ++ ++ return user_owned; ++} + + void + nautilus_drag_default_drop_action_for_icons (GdkDragContext *context, +@@ -386,11 +406,12 @@ + if (dropped_uri != NULL) { + gnome_vfs_check_same_fs_uris (dropped_uri, target_uri, &same_fs); + target_is_source_parent = gnome_vfs_uri_is_parent (target_uri, dropped_uri, FALSE); +- gnome_vfs_uri_unref (dropped_uri); + } +- gnome_vfs_uri_unref (target_uri); +- +- if (same_fs || target_is_source_parent) { ++ ++ if ((same_fs || target_is_source_parent) && ++ /* use copy by default when dragging from user-owned location ++ * to location owned by somebody else */ ++ !(uri_is_user_owned (dropped_uri) && !uri_is_user_owned (target_uri))) { + if (actions & GDK_ACTION_MOVE) { + *action = GDK_ACTION_MOVE; + } else { +@@ -403,6 +424,15 @@ + *action = context->suggested_action; + } + } ++ ++ if (dropped_uri != NULL) { ++ gnome_vfs_uri_unref (dropped_uri); ++ } ++ ++ if (target_uri != NULL) { ++ gnome_vfs_uri_unref (target_uri); ++ } ++ + } + + /* Encode a "x-special/gnome-icon-list" selection. --- nautilus-2.20.0.orig/debian/patches/03_sftp_connect.patch +++ nautilus-2.20.0/debian/patches/03_sftp_connect.patch @@ -0,0 +1,13 @@ +Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c +=================================================================== +--- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c 2007-04-26 00:30:37.448019750 +0200 ++++ nautilus-2.18.1/src/file-manager/fm-directory-view.c 2007-04-26 00:30:42.220318000 +0200 +@@ -7281,6 +7281,8 @@ + uri = nautilus_file_get_activation_uri (file); + if (uri != NULL && + (eel_istr_has_prefix (uri, "ftp:") || ++ eel_istr_has_prefix (uri, "ssh:") || ++ eel_istr_has_prefix (uri, "sftp:") || + eel_istr_has_prefix (uri, "dav:") || + eel_istr_has_prefix (uri, "davs:"))) { + *show_connect = TRUE; --- nautilus-2.20.0.orig/debian/patches/03_menu_entry.patch +++ nautilus-2.20.0/debian/patches/03_menu_entry.patch @@ -0,0 +1,50 @@ +diff -Nur nautilus-2.16.2/nautilus.desktop.in nautilus-2.16.2.new/nautilus.desktop.in +--- nautilus-2.16.2/nautilus.desktop.in 2006-11-07 03:23:57.000000000 -0800 ++++ nautilus-2.16.2.new/nautilus.desktop.in 2006-11-10 14:28:41.000000000 -0800 +@@ -8,8 +8,9 @@ + Terminal=false + StartupNotify=true + Type=Application +-Categories=GNOME;GTK;System;Utility;Core; ++Categories=GNOME;GTK;Utility;Core; + OnlyShowIn=GNOME; ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=nautilus + X-GNOME-Bugzilla-Component=general +diff -Nur nautilus-2.16.2/nautilus.desktop.in.in nautilus-2.16.2.new/nautilus.desktop.in.in +--- nautilus-2.16.2/nautilus.desktop.in.in 2006-11-06 09:06:39.000000000 -0800 ++++ nautilus-2.16.2.new/nautilus.desktop.in.in 2006-11-10 14:30:32.000000000 -0800 +@@ -8,8 +8,9 @@ + Terminal=false + StartupNotify=true + Type=Application +-Categories=GNOME;GTK;System;Utility;Core; ++Categories=GNOME;GTK;Utility;Core; + OnlyShowIn=GNOME; ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=nautilus + X-GNOME-Bugzilla-Component=general +diff -Nur nautilus-2.16.2/nautilus-file-management-properties.desktop.in nautilus-2.16.2.new/nautilus-file-management-properties.desktop.in +--- nautilus-2.16.2/nautilus-file-management-properties.desktop.in 2006-11-07 03:23:57.000000000 -0800 ++++ nautilus-2.16.2.new/nautilus-file-management-properties.desktop.in 2006-11-10 14:28:41.000000000 -0800 +@@ -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 +diff -Nur nautilus-2.16.2/nautilus-file-management-properties.desktop.in.in nautilus-2.16.2.new/nautilus-file-management-properties.desktop.in.in +--- nautilus-2.16.2/nautilus-file-management-properties.desktop.in.in 2006-11-06 09:06:46.000000000 -0800 ++++ nautilus-2.16.2.new/nautilus-file-management-properties.desktop.in.in 2006-11-10 14:31:13.000000000 -0800 +@@ -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 --- nautilus-2.20.0.orig/debian/patches/06_dont_create_Desktop.patch +++ nautilus-2.20.0/debian/patches/06_dont_create_Desktop.patch @@ -0,0 +1,148 @@ +Index: libnautilus-private/nautilus-monitor.c +=================================================================== +--- libnautilus-private/nautilus-monitor.c.orig 2007-04-10 14:06:07.000000000 +0200 ++++ libnautilus-private/nautilus-monitor.c 2007-04-26 00:30:58.445332000 +0200 +@@ -38,6 +38,13 @@ + GnomeVFSMonitorHandle *handle; + }; + ++static gboolean has_desktop = TRUE; ++ ++void nautilus_monitor_set_desktop(gboolean use_desktop) ++{ ++ has_desktop = use_desktop; ++} ++ + gboolean + nautilus_monitor_active (void) + { +@@ -47,19 +54,22 @@ + NautilusMonitor *monitor; + + if (tried_monitor == FALSE) { +- desktop_directory = nautilus_get_desktop_directory (); +- uri = gnome_vfs_get_uri_from_local_path (desktop_directory); +- +- monitor = nautilus_monitor_directory (uri); +- monitor_success = (monitor != NULL); ++ if (has_desktop) ++ { ++ desktop_directory = nautilus_get_desktop_directory (); ++ uri = gnome_vfs_get_uri_from_local_path (desktop_directory); ++ ++ monitor = nautilus_monitor_directory (uri); ++ monitor_success = (monitor != NULL); ++ ++ if (monitor != NULL) { ++ nautilus_monitor_cancel (monitor); ++ } + +- if (monitor != NULL) { +- nautilus_monitor_cancel (monitor); ++ g_free (desktop_directory); ++ g_free (uri); + } + +- g_free (desktop_directory); +- g_free (uri); +- + tried_monitor = TRUE; + } + +Index: libnautilus-private/nautilus-monitor.h +=================================================================== +--- libnautilus-private/nautilus-monitor.h.orig 2007-04-10 14:06:07.000000000 +0200 ++++ libnautilus-private/nautilus-monitor.h 2007-04-26 00:30:58.445332000 +0200 +@@ -30,6 +30,7 @@ + + typedef struct NautilusMonitor NautilusMonitor; + ++void nautilus_monitor_set_desktop (gboolean use_desktop); + gboolean nautilus_monitor_active (void); + NautilusMonitor *nautilus_monitor_file (const char *uri); + NautilusMonitor *nautilus_monitor_directory (const char *uri); +Index: src/nautilus-application.c +=================================================================== +--- src/nautilus-application.c.orig 2007-04-10 14:05:31.000000000 +0200 ++++ src/nautilus-application.c 2007-04-26 00:30:58.445332000 +0200 +@@ -239,7 +239,7 @@ + } + + static gboolean +-check_required_directories (NautilusApplication *application) ++check_required_directories (NautilusApplication *application, gboolean no_desktop) + { + char *user_directory; + char *desktop_directory; +@@ -252,20 +252,24 @@ + + g_assert (NAUTILUS_IS_APPLICATION (application)); + +- user_directory = nautilus_get_user_directory (); +- desktop_directory = nautilus_get_desktop_directory (); +- + directories = eel_string_list_new (TRUE); +- ++ ++ user_directory = nautilus_get_user_directory (); + if (!g_file_test (user_directory, G_FILE_TEST_IS_DIR)) { + eel_string_list_insert (directories, user_directory); + } + g_free (user_directory); +- +- if (!g_file_test (desktop_directory, G_FILE_TEST_IS_DIR)) { +- eel_string_list_insert (directories, desktop_directory); ++ if (!no_desktop) ++ { ++ desktop_directory = nautilus_get_desktop_directory (); ++ ++ if (!g_file_test (desktop_directory, G_FILE_TEST_IS_DIR)) { ++ eel_string_list_insert (directories, desktop_directory); ++ } ++ g_free (desktop_directory); + } +- g_free (desktop_directory); ++ else ++ nautilus_monitor_set_desktop(!no_desktop); + + failed_count = eel_string_list_get_length (directories); + +@@ -394,7 +398,7 @@ + } + + static void +-finish_startup (NautilusApplication *application) ++finish_startup (NautilusApplication *application, gboolean no_desktop) + { + /* initialize nautilus modules */ + nautilus_module_init (); +@@ -410,8 +414,9 @@ + /* Make the desktop work with old Nautilus. */ + migrate_old_nautilus_files (); + +- /* Initialize the desktop link monitor singleton */ +- nautilus_desktop_link_monitor_get (); ++ if (!no_desktop) ++ /* Initialize the desktop link monitor singleton */ ++ nautilus_desktop_link_monitor_get (); + } + + static void +@@ -514,7 +519,7 @@ + /* Check the user's ~/.nautilus directories and post warnings + * if there are problems. + */ +- if (!kill_shell && !check_required_directories (application)) { ++ if (!kill_shell && !check_required_directories (application, no_desktop)) { + return; + } + +@@ -532,7 +537,7 @@ + case Bonobo_ACTIVATION_REG_SUCCESS: + /* We are registered and all is right with the world. */ + application->shell_registered = TRUE; +- finish_startup (application); ++ finish_startup (application, no_desktop); + message = NULL; + detailed_message = NULL; + break; --- nautilus-2.20.0.orig/debian/patches/02_ubuntuspatial.patch +++ nautilus-2.20.0/debian/patches/02_ubuntuspatial.patch @@ -0,0 +1,85 @@ +diff -Nur nautilus-2.10.0.orig/libnautilus-private/nautilus-global-preferences.c nautilus-2.10.0/libnautilus-private/nautilus-global-preferences.c +--- nautilus-2.10.0.orig/libnautilus-private/nautilus-global-preferences.c 2005-03-31 15:54:28.791321864 +0200 ++++ nautilus-2.10.0/libnautilus-private/nautilus-global-preferences.c 2005-03-31 15:55:19.948544784 +0200 +@@ -523,6 +523,12 @@ + default_documents_link_name, g_free, + }, + ++ ++ { NAUTILUS_PREFERENCES_NO_UBUNTU_SPATIAL, ++ PREFERENCE_BOOLEAN, ++ GINT_TO_POINTER (FALSE) ++ }, ++ + { NULL } + }; + +diff -Nur nautilus-2.10.0.orig/libnautilus-private/nautilus-global-preferences.h nautilus-2.10.0/libnautilus-private/nautilus-global-preferences.h +--- nautilus-2.10.0.orig/libnautilus-private/nautilus-global-preferences.h 2005-03-31 15:54:28.791321864 +0200 ++++ nautilus-2.10.0/libnautilus-private/nautilus-global-preferences.h 2005-03-31 15:55:29.296123736 +0200 +@@ -74,6 +74,9 @@ + /* Single/Double click preference */ + #define NAUTILUS_PREFERENCES_CLICK_POLICY "preferences/click_policy" + ++/* Ubuntu spatial change */ ++#define NAUTILUS_PREFERENCES_NO_UBUNTU_SPATIAL "preferences/no_ubuntu_spatial" ++ + /* Activating executable text files */ + #define NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION "preferences/executable_text_activation" + +diff -Nur nautilus-2.10.0.orig/src/file-manager/fm-directory-view.c nautilus-2.10.0/src/file-manager/fm-directory-view.c +--- nautilus-2.10.0.orig/src/file-manager/fm-directory-view.c 2005-03-31 15:52:20.214868000 +0200 ++++ nautilus-2.10.0/src/file-manager/fm-directory-view.c 2005-03-31 15:55:37.373895728 +0200 +@@ -6891,6 +6891,14 @@ + parameters->view = view; + parameters->file = file; + parameters->mode = mode; ++ ++ if ( !eel_preferences_get_boolean (NAUTILUS_PREFERENCES_NO_UBUNTU_SPATIAL) && nautilus_file_is_directory (file)) { ++ if (flags == NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND) ++ flags = 0; ++ else ++ flags = NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND; ++ } ++ + parameters->flags = flags; + parameters->callback = activate_activation_uri_ready_callback; + parameters->mounted = FALSE; +diff -Nur nautilus-2.10.0.orig/src/nautilus-spatial-window.c nautilus-2.10.0/src/nautilus-spatial-window.c +--- nautilus-2.10.0.orig/src/nautilus-spatial-window.c 2005-03-31 15:54:36.479153136 +0200 ++++ nautilus-2.10.0/src/nautilus-spatial-window.c 2005-03-31 15:55:53.786400648 +0200 +@@ -431,7 +431,10 @@ + { + close_behind = TRUE; + } +- nautilus_window_open_location_with_selection (NAUTILUS_WINDOW (window), location, selection, close_behind); ++ if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_NO_UBUNTU_SPATIAL)) ++ nautilus_window_open_location_with_selection (NAUTILUS_WINDOW (window), location, selection, !close_behind); ++ else ++ nautilus_window_open_location_with_selection (NAUTILUS_WINDOW (window), location, selection, close_behind); + } + + if (event != NULL) { +--- nautilus-2.10.0.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2005-04-05 00:38:20.643100880 +0200 ++++ nautilus-2.10.0/libnautilus-private/apps_nautilus_preferences.schemas.in 2005-04-05 00:51:24.723902480 +0200 +@@ -440,6 +440,20 @@ + + + ++ ++ ++ /schemas/apps/nautilus/preferences/no_ubuntu_spatial ++ /apps/nautilus/preferences/no_ubuntu_spatial ++ nautilus ++ bool ++ true ++ ++ Ubuntu spatial changes ++ ++ Set this key to get the upstream spatial mode. ++ ++ ++ + + + --- nautilus-2.20.0.orig/debian/patches/08_display_mimetype_warning.patch +++ nautilus-2.20.0/debian/patches/08_display_mimetype_warning.patch @@ -0,0 +1,56 @@ +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.20.0.orig/debian/patches/10_location_titlebar.patch +++ nautilus-2.20.0/debian/patches/10_location_titlebar.patch @@ -0,0 +1,221 @@ +Index: nautilus-2.18.1/libnautilus-private/apps_nautilus_preferences.schemas.in +=================================================================== +--- nautilus-2.18.1.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-04-10 14:06:07.000000000 +0200 ++++ nautilus-2.18.1/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-04-26 00:31:10.438081500 +0200 +@@ -705,6 +705,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.18.1/libnautilus-private/nautilus-global-preferences.c +=================================================================== +--- nautilus-2.18.1.orig/libnautilus-private/nautilus-global-preferences.c 2007-04-10 14:06:07.000000000 +0200 ++++ nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.c 2007-04-26 00:31:10.438081500 +0200 +@@ -376,6 +376,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.18.1/libnautilus-private/nautilus-global-preferences.h +=================================================================== +--- nautilus-2.18.1.orig/libnautilus-private/nautilus-global-preferences.h 2007-04-10 14:06:07.000000000 +0200 ++++ nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.h 2007-04-26 00:31:10.438081500 +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.18.1/src/nautilus-navigation-window.c +=================================================================== +--- nautilus-2.18.1.orig/src/nautilus-navigation-window.c 2007-04-10 14:05:31.000000000 +0200 ++++ nautilus-2.18.1/src/nautilus-navigation-window.c 2007-04-26 00:31:10.438081500 +0200 +@@ -921,20 +921,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.18.1/src/nautilus-spatial-window.c +=================================================================== +--- nautilus-2.18.1.orig/src/nautilus-spatial-window.c 2007-04-10 14:05:31.000000000 +0200 ++++ nautilus-2.18.1/src/nautilus-spatial-window.c 2007-04-26 00:31:10.442081750 +0200 +@@ -414,10 +414,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; +Index: nautilus-2.18.1/src/nautilus-window.c +=================================================================== +--- nautilus-2.18.1.orig/src/nautilus-window.c 2007-04-10 14:05:31.000000000 +0200 ++++ nautilus-2.18.1/src/nautilus-window.c 2007-04-26 00:31:47.692409750 +0200 +@@ -57,6 +57,7 @@ + #include + #endif + #include ++#include + #include + #include + #include +@@ -1705,3 +1706,90 @@ + { + 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; ++ char *uri = NULL; ++ char *location = NULL; ++ GnomeVFSURI *vfs_uri = 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 = gnome_vfs_format_uri_for_display (uri)) == NULL ++ || location[0] == 0 ++ || location[1] == 0) ++ goto done; ++ ++ if (location[0] != GNOME_VFS_URI_PATH_CHR) { ++ if ((vfs_uri = gnome_vfs_uri_new (location)) == NULL ++ || (path = gnome_vfs_uri_get_path (vfs_uri)) == NULL ++ || (scheme = gnome_vfs_uri_get_scheme (vfs_uri)) == NULL ++ || path[0] == 0 ++ || strcmp (path, GNOME_VFS_URI_PATH_STR) == 0) ++ goto done; ++ ++ g_free(uri); ++ ++ uri = gnome_vfs_unescape_string_for_display (path); ++ ++ display_location = uri; ++ goto construct_title; ++ } ++ ++ 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] != GNOME_VFS_URI_PATH_CHR) { ++ 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_free (uri); ++ ++ if (location != NULL) ++ g_free (location); ++ ++ if (vfs_uri != NULL) ++ gnome_vfs_uri_unref (vfs_uri); ++ ++ return (location_title); ++} +Index: nautilus-2.18.1/src/nautilus-window.h +=================================================================== +--- nautilus-2.18.1.orig/src/nautilus-window.h 2007-04-10 14:05:31.000000000 +0200 ++++ nautilus-2.18.1/src/nautilus-window.h 2007-04-26 00:31:10.442081750 +0200 +@@ -151,5 +151,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.20.0.orig/debian/patches/12_vfat_no_free_space.patch +++ nautilus-2.20.0/debian/patches/12_vfat_no_free_space.patch @@ -0,0 +1,35 @@ +Index: nautilus-2.20.0/src/file-manager/fm-directory-view.c +=================================================================== +--- nautilus-2.20.0.orig/src/file-manager/fm-directory-view.c 2007-10-04 17:05:49.000000000 +0200 ++++ nautilus-2.20.0/src/file-manager/fm-directory-view.c 2007-10-04 17:05:55.000000000 +0200 +@@ -2266,7 +2266,29 @@ + + item_count_str = g_strdup_printf (ngettext ("%u item", "%u items", item_count), item_count); + +- free_space_str = nautilus_file_get_volume_free_space (view->details->directory_as_file); ++ /* do not display free space on VFAT; statfs() on VFAT is ++ * broken in Gutsy kernel (LP: #133567) */ ++ gboolean no_free_space = FALSE; ++ char *file_uri = nautilus_file_get_uri (view->details->directory_as_file); ++ char *local_path = gnome_vfs_get_local_path_from_uri (file_uri); ++ g_free (file_uri); ++ if (local_path) { ++ GnomeVFSVolume *volume = gnome_vfs_volume_monitor_get_volume_for_path (gnome_vfs_get_volume_monitor (), local_path); ++ g_free (local_path); ++ char *fstype = gnome_vfs_volume_get_filesystem_type(volume); ++ gnome_vfs_volume_unref (volume); ++ if (fstype) { ++ no_free_space = !strcmp(fstype, "vfat"); ++ g_free(fstype); ++ } ++ } ++ ++ if (no_free_space) { ++ free_space_str = NULL; ++ } else { ++ free_space_str = nautilus_file_get_volume_free_space (view->details->directory_as_file); ++ } ++ + if (free_space_str != NULL) { + status_string = g_strdup_printf (_("%s, Free space: %s"), item_count_str, free_space_str); + g_free (free_space_str); --- nautilus-2.20.0.orig/debian/patches/02_autoconf.patch +++ nautilus-2.20.0/debian/patches/02_autoconf.patch @@ -0,0 +1,13 @@ +Index: nautilus-2.19.5/configure +=================================================================== +--- nautilus-2.19.5.orig/configure 2007-07-10 04:02:11.000000000 +0200 ++++ nautilus-2.19.5/configure 2007-07-21 13:30:23.175191589 +0200 +@@ -26819,7 +26819,7 @@ + LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_EXTENSION_MODULES`" + + +-CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gnome-vfs-module-2.0 $EXTRA_CORE_MODULES" ++CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 launchpad-integration libbonobo-2.0 esound gnome-desktop-2.0 gnome-vfs-module-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.20.0.orig/debian/patches/01_prompt_same_file.patch +++ nautilus-2.20.0/debian/patches/01_prompt_same_file.patch @@ -0,0 +1,96 @@ +Index: nautilus-2.18.1/libnautilus-private/nautilus-file-operations.c +=================================================================== +--- nautilus-2.18.1.orig/libnautilus-private/nautilus-file-operations.c 2007-04-10 14:06:07.000000000 +0200 ++++ nautilus-2.18.1/libnautilus-private/nautilus-file-operations.c 2007-04-26 00:30:31.407642250 +0200 +@@ -1115,6 +1115,34 @@ + return is_dir; + } + ++static gboolean ++are_same_file (const char *first_uri, const char *second_uri) ++{ ++ GnomeVFSFileInfo *info; ++ GnomeVFSResult result; ++ dev_t device; ++ GnomeVFSInodeNumber inode; ++ gboolean are_same = FALSE; ++ ++ info = gnome_vfs_file_info_new (); ++ result = gnome_vfs_get_file_info (first_uri, info, GNOME_VFS_FILE_INFO_DEFAULT); ++ if (result == GNOME_VFS_OK && ++ info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_DEVICE && ++ info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_INODE) { ++ device = info->device; ++ inode = info->inode; ++ result = gnome_vfs_get_file_info (second_uri, info, GNOME_VFS_FILE_INFO_DEFAULT); ++ if (result == GNOME_VFS_OK && ++ info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_DEVICE && ++ info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_INODE && ++ device == info->device && inode == info->inode) { ++ are_same = TRUE; ++ } ++ } ++ gnome_vfs_file_info_unref (info); ++ ++ return are_same; ++} + + static int + handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info, +@@ -1123,12 +1151,14 @@ + int result; + char *text, *primary_text, *secondary_text, *formatted_name, *base_name; + GnomeVFSURI *file_uri, *parent_uri; +- gboolean is_merge, target_is_dir; ++ gboolean is_merge, target_is_dir, target_is_link; + + nautilus_file_operations_progress_pause_timeout (transfer_info->progress_dialog); + + /* Handle special case files such as Trash, mount links and home directory */ +- if (is_special_link (progress_info->target_name)) { ++ target_is_link = is_special_link (progress_info->target_name); ++ if (target_is_link || ++ are_same_file (progress_info->source_name, progress_info->target_name)) { + formatted_name = extract_and_ellipsize_file_name_for_dialog + (parent_for_error_dialog (transfer_info), + progress_info->target_name); +@@ -1136,19 +1166,30 @@ + if (transfer_info->kind == TRANSFER_MOVE) { + primary_text = g_strdup_printf (_("Could not move \"%s\" to the new location."), + formatted_name); +- +- secondary_text = _("The name is already used for a special item that " +- "cannot be removed or replaced. If you still want " +- "to move the item, rename it and try again."); + } else { + primary_text = g_strdup_printf (_("Could not copy \"%s\" to the new location."), + formatted_name); +- +- secondary_text = _("The name is already used for a special item that " +- "cannot be removed or replaced. If you still want " +- "to copy the item, rename it and try again."); + } +- ++ if (target_is_link) { ++ if (transfer_info->kind == TRANSFER_MOVE) { ++ secondary_text = _("The name is already used for a special item that " ++ "cannot be removed or replaced. If you still want " ++ "to move the item, rename it and try again."); ++ } else { ++ secondary_text = _("The name is already used for a special item that " ++ "cannot be removed or replaced. If you still want " ++ "to copy the item, rename it and try again."); ++ } ++ } else { ++ if (transfer_info->kind == TRANSFER_MOVE) { ++ secondary_text = _("The name is already used for an item which is the same " ++ "as the one you are trying to move."); ++ } else { ++ secondary_text = _("The name is already used for an item which is the same " ++ "as the one you are trying to copy."); ++ } ++ } ++ + eel_run_simple_dialog (parent_for_error_dialog (transfer_info), + TRUE, GTK_MESSAGE_ERROR, + primary_text, secondary_text, --- nautilus-2.20.0.orig/debian/patches/series +++ nautilus-2.20.0/debian/patches/series @@ -0,0 +1,21 @@ +01_lpi.patch +01_prompt_same_file.patch +02_autoconf.patch +02_ubuntuspatial.patch +03_menu_entry.patch +03_sftp_connect.patch +04_show_backup_files.patch +06_dont_create_Desktop.patch -p0 +07_desktop_file_activation.patch +08_display_mimetype_warning.patch +08_folder_handler.patch +10_location_titlebar.patch +11_gnomevfs_query_eject.patch +12_vfat_no_free_space.patch +10_rename_desktop.patch +20_upstream_nautilus-dnd-user-owned.patch -p0 +80_suppress_umount_in_ltsp.patch +81_gnome-app-install.patch +90_from_bugzilla_beep_on_backspace.patch +90_from_bugzilla_thumbnails_have_frames.patch +91_from_svn_not_clear_thumbnails.patch --- nautilus-2.20.0.orig/debian/patches/11_gnomevfs_query_eject.patch +++ nautilus-2.20.0/debian/patches/11_gnomevfs_query_eject.patch @@ -0,0 +1,84 @@ +Index: nautilus-2.18.1/libnautilus-private/nautilus-desktop-link-monitor.c +=================================================================== +--- nautilus-2.18.1.orig/libnautilus-private/nautilus-desktop-link-monitor.c 2007-04-10 14:06:07.000000000 +0200 ++++ nautilus-2.18.1/libnautilus-private/nautilus-desktop-link-monitor.c 2007-04-26 00:31:52.720724000 +0200 +@@ -107,6 +107,8 @@ + GnomeVFSVolume *volume; + char *dialog_str; + char *display_name; ++ GnomeVFSDrive *drive; ++ gboolean eject; + + volume = nautilus_desktop_link_get_volume (link); + +@@ -116,7 +118,13 @@ + display_name); + g_free (display_name); + +- if (eject_for_type (gnome_vfs_volume_get_device_type (volume))) { ++ drive = gnome_vfs_volume_get_drive (volume); ++ if (drive) ++ eject = gnome_vfs_drive_needs_eject (drive); ++ else ++ eject = eject_for_type (gnome_vfs_volume_get_device_type (volume)); ++ ++ if (eject) { + eel_run_simple_dialog + (parent_view, + FALSE, +Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c +=================================================================== +--- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c 2007-04-26 00:31:03.625655750 +0200 ++++ nautilus-2.18.1/src/file-manager/fm-directory-view.c 2007-04-26 00:31:52.728724500 +0200 +@@ -7266,10 +7266,14 @@ + *show_unmount = TRUE; + + volume = nautilus_file_get_volume (file); +- *show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume)); ++ drive = gnome_vfs_volume_get_drive (volume); ++ if (drive) ++ *show_eject = gnome_vfs_drive_needs_eject (drive); ++ else ++ *show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume)); + } else if (nautilus_file_has_drive (file)) { + drive = nautilus_file_get_drive (file); +- *show_eject = eject_for_type (gnome_vfs_drive_get_device_type (drive)); ++ *show_eject = gnome_vfs_drive_needs_eject (drive); + if (gnome_vfs_drive_is_mounted (drive)) { + *show_unmount = TRUE; + } else { +Index: nautilus-2.18.1/src/file-manager/fm-tree-view.c +=================================================================== +--- nautilus-2.18.1.orig/src/file-manager/fm-tree-view.c 2007-04-10 14:05:29.000000000 +0200 ++++ nautilus-2.18.1/src/file-manager/fm-tree-view.c 2007-04-26 00:31:52.728724500 +0200 +@@ -804,8 +804,12 @@ + + volume = fm_tree_model_get_volume_for_root_node_file (view->details->child_model, view->details->popup_file); + if (volume) { ++ GnomeVFSDrive *drive = gnome_vfs_volume_get_drive (volume); + show_unmount = TRUE; +- unmount_is_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume)); ++ if (drive) ++ unmount_is_eject = gnome_vfs_drive_needs_eject (drive); ++ else ++ unmount_is_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume)); + } + + gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_MENU_ITEM (view->details->popup_unmount))->child), +@@ -1230,7 +1234,15 @@ + volume = fm_tree_model_get_volume_for_root_node_file (view->details->child_model, file); + + if (volume != NULL) { +- if (eject_for_type (gnome_vfs_volume_get_device_type (volume))) { ++ GnomeVFSDrive *drive = gnome_vfs_volume_get_drive (volume); ++ gboolean eject; ++ ++ if (drive) ++ eject = gnome_vfs_drive_needs_eject (drive); ++ else ++ eject = eject_for_type (gnome_vfs_volume_get_device_type (volume)); ++ ++ if (eject) { + gnome_vfs_volume_eject (volume, volume_or_drive_unmounted_callback, GINT_TO_POINTER (TRUE)); + } else { + nautilus_file_operations_unmount_volume (GTK_WIDGET (view), volume, --- nautilus-2.20.0.orig/debian/patches/04_show_backup_files.patch +++ nautilus-2.20.0/debian/patches/04_show_backup_files.patch @@ -0,0 +1,12 @@ +Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c +=================================================================== +--- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c 2007-04-26 00:30:42.220318000 +0200 ++++ nautilus-2.18.1/src/file-manager/fm-directory-view.c 2007-04-26 00:30:47.528649750 +0200 +@@ -1246,6 +1246,7 @@ + directory_view = FM_DIRECTORY_VIEW (callback_data); + + directory_view->details->show_hidden_files = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); ++ directory_view->details->show_backup_files = directory_view->details->show_hidden_files; + + if (directory_view->details->show_hidden_files) { + mode = NAUTILUS_WINDOW_SHOW_HIDDEN_FILES_ENABLE; --- nautilus-2.20.0.orig/debian/patches/91_from_svn_not_clear_thumbnails.patch +++ nautilus-2.20.0/debian/patches/91_from_svn_not_clear_thumbnails.patch @@ -0,0 +1,131 @@ +--- trunk/libnautilus-private/nautilus-directory-async.c 2007/10/02 13:08:31 13247 ++++ trunk/libnautilus-private/nautilus-directory-async.c 2007/10/02 13:28:27 13248 +@@ -594,7 +594,7 @@ + NAUTILUS_FILE_ATTRIBUTE_FILE_TYPE | + NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES; + +- nautilus_directory_invalidate_file_attributes (dir, attrs); ++ nautilus_directory_force_reload_internal (dir, attrs); + } + + void +--- trunk/libnautilus-private/nautilus-icon-factory.c 2007/10/02 13:08:31 13247 ++++ trunk/libnautilus-private/nautilus-icon-factory.c 2007/10/02 13:28:27 13248 +@@ -200,7 +200,7 @@ + const char *modifier, + guint nominal_size, + gboolean force_nominal); +-static void nautilus_icon_factory_clear (void); ++static void nautilus_icon_factory_clear (gboolean clear_pathnames); + + GNOME_CLASS_BOILERPLATE (NautilusIconFactory, + nautilus_icon_factory, +@@ -270,7 +270,7 @@ + { + NautilusIconFactory *factory; + +- nautilus_icon_factory_clear (); ++ nautilus_icon_factory_clear (FALSE); + + factory = user_data; + +@@ -726,9 +726,23 @@ + return TRUE; + } + +-/* Reset the cache to the default state. */ ++static gboolean ++remove_non_pathnames (gpointer _key, gpointer value, gpointer user_data) ++{ ++ CacheKey *key = _key; ++ ++ if (key->name && key->name[0] == '/') { ++ return FALSE; ++ } ++ ++ return TRUE; /* Tell the caller to remove the hash table entry. */ ++} ++ ++/* Reset the cache to the default state. ++ Clear pathnames can be set to FALSE which means we only clear icon names, not ++ absolute pathnames. This is useful to avoid throwing away all loaded thumbnails. */ + static void +-nautilus_icon_factory_clear (void) ++nautilus_icon_factory_clear (gboolean clear_pathnames) + { + NautilusIconFactory *factory; + CircularList *head; +@@ -736,24 +750,25 @@ + factory = get_icon_factory (); + + g_hash_table_foreach_remove (factory->icon_cache, +- remove_all, ++ clear_pathnames ? remove_all : remove_non_pathnames, + NULL); + + /* Empty out the recently-used list. */ + head = &factory->recently_used_dummy_head; + +- /* fallback_icon hangs around, but we don't know if it +- * was ever inserted in the list +- */ +- g_assert (factory->recently_used_count == 0 || +- factory->recently_used_count == 1); +- +- if (factory->recently_used_count == 1) { +- /* make sure this one is the fallback_icon */ +- g_assert (head->next == head->prev); +- g_assert (&factory->fallback_icon->recently_used_node == head->next); ++ if (clear_pathnames) { ++ /* fallback_icon hangs around, but we don't know if it ++ * was ever inserted in the list ++ */ ++ g_assert (factory->recently_used_count == 0 || ++ factory->recently_used_count == 1); ++ if (factory->recently_used_count == 1) { ++ /* make sure this one is the fallback_icon */ ++ g_assert (head->next == head->prev); ++ g_assert (&factory->fallback_icon->recently_used_node == head->next); ++ } + } +- ++ + } + + static void +@@ -806,7 +821,7 @@ + * signal to mean only "thumbnails might have changed" if this ends up being slow + * for some reason. + */ +- nautilus_icon_factory_clear (); ++ nautilus_icon_factory_clear (TRUE); + g_signal_emit (global_icon_factory, + signals[ICONS_CHANGED], 0); + } +@@ -820,7 +835,7 @@ + * signal to mean only "thumbnails might have changed" if this ends up being slow + * for some reason. + */ +- nautilus_icon_factory_clear (); ++ nautilus_icon_factory_clear (TRUE); + g_signal_emit (global_icon_factory, + signals[ICONS_CHANGED], 0); + } +@@ -830,7 +845,7 @@ + { + show_image_thumbs = eel_preferences_get_enum (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS); + +- nautilus_icon_factory_clear (); ++ nautilus_icon_factory_clear (TRUE); + /* If the user disabled thumbnailing, remove all outstanding thumbnails */ + if (show_image_thumbs == NAUTILUS_SPEED_TRADEOFF_NEVER) { + nautilus_thumbnail_remove_all_from_queue (); +@@ -848,7 +863,7 @@ + /* We don't know which data changed, so we have to assume that + * any or all icons might have changed. + */ +- nautilus_icon_factory_clear (); ++ nautilus_icon_factory_clear (FALSE); + g_signal_emit (get_icon_factory (), + signals[ICONS_CHANGED], 0); + } --- nautilus-2.20.0.orig/debian/patches/80_suppress_umount_in_ltsp.patch +++ nautilus-2.20.0/debian/patches/80_suppress_umount_in_ltsp.patch @@ -0,0 +1,53 @@ +diff -Nur nautilus-2.15.91/src/file-manager/fm-directory-view.c nautilus-2.15.91.new/src/file-manager/fm-directory-view.c +--- nautilus-2.15.91/src/file-manager/fm-directory-view.c 2006-08-21 18:52:31.000000000 +0200 ++++ nautilus-2.15.91.new/src/file-manager/fm-directory-view.c 2006-08-21 18:54:05.000000000 +0200 +@@ -7282,27 +7282,31 @@ + *show_format = FALSE; + + if (nautilus_file_has_volume (file)) { +- *show_unmount = TRUE; +- +- volume = nautilus_file_get_volume (file); +- drive = gnome_vfs_volume_get_drive (volume); +- if (drive) +- *show_eject = gnome_vfs_drive_needs_eject (drive); +- else +- *show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume)); +- } else if (nautilus_file_has_drive (file)) { +- drive = nautilus_file_get_drive (file); +- *show_eject = gnome_vfs_drive_needs_eject (drive); +- if (gnome_vfs_drive_is_mounted (drive)) { ++ if (getenv("LTSP_CLIENT") == NULL) { + *show_unmount = TRUE; +- } else { +- *show_mount = TRUE; ++ ++ volume = nautilus_file_get_volume (file); ++ drive = gnome_vfs_volume_get_drive (volume); ++ if (drive) ++ *show_eject = gnome_vfs_drive_needs_eject (drive); ++ else ++ *show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume)); + } ++ } else if (nautilus_file_has_drive (file)) { ++ if (getenv("LTSP_CLIENT") == NULL) { ++ drive = nautilus_file_get_drive (file); ++ *show_eject = gnome_vfs_drive_needs_eject (drive); ++ if (gnome_vfs_drive_is_mounted (drive)) { ++ *show_unmount = TRUE; ++ } else { ++ *show_mount = TRUE; ++ } + +- if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY && +- !gnome_vfs_drive_is_mounted (drive) && +- g_find_program_in_path ("gfloppy")) { +- *show_format = TRUE; ++ if (gnome_vfs_drive_get_device_type (drive) == GNOME_VFS_DEVICE_TYPE_FLOPPY && ++ !gnome_vfs_drive_is_mounted (drive) && ++ g_find_program_in_path ("gfloppy")) { ++ *show_format = TRUE; ++ } + } + } else if (nautilus_file_is_nautilus_link (file)) { + uri = nautilus_file_get_activation_uri (file); --- nautilus-2.20.0.orig/debian/copyright +++ nautilus-2.20.0/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.20.0.orig/debian/nautilus.xpm +++ nautilus-2.20.0/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.!+(+ ", +" _+ "};