elementaryart team mailing list archive

[Dadot Mukti <masdadot@xxxxxxxxx>]

Dadot Mukti has proposed merging lp:nautilus-elementary/2.30 into lp:nautilus-elementary.

Requested reviews:
  elementary desktop team (elementaryart)

For more details, see:
https://code.launchpad.net/~elementaryart/nautilus-elementary/nautilus-elementary-2.30/+merge/69895
-- 
https://code.launchpad.net/~elementaryart/nautilus-elementary/nautilus-elementary-2.30/+merge/69895
Your team elementary desktop team is requested to review the proposed merge of lp:nautilus-elementary/2.30 into lp:nautilus-elementary.

=== renamed file 'data/nautilus-autorun-software.desktop.in' => 'data/nautilus-autorun-software.desktop.in.THIS'
=== renamed file 'data/nautilus-browser.desktop.in' => 'data/nautilus-browser.desktop.in.THIS'
=== renamed file 'data/nautilus-computer.desktop.in' => 'data/nautilus-computer.desktop.in.THIS'
=== renamed file 'data/nautilus-file-management-properties.desktop.in' => 'data/nautilus-file-management-properties.desktop.in.THIS'
=== renamed file 'data/nautilus-folder-handler.desktop.in' => 'data/nautilus-folder-handler.desktop.in.THIS'
=== removed file 'data/nautilus-home.desktop.in'
--- data/nautilus-home.desktop.in	2010-04-10 21:14:34 +0000
+++ data/nautilus-home.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-_Name=Home Folder
-_Comment=Open your personal folder
-TryExec=nautilus
-Exec=nautilus --no-desktop
-Icon=user-home
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=GNOME;GTK;Core;
-OnlyShowIn=GNOME;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=nautilus
-X-GNOME-Bugzilla-Component=general

=== renamed file 'data/nautilus.desktop.in' => 'data/nautilus.desktop.in.THIS'
=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2011-07-30 17:29:22 +0000
@@ -0,0 +1,1993 @@
+nautilus (1:2.31.1-0ubuntu2~ppa92) lucid; urgency=medium
+
+  * Backporting many bug fixes from maverick branch 
+     rev96: fixing rgba issue with multiple X
+     rev105: adding xpadding to sidebar
+     rev106: working network filter with archive exception (gvfs-mount)
+     rev135: removing a warning from ex ubuntu patch: 89_use_application_indicator.patch
+     rev137: fix Bug #625730 - empty trash make nautilus crash from time to time
+     rev138: fix Bug #587197 + fix utf8 uri with undo + many others bugfixs on undo/redo functionnalities
+     rev144: removing old LEGACY stuff
+     reverting from $XDG_USER_DIR/nautilus to $HOME/.nautilus - fixing gksu nautilus path creation bug
+
+ -- ammonkey <am.monkeyd@xxxxxxxxx>  Fri, 08 Oct 2010 16:56:58 +0000
+
+nautilus (1:2.31.1-0ubuntu1~ppa91) lucid; urgency=medium
+
+  * bump nautilus-elementary 2.31.1 (rev91): spatial mode bugfix + others
+
+ -- ammonkey <am.monkeyd@xxxxxxxxx>  Tue, 29 Jun 2010 03:41:31 +0200
+
+nautilus (1:2.31.1-0ubuntu1~ppa89) lucid; urgency=medium
+
+  * bump nautilus-elementary 2.31.1 (rev89): 
+          - Toolbar editor
+          - compact menu
+          - undo /redo
+          - merge with upstream 2.31.1+ with fixed replace dialog
+            ...
+
+ -- ammonkey <am.monkeyd@xxxxxxxxx>  Fri, 04 Jun 2010 22:42:49 +0200
+
+nautilus (1:2.30.1-0ubuntu6~ppa54) lucid; urgency=medium
+
+  * bump nautilus-elementary 2.30.1 (rev54): new revamped sidebar
+
+ -- ammonkey <am.monkeyd@xxxxxxxxx>  Thu, 20 May 2010 04:42:00 +0200
+
+nautilus (1:2.30.1-0ubuntu5~ppa46) lucid; urgency=medium
+
+  * bump nautilus-elementary 2.30.1 (rev46): augment resizing marging - augment fault tolerance
+
+ -- ammonkey <am.monkeyd@xxxxxxxxx>  Thu, 29 Apr 2010 18:57:46 +0200
+
+nautilus (1:2.30.1-0ubuntu4~ppa45) lucid; urgency=medium
+
+  * bump nautilus-elementary 2.30.1 (rev45):
+
+ -- ammonkey <am.monkeyd@xxxxxxxxx>  Thu, 29 Apr 2010 18:57:46 +0200
+
+nautilus (1:2.30.1-0ubuntu1) lucid-proposed; urgency=low
+
+  * New upstream version:
+    - Translation updates
+    - Support for tracker 0.8.0
+    - Fix crashes (lp: #560706)
+    - Fix emblem scaling in zoomed view
+    - Fix sensitivity of split-view related menu items
+    - Control-L closes the extra view first, not the window
+  * debian/patches/02_eel_libadd.patch,
+    debian/patches/91_git_middleclick_crash.patch,
+    debian/patches/92_git_emblems_cut.patch:
+    - the changes are in the new version
+  * debian/patches/90_relibtoolize.patch:
+    - new version update
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Wed, 28 Apr 2010 11:24:30 +0200
+
+nautilus (1:2.30.0-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/91_git_middleclick_crash.patch:
+    - git change to fix a crasher when opening non-available bookmark locations
+      (lp: #444368)
+  * debian/patches/92_git_emblems_cut.patch:
+    - git change to fix emblem being cut sometime when zooming 
+      (lp: #46846)
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Wed, 07 Apr 2010 11:51:00 +0200
+
+nautilus (1:2.30.0-0ubuntu3) lucid; urgency=low
+
+  * Add 16_hide_unmount.patch: Do not show Unmount when showing Eject/Safe
+    removal. Having three menu entries (unmount/eject/safe removal) in a
+    volume/drive menu entry is too confusing. Unmount only really makes sense
+    for internal drives, for external ones it is pretty much a "geek" option.
+    Geeks can use palimpsest or "unmount /media/foo" from the CLI if they
+    really want to, for everyone else it is just an unintuitive and hard to to
+    explain menu entry. (LP: #453072)
+
+ -- Martin Pitt <martin.pitt@xxxxxxxxxx>  Tue, 30 Mar 2010 19:17:57 +0200
+
+nautilus (1:2.30.0-0ubuntu2) lucid; urgency=low
+
+  * Restore revision which was not commited to the vcs (lp: #508890)
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Mon, 29 Mar 2010 22:52:39 +0200
+
+nautilus (1:2.30.0-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Don't show weird border around desktop
+    - Correctly put focus on view for new windows
+    - Extra view does not get focus when created
+    - Add nicer thumbnail border
+    - Fix crash when hiding search bar
+    - Support AIFF for audio preview
+  * debian/control.in:
+    - updated glib and gtk requirements
+  * debian/patches/92_git_change_no_desktop_frame.patch:
+    - the change is in the new version
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Mon, 29 Mar 2010 11:32:07 +0200
+
+nautilus (1:2.29.92.1-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/91_correct_rgba_use.patch:
+    - disable patch as it was causing an endless loop where nautilus
+      kept on crashing when attempting to draw the desktop on
+      multiple screens (LP: #508890).
+
+ -- Alberto Milone <alberto.milone@xxxxxxxxxxxxx>  Sun, 21 Mar 2010 01:07:51 +0100
+
+nautilus (1:2.29.92.1-0ubuntu3) lucid; urgency=low
+
+  * No-change rebuild against a reverted CDBS.
+
+ -- Steve Kowalik <stevenk@xxxxxxxxxx>  Sat, 20 Mar 2010 18:28:04 +1100
+
+nautilus (1:2.29.92.1-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/92_git_change_no_desktop_frame.patch:
+    - git change to not display a border around the desktop background 
+      (lp: #507263)
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Thu, 18 Mar 2010 15:29:48 +0100
+
+nautilus (1:2.29.92.1-0ubuntu1) lucid; urgency=low
+
+  * New upstream version: 
+    - Fix compilation due to deprecated GTK_WIDGET_STATE symbol
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Wed, 10 Mar 2010 21:52:17 +0100
+
+nautilus (1:2.29.92-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Make view default focus in new windows (lp: #520685)
+    - Put tabs at the top again
+    - Don't use deprecated gtk widgets
+    - Allow Alt-<num> to switch tabs (lp: #521767)
+    - Dynamically load tracker support
+    - Don't auto-close the window you initiated an unmount in (lp: #530542)
+  * debian/control.in:
+    - update gtk requirement
+  * debian/patches/90_relibtoolize.patch:
+    - new version update
+  * debian/patches/92_correct_initial_focus.patch,
+    debian/patches/93_no_bottom_tab.patch:
+    - dropped, the changes are in the new version
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Mon, 08 Mar 2010 17:08:22 +0100
+
+nautilus (1:2.29.91-0ubuntu2) lucid; urgency=low
+
+  * debian/patches/89_use_application_indicator.patch:
+    - correctly show the menu for the new application indicator (lp: #522807)
+  * debian/patches/92_correct_initial_focus.patch:
+    - git change, correctly set the focus when opening a new dialog 
+      (lp: #505678)
+  * debian/patches/93_no_bottom_tab.patch:
+    - git update to revert the tab at the bottom change (lp: #509079)
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Wed, 03 Mar 2010 15:53:13 +0100
+
+nautilus (1:2.29.91-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Make it possible to have backgrounds spanning multiple monitors.
+    - Better handling of closing windows when device is unmounted (lp: #386517)
+    - Use GtkSpinner instead of custom widget
+    - Translation updates
+  * debian/control.in:
+    - updated gnome-desktop and gtk requirement
+  * debian/patches/90_relibtoolize.patch:
+    - new version update
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Mon, 22 Feb 2010 15:29:11 +0100
+
+nautilus (1:2.29.90-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Fix copy-pasted tooltip string
+    - Translation updates
+  * debian/patches/11_no_session_delay.patch:
+    - don't change translated desktop that will avoid update conflicts and those
+      get updated during the build
+  * debian/patches/90_relibtoolize.patch:
+    - new version update
+    
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Tue, 09 Feb 2010 18:17:24 +0100
+
+nautilus (1:2.29.2-0ubuntu5) lucid; urgency=low
+
+  * debian/patches/83_never_exec_nonexec_launchers.patch: redefine
+    "never" to "after Karmic released", so that old launchers
+    from prior LTS get the opportunity to be updated.
+
+ -- Kees Cook <kees@xxxxxxxxxx>  Mon, 08 Feb 2010 16:52:59 -0800
+
+nautilus (1:2.29.2-0ubuntu4) lucid; urgency=low
+
+  * Rebuild with the new libdbusmenu version
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Fri, 05 Feb 2010 12:23:01 -0800
+
+nautilus (1:2.29.2-0ubuntu3) lucid; urgency=low
+
+  [ Kees Cook ]
+  * Add debian/patches/83_never_exec_nonexec_launchers.patch: implement
+    non-exec policy for .desktop handler.
+
+  [ Didier Roche ]
+  * debian/control.in: remove VCS-Svn: to avoid get puzzled by debchekout
+    taking debian svn
+
+  [ Loïc Minier ]
+  * Revert 1:2.29.2-0ubuntu2 as -O1 is only a problem with gvfs.
+
+ -- Loïc Minier <loic.minier@xxxxxxxxxx>  Tue, 02 Feb 2010 22:28:36 +0100
+
+nautilus (1:2.29.2-0ubuntu2) lucid; urgency=low
+
+  * Only add -Wl,-O1 to LDFLAGS if DEB_HOST_ARCH != armel; thanks Paul Larson;
+    LP #512959.
+
+ -- Loïc Minier <loic.minier@xxxxxxxxxx>  Tue, 02 Feb 2010 19:45:44 +0100
+
+nautilus (1:2.29.2-0ubuntu2) lucid; urgency=low
+
+  * New upstream release:
+    - Align sidebar header and location bar (LP: #504185)
+    - Remove tabs menu
+    - Update translations
+  * debian/control.in:
+    bump libglib2.0-dev build-dep
+  * debian/patches/11_no_session_delay.patch: refreshed
+  * debian/patches/90_relibtoolize.patch: refreshed
+
+ -- Didier Roche <didrocks@xxxxxxxxxx>  Mon, 25 Jan 2010 15:25:13 +0100
+
+nautilus (1:2.29.1-0ubuntu3) lucid; urgency=low
+
+  * debian/patches/11_no_session_delay.patch:
+    - don't use X-GNOME-Autostart-Phase=Desktop to not delay other softwares
+      during GNOME start
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Wed, 20 Jan 2010 22:07:51 +0100
+
+nautilus (1:2.29.1-0ubuntu2) lucid; urgency=low
+
+  * debian/control.in:
+    - build-depends on libappindicator-dev
+  * debian/patches/89_use_application_indicator.patch:
+    - use the application-indicator (lp: #497880)
+  * debian/patches/90_relibtoolize.patch:
+    - refreshed
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Tue, 12 Jan 2010 19:39:45 +0100
+
+nautilus (1:2.29.1-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Make browser mode the default
+    - Add split view mode
+    - Browser UI reorganization
+    - Better background support on multi-monitor setups
+    - Support new "default location" on mounts 
+    - Add extension api to lookup NautilusFileInfo objects
+    - Make the search toolbar button a toggle button (lp: #57210, #392292)
+    - Change text selection when using f2 several times (lp: #55996)
+    - Ctrl+shift does multiple range selection in list view (lp: #148297)
+    - Correctly toggle the show hidden files option (lp: #318151)
+    - Opening of unknown files types displays a list of softwares (lp: #435780)
+    - Fix the end key action in the image details (lp: #448786)
+    - Use correct Borders for the sidebar (lp: #380838)
+    - Display tooltips over sidebar bookmarks (lp: #432485)
+  * debian/control.in:
+    - updated gnome-desktop requirement
+  * debian/nautilus-data.gconf-defaults:
+    - don't set browser mode there since that's upstream default now
+  * debian/patches/01_manpage.patch:
+    - the change is upstream now
+  * debian/patches/91_correct_rgba_use.patch:
+    - change by Cody Russell to fix rgba issue (lp: #491521)
+  * debian/rules:
+    - updated shlib version
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Wed, 06 Jan 2010 17:14:33 +0100
+
+nautilus (1:2.28.4-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Fix bug in trash/delete key sensitivity fix that could cause data loss. 
+     (Files where trashed when you renamed a file and pressed delete.)
+    - Fix uninitialized variable read
+  * debian/patches/90_relibtoolize.patch:
+    - new version update
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Tue, 15 Dec 2009 12:01:36 +0100
+
+nautilus (1:2.28.3-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    - Fix memory leaks
+    - Don't rewrite bookmars unnecessary on startup
+    - Fix background "darkness" detection for font color (lp: #356289)
+    - Disable trash/delete key shortcuts when menu items disabled
+      (lp: #490512)
+  * Sync on Debian
+  * debian/control.in:
+    - Build-Depends on liblaunchpad-integration-dev
+    - change recommends on cd burners to a suggests
+    - change gksu conflicts version to match the ubuntu transition
+    - don't build using beagle and tracker
+    - don't recommends desktop-base, don't suggests tracker
+    - nautilus Suggests gnome-app-install rather than synaptic
+    - set vcs url    
+  * debian/mount-archive.desktop,
+    debian/mount-archive.desktop.in,
+    debian/nautilus.install:
+    - new nautilus context menu item to allow mounting zip, iso, etc
+  * debian/nautilus-data.gconf-schemas:
+    - change the default desktop configuration, default to browser,
+      don't change autorun option to not ask what to do
+  * debian/nautilus-data.install, debian/source_nautilus.py:
+    - apport hook to list versions of files in /usr/lib/nautilus and reassign
+      the crashes when there are not due to nautilus code directly
+  * debian/patches/01_lpi.patch:
+    - launchpad changes.
+  * debian/patches/03_menu_entry.patch:
+    - change the menu item category.
+  * debian/patches/15_translations_list_update.patch:
+    - list the new desktop as translatable
+  * debian/patches/18_signal_curtain.patch:
+    - signal the curtain when loaded
+    - update by Erez Volk to fix a warning (lp: #454234)
+  * debian/patches/20_open-with_install.patch:
+    - don't use that debian change but rather gnome-app-install
+  * debian/patches/80_suppress_umount_in_ltsp.patch:
+    - don't list unmount and eject actions on ltsp clients
+  * debian/patches/82_gnome-app-install.patch:
+    - Invoke gnome-app-install when no application known for file.
+  * debian/patches/95_no-initial-fade.patch: Patch to disable the initial
+    fade-in of the background without disabling crossfades when the
+    background is changed.
+  * debian/rules:
+    - don't use debian translation hack
+    - update shlib version
+  * debian/watch:
+    - watch unstable serie
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  Mon, 14 Dec 2009 13:52:15 +0100
+
+nautilus (2.28.1-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Drop gnome-mount recommends, it’s already pulled by gvfs if needed 
+    (i.e. for gvfs builds that use HAL).
+
+  [ Andrea Veri ]
+  * New upstream release.
+  * debian/control:
+    - bumped standards-version to 3.8.3. No changes needed.
+    - bumped libtrackerclient-dev to >= 0.6.6 (lenny version),
+      to start up nautilus porting to tracker 0.7. Thanks mbiebl
+      for the hint.
+    - added missing ${misc:Depends} to both nautilus-dbg and
+      libnautilus-extension-dev making lintian stop complaining.
+
+  [ Josselin Mouette ]
+  * nautilus-data.gconf-defaults: set exit_with_last_window to false so 
+    that nautilus doesn’t go in a loop when show_desktop = false.
+  * 13_autostart.patch: removed, it is no longer necessary.
+    + Automount works even when show_desktop = false. Closes: #538108.
+    + Stop installing the autostart file as well.
+    + Break gnome-session < 2.28 because of this change.
+  * Regenerate 90_relibtoolize.patch.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Sat, 24 Oct 2009 15:32:11 +0200
+
+nautilus (2.28.0-2) unstable; urgency=low
+
+  * Require a recent gvfs for the metadata store.
+    Closes: #548142, #548143.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Thu, 24 Sep 2009 10:05:46 +0200
+
+nautilus (2.28.0-1) unstable; urgency=low
+
+  * Depend on libglib2.0-data for GIO translations.
+  * New upstream release.
+    + Fixes duplicate ID in UI file. Closes: #545254.
+  * Bump glib build-dependency.
+  * 12_list-view_expand.patch, 13_autostart.patch, 90_relibtoolize.patch: 
+    updated for the new version.
+  * Install nautilus-convert-metadata.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Wed, 23 Sep 2009 20:11:11 +0200
+
+nautilus (2.26.3-1) unstable; urgency=low
+
+  * New upstream release.
+    + Updated Spanish translation. Closes: #532288.
+  * 13_autostart.patch: start with -n so that the default window is not 
+    created, even when nautilus doesn’t detect correctly it is started 
+    by the session startup. Closes: #532799.
+  * 90_relibtoolize.patch: regenerated for the new version.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Thu, 11 Jun 2009 23:08:03 +0200
+
+nautilus (2.26.2-5) unstable; urgency=low
+
+  * 11_restart_mode.patch: removed, it is useless now that we never 
+    autorespawn nautilus. Furthermore, nautilus-home.desktop is lacking 
+    a X-GNOME-Provides: field.
+  * 13_autostart.patch: refreshed accordingly.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Sun, 31 May 2009 17:53:10 +0200
+
+nautilus (2.26.2-4) unstable; urgency=low
+
+  * 11_restart_mode.patch: add reference.
+  * Remove scrollkeeper dependency.
+  * 13_autostart.patch: new patch. Put nautilus.desktop into the 
+    autostart directory so that we don’t rely on gnome-session’s 
+    required_applications mechanism. This allows to add an autostart 
+    condition on the show_desktop GConf key.
+    + Remove the AutoRestart on the same basis; there’s no point in 
+      restarting nautilus and not e.g. gnome-power-manager, and it 
+      causes many issues.
+  * 90_relibtoolize.patch: update accordingly.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Sun, 31 May 2009 13:51:27 +0200
+
+nautilus (2.26.2-3) unstable; urgency=low
+
+  * 11_restart_mode.patch: new patch. Do not get the session manager to 
+    automatically restart nautilus when using --no-desktop. Thanks to 
+    Roland Mas for testing.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Wed, 29 Apr 2009 17:55:35 +0200
+
+nautilus (2.26.2-2) unstable; urgency=low
+
+  * 20_open-with_install.patch: fix a crash when switching tabs in the 
+    dialog.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Sat, 25 Apr 2009 23:44:05 +0200
+
+nautilus (2.26.2-1) unstable; urgency=low
+
+  * Break eiciel, diff-ext, nautilus-gksu, nautilus-actions, 
+    nautilus-share and seahorse-plugins until versions rebuilt with the 
+    new extension path.
+  * Only suggest xdg-user-dirs, nautilus works perfectly fine without 
+    it.
+  * New upstream release.
+    + Correctly cleans up session files. Closes: #469267.
+    + Checks whether the session is active with ConsoleKit before 
+      mounting a removable media. Closes: #512824.
+    + Follows OnlyShowIn/NotShowIn for .desktop files on the desktop.
+      Closes: #422570.
+    + Only accepts .desktop with executable permissions.
+      Closes: #515078, #515104.
+  * 07_desktop_file_activation.patch: removed from the sources.
+  * 02_eel_libadd.patch: stolen from the eel2 sources. Fix linking of 
+    the eel convenience library.
+  * 14_sidebar_network-protocol.patch: removed, useless since 2.24.
+    Closes: #518773.
+  * 20_open-with_install.patch: updated for the new version.
+  * 90_relibtoolize.patch: new patch, relibtoolize over that.
+  * Refresh other patches.
+  * Bump shlibs version to 2.26.2.
+  * Add brasero 2.26 as an alternative to n-c-b.
+  * Recommend consolekit.
+  * Pass --disable-packagekit.
+  * Fix section of debug package.
+  * Update build-dependencies and dependencies according to the upstream 
+    changes.
+  * Build-depend on libglib2.0-doc and libgtk2.0-doc to ensure proper 
+    xrefs.
+  * nautilus-data.install: there are no more bonobo files to ship.
+  * 10_load_session.patch: new patch. Support --load-session so that 
+    sessions saved with older nautilus versions will load correctly.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Sat, 25 Apr 2009 01:33:51 +0200
+
+nautilus (2.24.2-3) unstable; urgency=low
+
+  * Require shared-mime-info 0.50 to have support for the x-content 
+    types. Closes: #511370.
+  * Recommend gnome-mount.
+  * Break rhythmbox < 0.12.
+  * Standards version is 3.8.1.
+  * Upload to unstable.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Tue, 07 Apr 2009 14:06:47 +0200
+
+nautilus (2.24.2-2) experimental; urgency=low
+
+  * Add a Breaks with g-v-m << 2.24 to avoid double actions on device 
+    insertion. Closes: #507630, #510692.
+  * 20_open-with_install.patch: add missing argument to 
+    gtk_tree_model_get. Closes: #510694.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Tue, 06 Jan 2009 17:07:39 +0100
+
+nautilus (2.24.2-1) experimental; urgency=low
+
+  * nautilus-data.gconf-defaults: enable autorun actions for all media 
+    CD/DVD/etc. by default instead of asking.
+    + Also do it for blank media.
+  * libnautilus-extension1 breaks nautilus << 2.22.
+  * Build-depend on libgnome-desktop-dev 2.24 to be sure to link with 
+    libgnome-desktop-2-7. Otherwise, since symbols are not versioned, 
+    libeel2-2.24 will load it anyway and ka-boom. Closes: #507632.
+  * New upstream release.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Wed, 26 Nov 2008 01:28:28 +0100
+
+nautilus (2.24.1-1) experimental; urgency=low
+
+  [ Gustavo Noronha Silva ]
+  * New upstream release
+  * debian/patches/20_open-with_install.patch:
+  - updated to the new version
+
+  [ Josselin Mouette ]
+  * Update (build-)dependencies according to the new version.
+  * Add Breaks in libnautilus-extension1 against all packages that use 
+    the old API.
+  * 12_list-view_expand.patch, 14_sidebar_network-protocol.patch: 
+    refreshed.
+  * Update shlibs version to 2.23.1.
+  * Only require gvfs (>= 1.0.2), only recommend gvfs-backends.
+  * Stop recommending fam, gio does not support it correctly.
+  * Remove useless dh_strip argument overloading.
+  * 01_manpage.patch: fix whatis entry in nautilus-connect-server.1.
+  * Install upstream manpages in nautilus.
+  * Install the documentation for libnautilus-extension.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Sun, 23 Nov 2008 23:39:28 +0100
+
+nautilus (2.22.5.1-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * 20_open-with_install.patch: handle the case where content_type = 
+    NULL. See bugzilla #541183.
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Sat, 12 Jul 2008 19:17:54 +0200
+
+nautilus (2.22.4-1) experimental; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Mon, 30 Jun 2008 16:28:24 +0200
+
+nautilus (2.22.3-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * 20_open-with_install.patch: ported from the patch formerly in eel2.
+  * Also recommend synaptic and app-install-data.
+  * Include patch-translations.mk, require gnome-pkg-tools 0.13.
+  * debian/po-up: taken from eel2.
+  * 99_ltmain_as-needed.patch: make the patch apply with -p1.
+    Closes: #484953.
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release:
+    + debian/control.in:
+      - Drop esound from build dependencies.
+    + debian/patches/05_places-sidebar_single-click.patch:
+      - Dropped, merged upstream.
+  * debian/control.in:
+    + Update Standards-Version to 3.8.0, no additional changes needed.
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Wed, 25 Jun 2008 08:42:25 +0200
+
+nautilus (2.22.2-1) experimental; urgency=high
+
+  * New upstream bugfix release:
+    + debian/patches/05_places-sidebar_single-click.patch:
+      - Updated to apply cleanly again.
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Tue, 08 Apr 2008 18:48:04 +0200
+
+nautilus (2.22.1-1) experimental; urgency=low
+
+  * 05_places-sidebar_single-click.patch: Update from bugzilla and enable
+    again as it should work good now and is more consistent with the
+    GTK file chooser.
+  * New upstream bugfix release:
+    + debian/patches/03_sftp_connect.patch,
+      debian/patches/04_show_backup_files.patch,
+      debian/patches/15_tracker_check.patch,
+      debian/patches/90_from_svn_mount_connect_to_server_locations.patch,
+      debian/patches/90_from_svn_fix_changing_default_application.patch:
+      - Dropped, emrged upstream.
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Fri, 28 Mar 2008 22:12:12 +0100
+
+nautilus (2.22.0-3) experimental; urgency=low
+
+  * Disable 05_places-sidebar_single-click.patch as it's buggy.
+  * Remove 18_disable_signal_handler.patch, it's better fixed upstream.
+  * Remove 06_dont_create_Desktop.patch, --no-desktop is meant as a switch
+    to not show icons on the desktop and not creating the desktop directory
+    creates all kinds of broken links in nautilus.
+  * Remove 08_folder_handler.patch, this is upstream already.
+  * Disable 10_location_titlebar.patch, this gives completely unwanted results
+    for thrash:// for example or when the filesystem uses something else
+    than UTF8 as encoding (%XX stuff in the title).
+    See http://bugzilla.gnome.org/show_bug.cgi?id=142087
+  * 90_from_svn_mount_connect_to_server_locations.patch, Added. Mounts location
+    in the connect to server dialog. Patch taken from the Ubuntu package.
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Wed, 19 Mar 2008 16:22:08 +0100
+
+nautilus (2.22.0-2) experimental; urgency=low
+
+  * Disable 07_desktop_file_activation.patch for now, it breaks in an
+    unintended way.
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Wed, 19 Mar 2008 11:10:42 +0100
+
+nautilus (2.22.0-1) experimental; urgency=low
+
+  [ Sebastian Dröge ]
+  * New upstream stable release:
+    + Upload to experimental first because of intrusive changes.
+    + debian/control.in:
+      - Update build dependencies and dependencies.
+    + debian/rules:
+      - Bump shlibs.
+    + debian/patches/01_prompt_same_file.patch,
+      debian/patches/16_missing_thumbnails.patch,
+      debian/patches/20_upstream_nautilus-dnd-user-owned.patch,
+      debian/patches/21_nautilus_xmp.patch,
+      debian/patches/23_thumbnails_add-border.patch,
+      debian/patches/11_gnomevfs_query_eject.patch:
+      - Dropped, merged upstream.
+    + debian/patches/06_dont_create_Desktop.patch:
+      - Updated to apply cleanly again.
+    + debian/patches/07_desktop_file_activation.patch:
+      - Updated to apply cleanly again.
+    + debian/patches/10_location_titlebar.patch:
+      - Updated to apply cleanly again.
+    + debian/patches/14_sidebar_network-protocol.patch:
+      - Updated to apply cleanly again.
+    + debian/patches/99_ltmain_as-needed.patch:
+      - Updated to apply cleanly again.
+    + debian/patches/90_from_svn_fix_changing_default_application.patch:
+      - Make changing the default application work again, patch taken from
+        the Ubuntu package.
+    + debian/patches/18_disable_signal_handler.patch:
+      - Don't use the logging code signal handler it's buggy and makes
+        nautilus being stuck and eat cpu on crash. Patch taken from the
+        Ubuntu package.
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Sun, 16 Mar 2008 20:30:48 +0100
+
+nautilus (2.20.0-7) unstable; urgency=low
+
+  * 25_disable_sighandler.patch: patch from upstream SVN. Disable the 
+    horrible signal handler that makes nautilus go wild while filling 
+    its debug log. Closes: #454764, #494788.
+  * Don’t require libselinux on non-linux OSes. Closes: #494645.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Tue, 16 Sep 2008 08:15:05 +0200
+
+nautilus (2.20.0-6) unstable; urgency=low
+
+  * 24_smb_crash.patch: patch from upstream to handle NULL MIME types 
+    set by the SMB module gracefully, avoiding a lot of crashes.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Mon, 21 Jul 2008 17:09:01 +0200
+
+nautilus (2.20.0-5) unstable; urgency=low
+
+  * 05_places-sidebar_single-click.patch: replaced by upstream version 
+    of the patch, that does not activate items while right-clicking 
+    them. Closes: #414960.
+  * 06_dont_create_Desktop.patch, 
+    20_upstream_nautilus-dnd-user-owned.patch: make patches apply with 
+    -p1. Closes: #484953.
+  * Recommend app-install-data and synaptic now that libeel doesn’t 
+    anymore.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Fri, 18 Jul 2008 13:27:27 +0200
+
+nautilus (2.20.0-4) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Add a nautilus-extensions-1.0 Provide to nautilus to express the fact that
+    nautilus will search for extensions in /usr/lib/nautilus/extensions-1.0;
+    this might avoid a long list of Conflicts in nautilus when updating to
+    extensions-2.0 (nautilus >= 2.21.2).
+
+  [ Josselin Mouette ]
+  * Demote fam to a Suggests; only g-d-e really needs to recommend it.
+  * 02_trash_location.patch: new patch. When unmounting a volume with a 
+    non-empty trash, take into account that with the new location, the 
+    directory to remove is the parent of the one returned by gnome-vfs.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Wed, 28 May 2008 01:47:28 +0200
+
+nautilus (2.20.0-3) unstable; urgency=low
+
+  [ Diego Escalante Urrelo ]
+  * New patch, 23_thumbnails_add-border.patch, restore the
+    thumbnail borders; (GNOME #478363). Closes: #456957.
+
+  [ Josselin Mouette ]
+  * Add missing references to all patches.
+
+  [ Sebastien Bacher ]
+  * New nautilus-connect-server manpage from Fernando Ribeiro (Ubuntu: #61299)
+
+  [ Josselin Mouette ]
+  * 16_missing_thumbnails.patch: stolen from upstream's SVN. Fixes
+    disappearing thumnails. Closes: #453525.
+
+  [ Julian Andres Klode ]
+  * debian/nautilus-connect-server.1: fix the manpage
+  * debian/nautilus-file-management-properties.1: add new manpage
+  * Upgrade to Policy 3.7.3
+  * Add VCS-Browser and VCS-Svn fields to debian/control
+  * Use the new Homepage field
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Sat, 12 Jan 2008 16:16:26 +0100
+
+nautilus (2.20.0-2) unstable; urgency=high
+
+  [ Loic Minier ]
+  * Build-dep against libglib2.0-dev >= 2.14; fixes crashes when mixing the
+    internal copy of GSequence with the glib one; thanks Andre Klapper.
+
+  [ Sebastian Dröge ]
+  * debian/patches/21_nautilus_xmp.patch,
+    debian/control.in:
+    + Build against exempi 1.99.5. Patch by Michael Biebl. (Closes: #450486)
+
+ -- Sebastian Dröge <slomo@xxxxxxxxxx>  Thu, 22 Nov 2007 11:00:12 +0100
+
+nautilus (2.20.0-1) unstable; urgency=low
+
+  * 15_tracker_check.patch: new patch, properly checks that tracker is
+    installed before using it. Closes: #439863.
+  * Suggest tracker.
+  * New upstream release.
+  * Update build dependencies.
+  * Pass --disable-update-mimedb to configure flags.
+  * Don't ship the XML file in nautilus, ugh.
+  * Call dh_installmime by hand for nautilus-data.
+  * Refresh patches.
+  * 05_places-sidebar_single-click.patch: updated to new version.
+  * 12_list-view_expand.patch: updated for 2.20; revert upstream commit
+    r13045.
+  * 13_thumbnail_size_pref.patch: removed, integrated upstream.
+  * 60_combobox-changed-signal.patch: removed, integrated upstream.
+  * Update menu file.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Mon, 24 Sep 2007 12:34:46 +0200
+
+nautilus (2.18.3-3) unstable; urgency=low
+
+  * New patch, 60_combobox-changed-signal, fix a crash with newer Gtk emitting
+    a changed signal; GNOME #459221; SVN r13002.
+
+ -- Loic Minier <lool@xxxxxxxx>  Tue, 24 Jul 2007 15:57:04 +0200
+
+nautilus (2.18.3-2) unstable; urgency=low
+
+  * 14_sidebar_network-protocol.patch: fix systematic segfault.
+    Closes: #434123.
+  * Enable tracker support by build-depending on libtrackerclient-dev.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Sun, 22 Jul 2007 15:17:31 +0200
+
+nautilus (2.18.3-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * 12_list-view_expand.patch: update the minimum width to 20
+    characters.
+  * Update watch file.
+  * 13_thumbnail_size_pref.patch: stolen from upstream SVN. Introduces a
+    preference to define the thumbnail size (closes: #425400).
+  * 99_ltmain_as-needed.patch: make --as-needed work for the library
+    too.
+
+  [ Otavio Salvador ]
+  * 14_sidebar_network-protocol.patch: Adds the "Network Servers" option
+    on sidebar. Thanks to Luis Gustavo S. Barreto <gustavo@xxxxxxxxxxxxxxxx>
+    for the patch.
+
+  [ Guilherme de S. Pastore ]
+  * 15_japanese_typo.patch: fixes a typo in the Japanese translation. Thanks
+    to Kobayashi Noritada for reporting it. (Closes: #430679)
+
+  [ Josselin Mouette ]
+  * New upstream release.
+  * Refresh patches.
+  * 15_japanese_typo.patch: removed, integrated upstream.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  Wed, 18 Jul 2007 23:43:01 +0200
+
+nautilus (2.18.1-3) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
+    cdbs >= 0.4.41.
+  * Prepend -z defs to LDFLAGS for additional safety.
+  * Wrap build-deps and deps.
+
+  [ Josselin Mouette ]
+  * 12_list-view_expand.patch: set a minimum width for the name column 
+    to avoid opening a window with a too small name column. Partially 
+    fixes #422563.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <slomo@xxxxxxxxxx>  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 <lool@xxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <lool@xxxxxxxx>  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 <lool@xxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <lool@xxxxxxxx>  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 <lool@xxxxxxxx>  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 <lool@xxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <lool@xxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <joss@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <lool@xxxxxxxx>  Mon, 24 Apr 2006 19:45:51 +0200
+
+nautilus (2.12.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Josselin Mouette <joss@xxxxxxxxxx>  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 <lool@xxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <lool@xxxxxxxx>  Fri, 14 Oct 2005 11:24:06 +0200
+
+nautilus (2.10.1-4) unstable; urgency=medium
+  
+  [ Sebastien Bacher <seb128@xxxxxxxxxx> ]
+  * 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 <joss@xxxxxxxxxx> ]
+  * 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 <seb128@xxxxxxxxxx>  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 <joss@xxxxxxxxxx>  Sat, 25 Jun 2005 18:03:04 +0200
+
+nautilus (2.10.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <jordi@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <daf@xxxxxxxxxxxxxxx>.
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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) <jdassen@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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) <jdassen@xxxxxxxxxx>  Thu,  5 Feb 2004 21:50:27 +0100
+
+nautilus (2.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <seb128@xxxxxxxxxx>  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 <jordi@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  Fri, 13 Jun 2003 14:54:56 +0900
+
+nautilus (2.2.3.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  Thu, 10 Apr 2003 11:35:38 +0900
+
+nautilus (2.2.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  Fri, 14 Mar 2003 16:34:45 +0900
+
+nautilus (2.2.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  Thu, 13 Feb 2003 01:58:08 +0900
+
+nautilus (2.2.0.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  Fri, 31 Jan 2003 11:06:34 +0900
+
+nautilus (2.2.0.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  Thu, 23 Jan 2003 23:38:27 +0900
+
+nautilus (2.2.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  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 <kitame@xxxxxxxxxx>  Fri, 15 Nov 2002 15:26:15 +0900
+
+nautilus (2.0.7-4) unstable; urgency=low
+
+  * upload into unstable/main
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  Wed, 13 Nov 2002 09:49:33 +0900
+
+nautilus (2.0.7-3) experimental; urgency=low
+
+  * Change package name to nautilus
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  Fri,  8 Nov 2002 16:09:34 +0900
+
+nautilus2 (2.0.7-2) unstable; urgency=low
+
+  * Replaces: nautilus (closes: #166074)
+
+ -- Takuo KITAME <kitame@xxxxxxxxxx>  Tue,  5 Nov 2002 16:31:22 +0900
+
+nautilus2 (2.0.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Wed, 18 Sep 2002 15:23:25 +0900
+
+nautilus2 (2.0.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Mon, 19 Aug 2002 14:45:22 +0900
+
+nautilus2 (2.0.4-1) unstable; urgency=low
+
+  * New upsream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Wed,  3 Jul 2002 12:00:40 +0900
+
+nautilus2 (2.0.0-2) experimental; urgency=low
+
+  * build against librsvg2-2
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Thu, 13 Jun 2002 03:21:57 +0900
+
+nautilus1.1 (1.1.19-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Wed,  5 Jun 2002 11:35:23 +0900
+
+nautilus1.1 (1.1.18-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Tue, 21 May 2002 14:26:45 +0900
+
+nautilus1.1 (1.1.17-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Tue, 14 May 2002 10:30:51 +0900
+
+nautilus1.1 (1.1.15-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Mon, 29 Apr 2002 23:48:00 +0900
+
+nautilus1.1 (1.1.13-1) experimental; urgency=low
+
+  * New upstream release
+  * use dbs
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Mon, 22 Apr 2002 20:22:44 +0900
+
+nautilus1.1 (1.1.12-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Sat, 20 Apr 2002 01:23:25 +0900
+
+nautilus1.1 (1.1.11-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Tue, 26 Mar 2002 10:09:56 +0900
+
+nautilus1.1 (1.1.9-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Fri,  8 Mar 2002 14:55:21 +0900
+
+nautilus1.1 (1.1.8-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Thu,  7 Mar 2002 11:29:37 +0900
+
+nautilus1.1 (1.1.6-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Sun, 17 Feb 2002 14:40:17 +0900
+
+nautilus1.1 (1.1.4-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Wed,  6 Feb 2002 03:01:38 +0900
+
+nautilus1.1 (1.1.3-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Mon,  4 Feb 2002 00:42:38 +0900
+
+nautilus1.1 (1.1.2-2) experimental; urgency=low
+
+  * Build against latest libatk9
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Tue,  8 Jan 2002 02:19:45 +0900
+
+nautilus (1.0.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  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 <kitame@xxxxxxxxxxxx>  Tue, 28 Nov 2000 01:37:10 +0900
+
+nautilus (0.5-2) unstable; urgency=low
+
+  * --enable-mozilla-component
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Wed,  8 Nov 2000 12:57:18 +0900
+
+nautilus (0.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Wed,  8 Nov 2000 10:38:37 +0900
+
+nautilus (0.1.0-1) experimental; urgency=low
+
+  * Initial Release.
+
+ -- Takuo KITAME <kitame@xxxxxxxxxxxx>  Thu, 17 Aug 2000 12:51:38 +0900
+
+

=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2011-07-30 17:29:22 +0000
@@ -0,0 +1,1 @@
+5

=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2011-07-30 17:29:22 +0000
@@ -0,0 +1,157 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+Source: nautilus
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@xxxxxxxxxxxxxxxx>
+XSBC-Original-Maintainer: Josselin Mouette <joss@xxxxxxxxxx>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@xxxxxxxxxxxxxxxxxxxxxxx>
+Build-Depends: debhelper (>= 5),
+               cdbs (>= 0.4.41),
+               quilt,
+               gnome-pkg-tools (>= 0.13),
+               dpkg-dev (>= 1.13.19),
+               libglib2.0-dev (>= 2.24),
+               libgnome-desktop-dev (>= 1:2.29.91),
+               libpango1.0-dev (>= 1.1.2),
+               libgtk2.0-dev (>= 2.20),
+               libxml2-dev (>= 2.4.7),
+               libexif-dev (>= 0.5.12),
+               libexempi-dev (>= 1.99.5),
+               libgail-dev (>= 0.16),
+               libunique-dev,
+               libdbus-glib-1-dev,
+               intltool (>= 0.40.1),
+               gtk-doc-tools (>= 1.4),
+               libxt-dev,
+               libx11-dev,
+               libselinux1-dev | not+linux-gnu,
+               libxrender-dev,
+               libxext-dev,
+               libgconf2-dev,
+               x11proto-core-dev,
+               shared-mime-info (>= 0.50),
+               libglib2.0-doc,
+               libgtk2.0-doc,
+               liblaunchpad-integration-dev (>= 0.1.17),
+               libappindicator-dev
+Homepage: http://www.gnome.org/projects/nautilus/
+VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu
+Standards-Version: 3.8.3
+
+Package: nautilus
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         nautilus-data (>= ${gnome:Version}),
+         nautilus-data (<< ${gnome:NextVersion}),
+         shared-mime-info (>= 0.50),
+         desktop-file-utils (>= 0.7),
+         gvfs (>= 1.3.2),
+         libglib2.0-data
+Provides: nautilus-extensions-2.0
+Recommends: eject,
+            librsvg2-common,
+            app-install-data,
+            gvfs-backends,
+            consolekit
+Suggests: eog,
+          evince | pdf-viewer,
+          gnome-app-install,
+          totem | mp3-decoder,
+          brasero (>= 2.26) | nautilus-cd-burner,
+          xdg-user-dirs
+Conflicts: libnautilus2-2,
+           libnautilus2-dev
+Breaks: gnome-volume-manager (<< 2.24),
+        rhythmbox (<< 0.12),
+        gnome-session (<< 2.28)
+Replaces: libnautilus2-2
+Description: file manager and graphical shell for GNOME
+ Nautilus is the official file manager for the GNOME desktop. It allows
+ to browse directories, preview files and launch applications associated
+ with them. It is also responsible for handling the icons on the GNOME
+ desktop. It works on local and remote filesystems.
+ .
+ Several icon themes and components for viewing different kinds of files
+ are available in separate packages.
+
+Package: nautilus-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: nautilus (= ${binary:Version}),
+         ${misc:Depends}
+Replaces: libnautilus-extension1-dbg
+Description: file manager and graphical shell for GNOME - debugging version
+ Nautilus is the official file manager for the GNOME desktop. It allows
+ to browse directories, preview files and launch applications associated
+ with them. It is also responsible for handling the icons on the GNOME
+ desktop. It works on local and remote filesystems.
+ .
+ Several icon themes and components for viewing different kinds of files
+ are available in separate packages.
+ .
+ This development package contains unstripped binaries compiled with
+ debugging symbols needed by gdb.
+ 
+Package: libnautilus-extension1
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libnautilus2-2
+Breaks: nautilus (<< 2.22),
+        gnome-mount (<< 0.8),
+        nautilus-cd-burner (<< 2.22),
+        file-roller (<< 2.24),
+        python-nautilus (<< 0.5),
+        nautilus-sendto (<< 0.14.0-2),
+        nautilus-open-terminal (<< 0.9),
+        nautilus-image-converter (<< 0.3),
+        nautilus-filename-repairer (<< 0.0.5-2),
+        eiciel (<< 0.9.6.1-3),
+        diff-ext (<= 0.2.3-3),
+        nautilus-gksu (<< 2.0.2-2ubuntu1),
+        nautilus-actions (<< 1.4.1-1+b1),
+        nautilus-share (<< 0.7.2-4+b1),
+        seahorse-plugins (<< 2.24.1-3+b1)
+Replaces: libnautilus2-2
+Description: libraries for nautilus components - runtime version
+ Nautilus is the official file manager and graphical shell for the
+ GNOME desktop.
+ .
+ This package contains a few runtime libraries needed by nautilus' extensions.
+
+Package: libnautilus-extension-dev
+Architecture: any
+Section: libdevel
+Depends: libnautilus-extension1 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.21.3),
+         libgtk2.0-dev (>= 2.16.0),
+         ${shlibs:Depends},
+         ${misc: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: ${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.

=== added file 'debian/control.in'
--- debian/control.in	1970-01-01 00:00:00 +0000
+++ debian/control.in	2011-07-30 17:29:22 +0000
@@ -0,0 +1,152 @@
+Source: nautilus
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@xxxxxxxxxxxxxxxx>
+XSBC-Original-Maintainer: Josselin Mouette <joss@xxxxxxxxxx>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 5),
+               cdbs (>= 0.4.41),
+               quilt,
+               gnome-pkg-tools (>= 0.13),
+               dpkg-dev (>= 1.13.19),
+               libglib2.0-dev (>= 2.24),
+               libgnome-desktop-dev (>= 1:2.29.91),
+               libpango1.0-dev (>= 1.1.2),
+               libgtk2.0-dev (>= 2.20),
+               libxml2-dev (>= 2.4.7),
+               libexif-dev (>= 0.5.12),
+               libexempi-dev (>= 1.99.5),
+               libgail-dev (>= 0.16),
+               libunique-dev,
+               libdbus-glib-1-dev,
+               intltool (>= 0.40.1),
+               gtk-doc-tools (>= 1.4),
+               libxt-dev,
+               libx11-dev,
+               libselinux1-dev | not+linux-gnu,
+               libxrender-dev,
+               libxext-dev,
+               libgconf2-dev,
+               x11proto-core-dev,
+               shared-mime-info (>= 0.50),
+               libglib2.0-doc,
+               libgtk2.0-doc,
+               liblaunchpad-integration-dev (>= 0.1.17),
+               libappindicator-dev
+Homepage: http://www.gnome.org/projects/nautilus/
+VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu
+Standards-Version: 3.8.3
+
+Package: nautilus
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         nautilus-data (>= ${gnome:Version}),
+         nautilus-data (<< ${gnome:NextVersion}),
+         shared-mime-info (>= 0.50),
+         desktop-file-utils (>= 0.7),
+         gvfs (>= 1.3.2),
+         libglib2.0-data
+Provides: nautilus-extensions-2.0
+Recommends: eject,
+            librsvg2-common,
+            app-install-data,
+            gvfs-backends,
+            consolekit
+Suggests: eog,
+          evince | pdf-viewer,
+          gnome-app-install,
+          totem | mp3-decoder,
+          brasero (>= 2.26) | nautilus-cd-burner,
+          xdg-user-dirs
+Conflicts: libnautilus2-2,
+           libnautilus2-dev
+Breaks: gnome-volume-manager (<< 2.24),
+        rhythmbox (<< 0.12),
+        gnome-session (<< 2.28)
+Replaces: libnautilus2-2
+Description: file manager and graphical shell for GNOME
+ Nautilus is the official file manager for the GNOME desktop. It allows
+ to browse directories, preview files and launch applications associated
+ with them. It is also responsible for handling the icons on the GNOME
+ desktop. It works on local and remote filesystems.
+ .
+ Several icon themes and components for viewing different kinds of files
+ are available in separate packages.
+
+Package: nautilus-dbg
+Section: debug
+Architecture: any
+Priority: extra
+Depends: nautilus (= ${binary:Version}),
+         ${misc:Depends}
+Replaces: libnautilus-extension1-dbg
+Description: file manager and graphical shell for GNOME - debugging version
+ Nautilus is the official file manager for the GNOME desktop. It allows
+ to browse directories, preview files and launch applications associated
+ with them. It is also responsible for handling the icons on the GNOME
+ desktop. It works on local and remote filesystems.
+ .
+ Several icon themes and components for viewing different kinds of files
+ are available in separate packages.
+ .
+ This development package contains unstripped binaries compiled with
+ debugging symbols needed by gdb.
+ 
+Package: libnautilus-extension1
+Architecture: any
+Section: libs
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libnautilus2-2
+Breaks: nautilus (<< 2.22),
+        gnome-mount (<< 0.8),
+        nautilus-cd-burner (<< 2.22),
+        file-roller (<< 2.24),
+        python-nautilus (<< 0.5),
+        nautilus-sendto (<< 0.14.0-2),
+        nautilus-open-terminal (<< 0.9),
+        nautilus-image-converter (<< 0.3),
+        nautilus-filename-repairer (<< 0.0.5-2),
+        eiciel (<< 0.9.6.1-3),
+        diff-ext (<= 0.2.3-3),
+        nautilus-gksu (<< 2.0.2-2ubuntu1),
+        nautilus-actions (<< 1.4.1-1+b1),
+        nautilus-share (<< 0.7.2-4+b1),
+        seahorse-plugins (<< 2.24.1-3+b1)
+Replaces: libnautilus2-2
+Description: libraries for nautilus components - runtime version
+ Nautilus is the official file manager and graphical shell for the
+ GNOME desktop.
+ .
+ This package contains a few runtime libraries needed by nautilus' extensions.
+
+Package: libnautilus-extension-dev
+Architecture: any
+Section: libdevel
+Depends: libnautilus-extension1 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.21.3),
+         libgtk2.0-dev (>= 2.16.0),
+         ${shlibs:Depends},
+         ${misc: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: ${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.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2011-07-30 17:29:22 +0000
@@ -0,0 +1,38 @@
+This package was debianized by Takuo KITAME <kitame@xxxxxxxxxxxxxxxxxxxxxx> 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 <alexl@xxxxxxxxxx>
+		  Dave Camp <dave@xxxxxxxxxx>
+		  Soren Sandmann <sandmann@xxxxxxxxxxx>
+		  Jörg Billeter <j@xxxxxxxxx>
+		  James Willcox <jwillcox@xxxxxxxxx>
+		  Jan Arne Petersen <jpetersen@xxxxxxxxxxx>
+		  Mark McLoughlin <mark@xxxxxxxxx>
+		  Darin Adler <darin@xxxxxxxxxxxxx>
+		  Anders Carlsson <andersca@xxxxxxx>
+		  Michael Meeks <michael@xxxxxxxxxx>
+		  Jacob Berkman <jacob@xxxxxxxxxx>
+	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'.
+

=== added file 'debian/libnautilus-extension-dev.install'
--- debian/libnautilus-extension-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libnautilus-extension-dev.install	2011-07-30 17:29:22 +0000
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/libnautilus-extension*.so
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gtk-doc

=== added file 'debian/libnautilus-extension1.install'
--- debian/libnautilus-extension1.install	1970-01-01 00:00:00 +0000
+++ debian/libnautilus-extension1.install	2011-07-30 17:29:22 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/libnautilus-extension*.so.*

=== added file 'debian/menu'
--- debian/menu	1970-01-01 00:00:00 +0000
+++ debian/menu	2011-07-30 17:29:22 +0000
@@ -0,0 +1,2 @@
+?package(nautilus):needs="X11" section="Applications/File Management" \
+  title="Nautilus" command="/usr/bin/nautilus" icon="/usr/share/pixmaps/nautilus.xpm"

=== added file 'debian/mount-archive.desktop'
--- debian/mount-archive.desktop	1970-01-01 00:00:00 +0000
+++ debian/mount-archive.desktop	2011-07-30 17:29:22 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Archive Mounter
+Exec=/usr/lib/gvfs/gvfsd-archive file=%u
+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/zip;
+Terminal=false
+StartupNotify=false
+Type=Application
+NoDisplay=true
+

=== added file 'debian/mount-archive.desktop.in'
--- debian/mount-archive.desktop.in	1970-01-01 00:00:00 +0000
+++ debian/mount-archive.desktop.in	2011-07-30 17:29:22 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Archive Mounter
+Exec=/usr/lib/gvfs/gvfsd-archive file=%u
+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/zip;
+Terminal=false
+StartupNotify=false
+Type=Application
+NoDisplay=true
+

=== added file 'debian/nautilus-data.gconf-defaults'
--- debian/nautilus-data.gconf-defaults	1970-01-01 00:00:00 +0000
+++ debian/nautilus-data.gconf-defaults	2011-07-30 17:29:22 +0000
@@ -0,0 +1,5 @@
+/apps/nautilus/preferences/exit_with_last_window	false
+/apps/nautilus/desktop/home_icon_visible	false
+/apps/nautilus/desktop/computer_icon_visible	false
+/apps/nautilus/desktop/trash_icon_visible	false
+

=== added file 'debian/nautilus-data.install'
--- debian/nautilus-data.install	1970-01-01 00:00:00 +0000
+++ debian/nautilus-data.install	2011-07-30 17:29:22 +0000
@@ -0,0 +1,8 @@
+debian/tmp/etc
+debian/tmp/usr/share/icons/hicolor
+debian/tmp/usr/share/nautilus
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/mime/packages/nautilus.xml
+debian/tmp/usr/share/pixmaps
+debian/source_nautilus.py /usr/share/apport/package-hooks
+debian/nautilus.xpm /usr/share/pixmaps

=== added file 'debian/nautilus.install'
--- debian/nautilus.install	1970-01-01 00:00:00 +0000
+++ debian/nautilus.install	2011-07-30 17:29:22 +0000
@@ -0,0 +1,6 @@
+debian/mount-archive.desktop usr/share/applications
+debian/tmp/usr/bin
+debian/tmp/usr/lib/nautilus
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/man
+

=== added file 'debian/nautilus.postrm'
--- debian/nautilus.postrm	1970-01-01 00:00:00 +0000
+++ debian/nautilus.postrm	2011-07-30 17:29:22 +0000
@@ -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#

=== added file 'debian/nautilus.xpm'
--- debian/nautilus.xpm	1970-01-01 00:00:00 +0000
+++ debian/nautilus.xpm	2011-07-30 17:29:22 +0000
@@ -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.!+(+                        ",
+"                                                      _+        "};

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2011-07-30 17:29:22 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus \
+                             --disable-update-mimedb \
+                             --disable-packagekit
+LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 1:2.29.1)'
+
+binary-post-install/nautilus-data::
+	dh_installmime -p$(cdbs_curpkg)

=== added file 'debian/source_nautilus.py'
--- debian/source_nautilus.py	1970-01-01 00:00:00 +0000
+++ debian/source_nautilus.py	2011-07-30 17:29:22 +0000
@@ -0,0 +1,15 @@
+import os, apport.packaging, apport.hookutils
+
+def add_info(report):
+	# the crash is not in nautilus code so reassign
+	if report.has_key("Stacktrace") and "/usr/lib/nautilus" in report["Stacktrace"]:
+		for words in report["Stacktrace"].split():
+			if words.startswith("/usr/lib/nautilus"):
+				report.add_package_info(apport.packaging.get_file_package(words))
+				return
+
+	# collect informations on the /usr/lib/nautilus components 
+	report["usr_lib_nautilus"] = ""
+	for dir in os.walk("/usr/lib/nautilus"):
+		for files in dir[2]:
+			 report["usr_lib_nautilus"] += apport.hookutils.package_versions(apport.packaging.get_file_package(os.path.join(dir[0],files)))

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2011-07-30 17:29:22 +0000
@@ -0,0 +1,4 @@
+version=2
+http://ftp.gnome.org/pub/GNOME/sources/nautilus/([\d\.]+)[024689]/ \
+        nautilus-(.*)\.tar\.gz \
+        debian uupdate

=== removed file 'docs/reference/libnautilus-extension/version.xml'
--- docs/reference/libnautilus-extension/version.xml	2010-05-22 14:32:20 +0000
+++ docs/reference/libnautilus-extension/version.xml	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3:0:2

=== modified file 'libnautilus-private/nautilus-file-utilities.c'
--- libnautilus-private/nautilus-file-utilities.c	2010-10-08 14:43:06 +0000
+++ libnautilus-private/nautilus-file-utilities.c	2011-07-30 17:29:22 +0000
@@ -707,7 +707,12 @@
 	return g_file_equal (dir, desktop_dir);
 }
 
-/**
+<<<<<<< TREE
+/**
+=======
+
+/**
+>>>>>>> MERGE-SOURCE
  * nautilus_get_pixmap_directory
  * 
  * Get the path for the directory containing Nautilus pixmaps.

=== modified file 'libnautilus-private/nautilus-icon-container.c'
=== modified file 'libnautilus-private/nautilus-progress-info.c'
=== modified file 'src/nautilus-application.c'
--- src/nautilus-application.c	2011-03-30 18:37:28 +0000
+++ src/nautilus-application.c	2011-07-30 17:29:22 +0000
@@ -660,6 +660,7 @@
 
 	if (connection == NULL) {
 		application->session_is_active = TRUE;
+<<<<<<< TREE
 		return;
 	}
 
@@ -850,13 +851,33 @@
 
 
 static void
+=======
+
+		return;
+	}
+
+	proxy = dbus_g_proxy_new_for_name (conn, CK_NAME, CK_PATH "/Manager",
+ 					   CK_NAME ".Manager");
+	dbus_g_proxy_begin_call (proxy, "GetCurrentSession",
+				 ck_get_current_session_cb, application,
+				 NULL, G_TYPE_INVALID);
+}
+
+static void
+>>>>>>> MERGE-SOURCE
 finish_startup (NautilusApplication *application,
 		gboolean no_desktop)
 {
 	GList *drives;
 
+<<<<<<< TREE
         if (!no_desktop)
                 mark_desktop_files_trusted ();
+=======
+	if (!no_desktop) {
+		mark_desktop_files_trusted ();
+	}
+>>>>>>> MERGE-SOURCE
 	
         /* initialize nautilus modules */
 	nautilus_module_setup ();

=== modified file 'src/nautilus-places-sidebar.c'
--- src/nautilus-places-sidebar.c	2011-03-20 01:35:11 +0000
+++ src/nautilus-places-sidebar.c	2011-07-30 17:29:22 +0000
@@ -56,7 +56,11 @@
 
 #define EJECT_BUTTON_XPAD 0
 #define TEXT_XPAD 5
+<<<<<<< TREE
 #define ICON_XPAD 6
+=======
+#define ICON_CELL_XPAD 3 
+>>>>>>> MERGE-SOURCE
 //#define N_BUILTINS_BEFORE 1
 
 typedef struct {
@@ -253,8 +257,8 @@
 	gtk_tree_model_get (model, iter, PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type, -1);
   
   	if (type == PLACES_PERSONAL_CATEGORY || type == PLACES_STORAGE_CATEGORY || type == PLACES_BOOKMARKS_CATEGORY) {
-   		/*g_object_set (renderer, "weight", 900, "weight-set", TRUE, "height", 30, "xpad", TEXT_XPAD, NULL);*/
-   		g_object_set (renderer, "weight", 900, "weight-set", TRUE, "height", 20, NULL);
+   		//g_object_set (renderer, "weight", 900, "weight-set", TRUE, "height", 20, NULL);
+   		g_object_set (renderer, "weight", 900, "weight-set", TRUE, "height", 20, "xpad", TEXT_XPAD, NULL);
    		/*g_object_set (renderer, "weight", PANGO_WEIGHT_NORMAL, "height", 20, NULL);*/
 	} else {
 		g_object_set (renderer, "weight-set", FALSE, "height", -1, "xpad", 0, NULL);
@@ -2912,9 +2916,9 @@
                               NautilusPlacesSidebar *sidebar)
 {
 	if (!gtk_tree_model_iter_has_child (model, iter)) {
-		g_object_set (cell, "visible", TRUE, NULL);
+		g_object_set (cell, "visible", TRUE, "xpad", ICON_CELL_XPAD, NULL);
 	} else {
-		g_object_set (cell, "visible", FALSE, NULL);
+		g_object_set (cell, "visible", FALSE, "xpad", ICON_CELL_XPAD, NULL);
 	}
 }
 

=== modified file 'src/nautilus-window.c'