Merge lp:~azzar1/nautilus/higidpi-desktop-view-margins into lp:~vcs-imports/nautilus/master-git

[Andrea Azzarone]

Unmerged revisions

513. By Andrea Azzarone on 2016-07-29

* debian/patches/hidpi_desktop_view_margins.patch:
  - scale desktop workarea margins.

512. By Sebastien Bacher on 2016-07-21

* debian/patches/git_hover_hidebar.patch:
  - hide the selection info bar on mouse over (lp: #797485)

511. By Iain Lane on 2016-05-10

* debian/patches/restore-traditional-menu-bar.patch:
  - update menubar visibility on GktSettings changes

510. By Iain Lane on 2016-05-09

More 3.20 updates

509. By Iain Lane on 2016-05-09

Modify both to work with GTK 3.18 too, by using old CSS name and avoiding
new API.

508. By Iain Lane on 2016-05-09

debian/patches/0002-desktop-window-restore-transparency-again.patch:
Modify to work with GTK 3.18 too, by using old CSS name.

507. By Iain Lane on 2016-05-09

debian/patches/0001-desktop-window-restore-transparency.patch,
debian/patches/0002-desktop-window-restore-transparency-again.patch:
Cherry-pick patches from upstream to fix the desktop window's transparency
with GTK 3.20.

506. By Sebastien Bacher on 2016-03-18

releasing package nautilus version 1:3.18.4.is.3.14.3-0ubuntu4

505. By Sebastien Bacher on 2016-03-18

* debian/nautilus.migrations,
  debian/nautilus-unity-launcher-icon.py,
  debian/nautilus-unity-launcher-icon-rename.py:
  - remove the first migration script that was only needed for trusty,
    update it to use python3 and rename since there is only one.

504. By Sebastien Bacher on 2016-03-18

releasing package nautilus version 1:3.18.4.is.3.14.3-0ubuntu3

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2016-08-01 08:30:30 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+merge = True
 
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2016-08-01 08:30:30 +0000
@@ -0,0 +1,2397 @@
+nautilus (1:3.18.4.is.3.14.3-0ubuntu6) UNRELEASED; urgency=medium
+
+  * debian/patches/hidpi_desktop_view_margins.patch:
+    - scale desktop workarea margins.
+
+ -- Andrea Azzarone <[e-mail]>  Fri, 29 Jul 2016 21:55:44 +0200
+
+nautilus (1:3.18.4.is.3.14.3-0ubuntu5) UNRELEASED; urgency=medium
+
+  [ Iain Lane ]
+  * debian/patches/0001-desktop-window-restore-transparency.patch,
+    debian/patches/0002-desktop-window-restore-transparency-again.patch:
+    Cherry-pick patches from upstream to fix the desktop window's transparency
+    with GTK 3.20.
+  * Modify both to work with GTK 3.18 too, by using old CSS name and avoiding
+    new API.
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/patches/restore-traditional-menu-bar.patch:
+    - update menubar visibility on GktSettings changes
+    
+  [ Sebastien Bacher ]
+  * debian/patches/git_hover_hidebar.patch:
+    - hide the selection info bar on mouse over (lp: #797485)
+
+ -- Iain Lane <[e-mail]>  Mon, 09 May 2016 13:17:39 +0100
+
+nautilus (1:3.18.4.is.3.14.3-0ubuntu4) xenial; urgency=medium
+
+  * debian/nautilus.migrations, 
+    debian/nautilus-unity-launcher-icon.py,
+    debian/nautilus-unity-launcher-icon-rename.py:
+    - remove the first migration script that was only needed for trusty,
+      update it to use python3 and rename since there is only one.
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 18 Mar 2016 20:50:18 +0100
+
+nautilus (1:3.18.4.is.3.14.3-0ubuntu3) xenial; urgency=medium
+
+  * debian/patches/git_desktop_grid.patch:
+    - use the correct grid point when moving icons on the desktop view,
+      (lp: #1462267)
+  * debian/patches/ubuntu_new_gtksidebar.patch:
+    - GtkPlacesSidebar changed in GTK 3.18, update to the new version, that 
+      restores special items on context menus (eject, format, etc) and the
+      sidebar item to browse remote locations (lp: #1548977)
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 18 Mar 2016 09:42:31 +0100
+
+nautilus (1:3.18.4.is.3.14.3-0ubuntu2) xenial; urgency=medium
+
+  * debian/patches/git_dnd_segfault.patch:
+    - don't segfault when dragging files from e.g file-roller to nautilus
+      (lp: #1542633)
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 19 Feb 2016 17:23:01 +0100
+
+nautilus (1:3.18.4.is.3.14.3-0ubuntu1) xenial; urgency=medium
+
+  * Revert to the previous serie, the new one is going to need more work
+    which is not going to be done this cycle (some issues/regressions are
+    being handled upstream in 3.20 but we can do that update with our GTK
+    version, also the new copy dialog is a bit much of a change and upstream
+    confirms it's creating problems that they try to address with more UI
+    changes) (lp: #1541954)
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/patches/ubuntu_open_new_window_for_folders.patch:
+    - Open folders in new nautilus windows by default (LP: #1524721)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 04 Feb 2016 18:41:31 +0100
+
+nautilus (1:3.18.4-0ubuntu2) xenial; urgency=medium
+
+  * Multiarchify the library packages.
+
+ -- Matthias Klose <[e-mail]>  Thu, 28 Jan 2016 20:27:59 +0100
+
+nautilus (1:3.18.4-0ubuntu1) xenial; urgency=medium
+
+  * New upstream bugfix release.
+
+ -- Dmitry Shachnev <[e-mail]>  Mon, 28 Dec 2015 15:23:01 +0300
+
+nautilus (1:3.18.3-0ubuntu1) xenial; urgency=medium
+
+  * New upstream version:
+    - Fix "move to" action (lp: #1434573)
+  * debian/patches/update_git_stable.patch:
+    - dropped, not needed with the version update
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 15 Dec 2015 11:39:28 +0100
+
+nautilus (1:3.18.2-1ubuntu3) xenial; urgency=medium
+
+  * debian/patches/update_git_stable.patch:
+    - updated to current gnome-3-18 code, should help with some segfaults
+      (lp: #1524008)
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 11 Dec 2015 15:33:16 +0100
+
+nautilus (1:3.18.2-1ubuntu2) xenial; urgency=medium
+
+  * debian/control.in, debian/patches/zg_activity_logging.patch:
+    -  Use zeitgeist-2.0 (lp: #1197569)
+
+ -- Rico Tzschichholz <[e-mail]>  Thu, 03 Dec 2015 16:41:30 +0100
+
+nautilus (1:3.18.2-1ubuntu1) xenial; urgency=medium
+
+  * New version (lp: #1463662) and resynchronize on Debian
+    - better layout in the icons view (lp: #589433, #1019298)
+    - can move link type .desktop (lp: #1278437)
+  * The update uses GtkHeaderBar decorations and has no menubar for now,
+    the menus are coming back later and UI is likely to be tweaked again
+    based on the feedback from this version
+  * Removed changed, deprecated or included in the new version
+  * debian/patches/revert_remove_unused_GtkActions.patch:
+  * debian/patches/restore-traditional-menu-bar.patch:
+    - not needed with the new proper menubar changeset
+  * debian/patches/11_copy_skipping_pager.patch:
+    - the new version has no copy dialog
+  * debian/patches/14_bring_del_instead_ctrl_del.patch:
+    - resolved in the new version
+  * debian/patches/git_name_column.patch,
+    debian/patches/git_multiple_desktop_names.patch,
+    debian/patches/git_file_dnd.patch,
+    debian/patches/git_sidebar_selection.patch,
+    debian/patches/git_slot_order.patch,
+    debian/patches/git_unmount_seg.patch,
+    debian/patches/git_valid_list.patch,
+    debian/patches/git_nomodel_segfault.patch,
+    debian/patches/git_open_dir_with.patch,
+    debian/patches/git_wrap_label.patch,
+    debian/patches/git_null_uri.patch,
+    debian/patches/git_revert_location_entry.patch,
+    debian/patches/ignore-no-desktop-if-not-first-launch.patch,
+    0001-application-use-correct-order-to-watch-for-GSettings.patch:
+    - included in the new version
+  * Remaining changes
+  * debian/control.in:
+    - Build-Depends on dh-migrations, libunity-dev,
+      updated gnome-pkg-tools requirement
+    - lower gnome-sushi Recommends to a Suggests
+    - don't recommends gnome-icon-theme-symbolic it's deprecated
+    - nautilus-data should not need to recommends nautilus,
+      lower to a suggests so file-roller doesn't bring in nautilus
+  * debian/changelog, debian/rules: set epoch number (which was added by error)
+  * debian/mount-archive.desktop:
+  * debian/mount-archive.desktop.in:
+    - New nautilus context menu item to allow mounting zip, iso, etc
+  * debian/nautilus.install:
+    - don't move the autostart to usr
+    - install mount-archive menu
+    - install nautilus-folder-handler.desktop
+  * debian/nautilus-data.install:
+    - install apport hook
+  * debian/nautilus-folder-handler.desktop:
+    - ship a copy of nautilus.desktop with NoDisplay=true since some user 
+      configurations refer to it 
+  * debian/nautilus.migrations, 
+    debian/nautilus-unity-launcher-icon-rename.py:
+    - change the nautilus.desktop entry in the unity configuration to the
+      new org.gnome.Nautilus name (lp: #1436297)
+  * 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/rules:
+    - use dh_migrations and build compat desktop entries
+  * debian/patches/03_translations_list_update.patch:
+    - Translate the mount-archive menu entry
+  * debian/patches/04_suppress_umount_in_ltsp.patch:
+    - Don't list unmount and eject actions on LTSP clients
+  * debian/patches/06_never_exec_nonexec_launchers.patch:
+    - Implement non-exec policy for .desktop handler.
+  * debian/patches/08_clean_session_capplet.patch:
+    - use NoDisplay for the new autostart desktop to keep the capplet clean
+  * debian/patches/12_unity_launcher_support.patch:
+    - unity launcher integration (list bookmarks in the context menu,
+      display a bar on the icon during copies)
+  * debian/patches/15_use-ubuntu-help.patch:
+    - use the ubuntu documentation
+  * debian/patches/16_unity_new_documents.patch: 
+    - display the "new document" menu under unity, even if there is no 
+      template installed (lp: #1113648)
+  * debian/patches/17_static_unity_quicklist.patch:
+    - Use nautilus --new-window to open a New window
+  * debian/patches/18_unity_icon_color.patch:
+    - specify a background color for the unity launcher icon (lp: #1081691)
+  * debian/patches/dont_wrap_labels_after_dots.patch:
+    - don't wrap labels after a dot if they are followed by a number,
+      the upstream code has a hack for 3 digit version numbers which 
+      doesn't really make sense (lp: #942539)
+  * debian/patches/19_unity_open_location_xid.patch:
+    - don't try to call functions on null objects (lp: #1285895)
+    - delay dbus registration until we don't have a bus
+  * debian/patches/ubuntu_revert_no_wallpaper.patch:
+    - revert upstream changes to use a rgba desktop view, until the other
+      components are ready for that change, see lp #1159430 for details
+  * debian/patches/interactive_search.patch:
+    - Restore interactive search as an option (lp: #1164016)
+  * debian/patches/ubuntu_infobars_color.patch: set the infobars type
+    to "other" rather than "question" to avoid blue cluebars (lp: #1259059)
+  * debian/patches/ubuntu_tracker_only_on_GNOME.patch: 
+    - only start the tracker index on GNOME sessions
+  * debian/patches/ubuntu_backspace_behaviour.patch: 
+    - restore backspace behaviour, as a back button, that's 
+      what most filemanager use (lp: #1108637)
+
+  [ Marco Trevisan (Treviño) ]
+  * debian/patches/19_unity_open_location_xid.patch: 
+    - ensure that the active location is always the first listed
+    - only use window xid on X11
+  * debian/patches/20_add_timestamp_to_operations.patch:
+    - Add *WithTimestamp dbus methods for file operations that
+      might trigger a dialog, that should be presented with time.
+      (lp: #1445595)
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 02 Dec 2015 10:18:52 +0100
+
+nautilus (3.18.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <[e-mail]>  Sat, 14 Nov 2015 15:44:03 +0100
+
+nautilus (3.18.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <[e-mail]>  Wed, 21 Oct 2015 16:35:10 +0200
+
+nautilus (3.18.0-2) unstable; urgency=medium
+
+  * Enable PackageKit support
+  * Bump debhelper compatibility to 9
+
+ -- Laurent Bigonville <[e-mail]>  Tue, 13 Oct 2015 12:10:27 +0200
+
+nautilus (3.18.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Update (build-)dependencies according to configure.ac changes:
+    - bump libglib2.0-dev to >= 2.45.7
+    - bump libgtk-3-dev to >= 3.17.5
+    - bump gtk-doc-tools to >= 1.10
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 24 Sep 2015 15:54:57 +0200
+
+nautilus (3.16.2-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Update (build-)dependencies according to configure.ac changes:
+    - drop libnotify
+    - bump glib to 2.43.4 and gtk+ to 3.15.2
+  * debian/nautilus-data.install:
+    - no longer ship usr/share/mime/packages/nautilus.xml, which is
+      no longer available upstream since commit 5951fadbefafd17798
+      "Remove saved search mimetype association"
+  * Fix spelling of "allows one to" in pkg descriptions, thanks lintian.
+  * Bump Standards-Version to 3.9.6
+
+  [ Michael Biebl ]
+  * Remove Debian menu entry.
+
+ -- Michael Biebl <[e-mail]>  Sat, 05 Sep 2015 22:30:08 +0200
+
+nautilus (3.14.2-1) unstable; urgency=medium
+
+  * Drop eject recommends - obsolete since circa 2003
+  * New upstream stable release.
+  * Drop debian/patches/01_fix-new-window-manage-desktop.patch
+    - now part of upstream release.
+
+ -- Andreas Henriksson <[e-mail]>  Sun, 17 May 2015 11:15:00 +0200
+
+nautilus (3.14.1-2) unstable; urgency=medium
+
+  * d/p/01_fix-new-window-manage-desktop.patch: Fix opening of new browser
+    windows when nautilus is managing the desktop, cherry-picked from
+    upstream, should really Closes: #766021
+
+ -- Laurent Bigonville <[e-mail]>  Fri, 21 Nov 2014 20:44:25 +0100
+
+nautilus (3.14.1-1) unstable; urgency=medium
+
+  * New upstream release.
+    - includes fix for --new-window (Closes: #766021)
+
+ -- Andreas Henriksson <[e-mail]>  Thu, 20 Nov 2014 14:15:54 +0100
+
+nautilus (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 23 Sep 2014 15:50:25 +0200
+
+nautilus (3.13.91-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Update build-dependencies according to configure.ac:
+    - Bump libgtk-3-dev to (>= 3.13.2)
+  * nautilus-data: stop installing /usr/share/nautilus placeholder files
+    - no longer shipped by upstream.
+
+ -- Andreas Henriksson <[e-mail]>  Fri, 05 Sep 2014 15:34:02 -0700
+
+nautilus (3.12.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 15 Jul 2014 00:08:32 +0200
+
+nautilus (3.12.0-2) experimental; urgency=medium
+
+  * Switch to tracker 1.0.
+
+ -- Michael Biebl <[e-mail]>  Sat, 10 May 2014 04:10:11 +0200
+
+nautilus (3.12.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * nautilus: install appdata file
+  * Bump Standards-Version to 3.9.5
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 25 Mar 2014 21:54:35 +0100
+
+nautilus (3.11.90-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Bump build-dependency, Gtk+ 3.11.6
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 18 Feb 2014 01:56:29 +0100
+
+nautilus (3.10.0-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control.in: Update build-depends libgtk-3-dev (>= 3.9.11),
+    libgnome-desktop-3-dev (>= 3.10)
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 03 Nov 2013 11:34:30 +0100
+
+nautilus (3.8.2-3) unstable; urgency=medium
+
+  * Switch to tracker 1.0. (Closes: #741425)
+
+ -- Michael Biebl <[e-mail]>  Sat, 10 May 2014 04:07:37 +0200
+
+nautilus (3.8.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sun, 13 Oct 2013 17:37:31 +0200
+
+nautilus (3.8.2-1) experimental; urgency=low
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * debian/control.in: Bump minimum gsettings-desktop-schemas
+
+  [ Emilio Pozuelo Monfort ]
+  * Standards-Version is 3.9.4, no changes needed.
+
+  [ Michael Biebl ]
+  * Re-enable tracker support.
+  * Set [e-mail] as Maintainer.
+
+ -- Michael Biebl <[e-mail]>  Sat, 12 Oct 2013 00:54:36 +0200
+
+nautilus (3.8.0-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Mon, 25 Mar 2013 18:20:45 +0100
+
+nautilus (3.7.92-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Wed, 20 Mar 2013 01:37:52 +0100
+
+nautilus (3.7.91-2) experimental; urgency=low
+
+  * debian/control.in:
+    - Bump depends on gsettings-desktop-schemas to 3.7.90.
+      Thanks to Laurent Bigonville for noticing this. Closes: #703106.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Fri, 15 Mar 2013 20:36:10 +0100
+
+nautilus (3.7.91-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * Recommend gnome-icon-theme-symbolic. Closes: #692509
+
+  [ Jeremy Bicha ]
+  * New upstream release
+  * debian/control.in:
+    - Bump minimum glib and gtk
+    - Suggest brasero instead of recommending it 
+  * debian/nautilus.install:
+    - Shell search provider doesn't need a separate library any more
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+    + debian/control.in,
+      debian/rules:
+      - Temporarily disable tracker support until tracker 0.16 lands
+        in the archive.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Wed, 13 Mar 2013 13:26:53 +0100
+
+nautilus (3.6.1-2) experimental; urgency=low
+
+  * Build-depend on libgnome-desktop-3-dev 3.6.1, because thumbnailing
+    doesn't seem to work when compiled against the 3.4.x version
+
+ -- Simon McVittie <[e-mail]>  Wed, 24 Oct 2012 12:18:01 +0100
+
+nautilus (3.6.1-1) experimental; urgency=low
+
+  * Team upload
+
+  [ Jeremy Bicha ]
+  * New upsteam release
+  * debian/control.in:
+    - Bump minimum glib and gtk
+  * debian/nautilus.install, debian/nautilus-data.install:
+    - Install gnome shell search provider
+  * Dropped obsolete patches:
+    - debian/patches/12_list-view_expand.patch
+    - debian/patches/13_tracker.patch:
+
+ -- Simon McVittie <[e-mail]>  Tue, 23 Oct 2012 10:35:43 +0100
+
+nautilus (3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh debian/patches/12_list-view_expand.patch.
+
+ -- Michael Biebl <[e-mail]>  Wed, 16 May 2012 15:54:52 +0200
+
+nautilus (3.4.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Drop explicit Build-Depends on gir packages and let the corresponding -dev
+    package pull them for us.
+  * Bump minimum required version of libglib2.0-dev to 2.31.9 and libgtk-3-dev
+    to 3.3.17.
+  * Remove debian/patches/14_tracker-0.14.patch, fixed upstream.
+  * Remove debian/patches/03_deprecated.patch, no longer needed.
+  * debian/nautilus-data.install: Remove usr/share/pixmaps, not installed by
+    upstream.
+  * debian/rules: Remove call to dh_installmime, already done by cdbs.
+  * Bump Standards-Version to 3.9.3.
+
+ -- Michael Biebl <[e-mail]>  Thu, 19 Apr 2012 14:41:06 +0200
+
+nautilus (3.2.1-3) unstable; urgency=low
+
+  * Change section of gir1.2-nautilus-3.0 to introspection.
+  * Build against tracker 0.14.
+
+ -- Michael Biebl <[e-mail]>  Wed, 14 Mar 2012 19:09:16 +0100
+
+nautilus (3.2.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/control.in:
+    - Drop Build-Depends on libdbus-glib-1-dev, no longer required.
+    - Drop Recommends on desktop-base. It was originally added when nautilus
+      was patched to show the .desktop icons from the desktop-base package. We
+      don't do that anymore, so the Recommends has become obsolete.
+    - Drop Recommends on consolekit. The ConsoleKit specific functionality has
+      been moved into gnome-settings-daemon.
+    - Drop Recommends on synaptic and app-install-data. We no longer call
+      synaptic for mimetypes without a handler as this functionality is
+      provided by alternatives like PackageKit or sessioninstaller now.
+    - Update Vcs-* URLs.
+  * debian/nautilus-data.gconf-defaults:
+    - Removed, obsolete.
+  * Refresh patches.
+
+ -- Michael Biebl <[e-mail]>  Mon, 21 Nov 2011 20:52:38 +0100
+
+nautilus (3.2.1-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/patches/13_tracker.patch: Updated
+  * debian/control.in: Update build-dependencies
+  * debian/control.in, debian/rules: enable the tracker sarch backend
+  * debian/control.in: Recommend sushi
+
+ -- Sjoerd Simons <[e-mail]>  Sun, 06 Nov 2011 13:51:59 +0000
+
+nautilus (3.0.2-4) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Michael Biebl <[e-mail]>  Thu, 13 Oct 2011 18:00:54 +0200
+
+nautilus (3.0.2-3) experimental; urgency=low
+
+  * debian/control.in:
+    - Add Breaks against nautilus-sendto-empathy (<< 3.0) and
+      gnome-bluetooth (<< 3.0) as the libnautilus-sendto extension was moved
+      into nautilus 3 but the plugin path was not changed with the switch to
+      GTK 3. Loading both GTK 2 and GTK 3 in the same process is not allowed.
+    - Bump Standards-Version to 3.9.2. No further changes.
+    - Bump Build-Depends on cdbs to (>= 0.4.90) to ensure dh_girepository is
+      called.
+    - Remove old Conflicts and Replaces.
+  * debian/rules:
+    - Remove clean-la.mk since we don't install any .la files.
+    - Drop call to dh_girepository
+  * Bump debhelper compatibility level to 8.
+    - Strip debian/tmp/ from .install files.
+    - Bump Build-Depends on debhelper.
+  * debian/watch:
+    - Update to version 3.
+    - Track .xz tarballs.
+  * debian/nautilus.install:
+    - Install dbus service file for nautilus.
+  * debian/patches/13_tracker.patch:
+    - Add support for tracker 0.12. Closes: #643946
+    - Enable full text search.
+
+ -- Michael Biebl <[e-mail]>  Tue, 11 Oct 2011 17:49:58 +0200
+
+nautilus (3.0.2-2) experimental; urgency=low
+
+  * Rename libnautilus-extension1 to libnautilus-extension1a, and add 
+    appropriate Replaces/Conflicts. Closes: #627361.
+
+ -- Josselin Mouette <[e-mail]>  Tue, 31 May 2011 23:39:28 +0200
+
+nautilus (3.0.2-1) experimental; urgency=low
+
+  * Rebuild against a cdbs+debhelper with dh_installgsettings.
+    Closes: #627477.
+  * libnautilus-extension1 breaks nautilus (< 3.0) and that’s the 
+    beginning of a very long list (nautilus transition).
+    + gnome-disk-utility < 3.0
+    + brasero < 2.91
+    + file-roller < 3.0
+    + nautilus-sendto < 3
+  * Replace nautilus-sendto since it is now included in nautilus.
+  * New upstream translation and bugfix release.
+  * 00_do_not_require_unpackage_libexif.patch: dropped, we have the 
+    latest libexif now.
+    + Bump build-dependencies accordingly.
+  * Bump libnotify requirement.
+  * Reintroduce some nautilus 2.x patches.
+    + 03_deprecated.patch: still necessary, refreshed.
+    + 12_list-view_expand.patch: still necessary, file was renamed, 
+      refreshed. Update to GTK+ 3.
+  * nautilus.install: install the autostart file. This should bring back 
+    the desktop icons functionality completely.
+
+ -- Josselin Mouette <[e-mail]>  Tue, 31 May 2011 19:30:35 +0200
+
+nautilus (3.0.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in:
+    + bump relevant build dependencies.
+  * debian/patches/00_do_not_require_unpackage_libexif.patch: new,
+    dependencies were bumped upstream, to require the latest stable versions;
+    but libexif 0.6.20 not yet in Debian, and not necessary.
+
+ -- Frederic Peters <[e-mail]>  Fri, 15 Apr 2011 15:38:08 +0200
+
+nautilus (2.91.94-1) experimental; urgency=low
+
+  * New upstream release.
+
+  [ Josselin Mouette ]
+  * Make the -dev package depend on the gir package.
+
+ -- Frederic Peters <[e-mail]>  Thu, 31 Mar 2011 09:52:17 +0530
+
+nautilus (2.91.93-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in: bumped build-dependency on gtk+
+  * debian/copyright: updated the list of copyright holders from the sources.
+
+ -- Frederic Peters <[e-mail]>  Sun, 27 Mar 2011 18:51:51 +0530
+
+nautilus (2.91.90.1-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Frederic Peters <[e-mail]>  Tue, 22 Feb 2011 23:43:00 +0100
+
+nautilus (2.91.9-1) experimental; urgency=low
+
+  * New upstream release.
+    + debian/control.in:
+      - Update the build dependencies.
+      - Update the gtk+ 3 and libgail 3 package names.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sat, 19 Feb 2011 14:27:11 +0000
+
+nautilus (2.91.7-1) experimental; urgency=low
+
+  * New upstream release.
+    + debian/control.in:
+      - Update build dependencies.
+    + debian/patches/10_load_session.patch:
+      - Removed, that code is gone.
+    + debian/patches/30-fix-compilation.patch:
+      - Removed, included upstream.
+  * debian/po-up,
+    debian/rules:
+    + Removed patch-translations support, we have no patches with
+      strings anymore (actually we have no patches at all!).
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Wed, 12 Jan 2011 22:47:23 +0000
+
+nautilus (2.91.4-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/patches/20-rename-extensions-directory.patch
+    + Removed, fixed upstream
+  * debian/control.in: Add Conflicts/Replaces to gir1.0-nautilus-3.0
+
+ -- Sjoerd Simons <[e-mail]>  Sat, 18 Dec 2010 19:18:03 +0000
+
+nautilus (2.91.3-2) experimental; urgency=low
+
+  * Update to the new gir policy:
+    - Rename gir1.0-nautilus-3.0 to gir1.2-nautilus-3.0.
+    - Bump the gobject-introspection build dependency.
+  * Switch to source format 3.0 (quilt).
+  * debian/control.in,
+    debian/rules:
+    - Call dh_girepository and let the gir package depend
+      on gir:Depends, to get gir dependencies. Build depend
+      on the necessary gir1.2 packages for that.
+    - Exclude the extensions folder from the dh_makeshlibs call.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Sun, 12 Dec 2010 20:13:10 +0100
+
+nautilus (2.91.3-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control: Add Gsettings schemas to nautilus-data
+  * debian/control: Add gir1.0-nautilus-3.0
+  * debian/control: Add the nautilus gir to libnautilus-extension-dev.install
+  * debian/patches/13_shortcuts.patch
+    - Removed, Fixed upstream
+  * debian/patches/20_open-with_install.patch
+    - Removed, open with is now handled by GtkAppChooser
+  * debian/patches/03_deprecated.patch
+    - Removed, no longer relevant
+  * debian/patches/12_list-view_expand.patch
+    - Removed, no longer applies
+  * debian/patches/10_location_titlebar.patch
+    - Removed, not relevant anymore as there is a crumtrail
+  * debian/patches/14_dont_show_umount.patch
+    - Removed, fixed upstream.
+  * debian/patches/30-fix-compilation.patch
+    - Added, fix complications with --as-needed
+  * debian/patches/20-rename-extensions-directory.patch
+    - Added, rename the extensions dir to not clash with older nautilus
+      extensions. From upstream git.
+  * debian/rules: Add list-missing and autoreconf
+  * debian/patches/99_ltmain_as-needed.patch
+    - Removed as we use dh_autoreconf now
+  * debian/patches/90_relibtoolize.patch
+    - Removed as we use dh_autoreconf now
+  * debian/control.in: Add gobject-introspection to the build-depends
+  * debian/rules: Force gobject-introspection support to build
+  * debian/control.in: libgirepository1.0-dev (>= 0.9.12)
+  * debian/nautilus.install: Don't install .la for extensions
+
+ -- Sjoerd Simons <[e-mail]>  Sat, 11 Dec 2010 15:48:26 +0000
+
+nautilus (2.30.1-3) unstable; urgency=low
+
+  * 15_nautilus_file_peek_crash.patch: stolen from upstream git. Fix a 
+    crasher with lots of upstream duplicates from squeeze systems.
+
+ -- Josselin Mouette <[e-mail]>  Sun, 27 Feb 2011 12:50:09 +0100
+
+nautilus (2.30.1-2) unstable; urgency=low
+
+  * Drop type-handling usage. Closes: #587872.
+  * Bump standards version accordingly.
+  * 13_shortcuts.patch: stolen from upstream git. Fix an annoying bug 
+    that makes a number of keyboard shortcuts inoperant the first time.
+    Closes: #592016.
+  * 14_dont_show_umount.patch: stolen from upstream git. Don’t show both 
+    “unmount” and “safe removal”/“eject” entries. Closes: #564859.
+
+ -- Josselin Mouette <[e-mail]>  Sat, 18 Sep 2010 14:31:36 +0200
+
+nautilus (2.30.1-1) unstable; urgency=low
+
+  * Bump shlibs for libnautilus-extension1. Closes: #577856.
+  * New upstream release.
+  * 02_eel_libadd.patch, 04_tracker_0.8.patch: dropped, merged upstream. 
+  * 90_relibtoolize.patch: updated for the new version.
+
+ -- Josselin Mouette <[e-mail]>  Tue, 27 Apr 2010 19:06:00 +0200
+
+nautilus (2.30.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in
+    - Drop libbeagle-dev and libtrackerclient-dev from Build-Depends.
+      Nautilus uses dlopen now to access those search engines.
+    - Bump libglib2.0-dev to (>= 2.24.0).
+    - Bump libgnome-desktop-dev to (>= 2.29.91).
+    - Bump libgtk2.0-dev to (>= 2.20.0).
+    - Bump Standards-Version to 3.8.4. No further changes.
+  * debian/patches/01_manpage.patch
+    - Remove, merged upstream.
+  * debian/patches/04_tracker_0.8.patch
+    - Add support for tracker 0.8 and fix filtering by location.
+      Patch pulled from upstream Git.
+  * debian/patches/90_relibtoolize.patch
+    - Update build system for new upstream release.
+  * Refresh patches to apply cleanly.
+
+ -- Michael Biebl <[e-mail]>  Wed, 14 Apr 2010 23:30:34 +0200
+
+nautilus (2.28.4-2) unstable; urgency=low
+
+  * 03_deprecated.patch: new patch. Don’t use -D*DISABLE_DEPRECATED for 
+    a production build, it often FTBFS. Closes: #576977.
+  * 90_relibtoolize.patch: updated accordingly.
+
+ -- Josselin Mouette <[e-mail]>  Fri, 09 Apr 2010 02:00:34 +0200
+
+nautilus (2.28.4-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * Regenerate relibtoolize patch to apply.
+
+ -- Andreas Henriksson <[e-mail]>  Tue, 15 Dec 2009 14:28:56 +0100
+
+nautilus (2.28.3-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Drop n-c-b from Recommends.
+
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/20_open-with_install.patch:
+    - Add description.
+  * debian/watch:
+    - Don't uupdate.
+  * New upstream bugfix release.
+    - debian/patches/12_list-view_expand.patch,
+      debian/patches/20_open-with_install.patch,
+      debian/patches/90_relibtoolize.patch:
+      + Refreshed.
+  * debian/patches/01_manpage.patch,
+    debian/patches/02_eel_libadd.patch:
+    - Forwarded, add headers.
+
+ -- Emilio Pozuelo Monfort <[e-mail]>  Mon, 14 Dec 2009 21:01:11 +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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Sat, 12 Jul 2008 19:17:54 +0200
+
+nautilus (2.22.4-1) experimental; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Sebastian Dröge <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>
+    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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Mon, 24 Apr 2006 19:45:51 +0200
+
+nautilus (2.12.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Josselin Mouette <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Fri, 14 Oct 2005 11:24:06 +0200
+
+nautilus (2.10.1-4) unstable; urgency=medium
+  
+  [ Sebastien Bacher <[e-mail]> ]
+  * 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 <[e-mail]> ]
+  * 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 <[e-mail]>  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 <[e-mail]>  Sat, 25 Jun 2005 18:03:04 +0200
+
+nautilus (2.10.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Sebastien Bacher <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>.
+
+ -- Sebastien Bacher <[e-mail]>  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 <[e-mail]>  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) <[e-mail]>  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 <[e-mail]>  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) <[e-mail]>  Thu,  5 Feb 2004 21:50:27 +0100
+
+nautilus (2.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Fri, 13 Jun 2003 14:54:56 +0900
+
+nautilus (2.2.3.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  Thu, 10 Apr 2003 11:35:38 +0900
+
+nautilus (2.2.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Fri, 14 Mar 2003 16:34:45 +0900
+
+nautilus (2.2.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Thu, 13 Feb 2003 01:58:08 +0900
+
+nautilus (2.2.0.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Fri, 31 Jan 2003 11:06:34 +0900
+
+nautilus (2.2.0.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  Thu, 23 Jan 2003 23:38:27 +0900
+
+nautilus (2.2.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Fri, 15 Nov 2002 15:26:15 +0900
+
+nautilus (2.0.7-4) unstable; urgency=low
+
+  * upload into unstable/main
+
+ -- Takuo KITAME <[e-mail]>  Wed, 13 Nov 2002 09:49:33 +0900
+
+nautilus (2.0.7-3) experimental; urgency=low
+
+  * Change package name to nautilus
+
+ -- Takuo KITAME <[e-mail]>  Fri,  8 Nov 2002 16:09:34 +0900
+
+nautilus2 (2.0.7-2) unstable; urgency=low
+
+  * Replaces: nautilus (closes: #166074)
+
+ -- Takuo KITAME <[e-mail]>  Tue,  5 Nov 2002 16:31:22 +0900
+
+nautilus2 (2.0.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Wed, 18 Sep 2002 15:23:25 +0900
+
+nautilus2 (2.0.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Mon, 19 Aug 2002 14:45:22 +0900
+
+nautilus2 (2.0.4-1) unstable; urgency=low
+
+  * New upsream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Wed,  3 Jul 2002 12:00:40 +0900
+
+nautilus2 (2.0.0-2) experimental; urgency=low
+
+  * build against librsvg2-2
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  Thu, 13 Jun 2002 03:21:57 +0900
+
+nautilus1.1 (1.1.19-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Wed,  5 Jun 2002 11:35:23 +0900
+
+nautilus1.1 (1.1.18-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  Tue, 21 May 2002 14:26:45 +0900
+
+nautilus1.1 (1.1.17-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  Tue, 14 May 2002 10:30:51 +0900
+
+nautilus1.1 (1.1.15-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  Mon, 29 Apr 2002 23:48:00 +0900
+
+nautilus1.1 (1.1.13-1) experimental; urgency=low
+
+  * New upstream release
+  * use dbs
+
+ -- Takuo KITAME <[e-mail]>  Mon, 22 Apr 2002 20:22:44 +0900
+
+nautilus1.1 (1.1.12-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Sat, 20 Apr 2002 01:23:25 +0900
+
+nautilus1.1 (1.1.11-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Tue, 26 Mar 2002 10:09:56 +0900
+
+nautilus1.1 (1.1.9-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  Fri,  8 Mar 2002 14:55:21 +0900
+
+nautilus1.1 (1.1.8-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Thu,  7 Mar 2002 11:29:37 +0900
+
+nautilus1.1 (1.1.6-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Sun, 17 Feb 2002 14:40:17 +0900
+
+nautilus1.1 (1.1.4-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Wed,  6 Feb 2002 03:01:38 +0900
+
+nautilus1.1 (1.1.3-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Mon,  4 Feb 2002 00:42:38 +0900
+
+nautilus1.1 (1.1.2-2) experimental; urgency=low
+
+  * Build against latest libatk9
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue,  8 Jan 2002 02:19:45 +0900
+
+nautilus (1.0.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 28 Nov 2000 01:37:10 +0900
+
+nautilus (0.5-2) unstable; urgency=low
+
+  * --enable-mozilla-component
+
+ -- Takuo KITAME <[e-mail]>  Wed,  8 Nov 2000 12:57:18 +0900
+
+nautilus (0.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <[e-mail]>  Wed,  8 Nov 2000 10:38:37 +0900
+
+nautilus (0.1.0-1) experimental; urgency=low
+
+  * Initial Release.
+
+ -- Takuo KITAME <[e-mail]>  Thu, 17 Aug 2000 12:51:38 +0900
+
+
 
=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2016-08-01 08:30:30 +0000
@@ -0,0 +1,1 @@
+8
 
=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2016-08-01 08:30:30 +0000
@@ -0,0 +1,158 @@
+# 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 <[e-mail]>
+XSBC-Original-Maintainer: Josselin Mouette <[e-mail]>
+Uploaders: Debian GNOME Maintainers <[e-mail]>
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
+               dh-migrations,
+               cdbs (>= 0.4.90),
+               gnome-pkg-tools (>= 0.19.4ubuntu1),
+               libglib2.0-dev (>= 2.35.3),
+               libatk1.0-dev (>= 1.32.0),
+               libgtk-3-dev (>= 3.13.2),
+               libgail-3-dev,
+               libgnome-desktop-3-dev (>= 3.0.0),
+               libtracker-sparql-1.0-dev,
+               libxml2-dev (>= 2.7.8),
+               libexif-dev (>= 0.6.20),
+               libexempi-dev (>= 2.1.0),
+               libnotify-dev (>= 0.7.0),
+               intltool (>= 0.40.1),
+               gtk-doc-tools (>= 1.4),
+               libxt-dev,
+               libx11-dev,
+               libselinux1-dev [linux-any],
+               libxrender-dev,
+               libxext-dev,
+               x11proto-core-dev,
+               shared-mime-info (>= 0.50),
+               gobject-introspection (>= 0.9.12-4~),
+               gsettings-desktop-schemas (>= 3.8.0),
+               libgirepository1.0-dev (>= 0.9.12),
+               libglib2.0-doc,
+               libgtk-3-doc,
+               libunity-dev (>= 5.0.0),
+               libzeitgeist-2.0-dev,
+Homepage: http://www.gnome.org/projects/nautilus/
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu
+Standards-Version: 3.9.6
+
+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,
+         gsettings-desktop-schemas (>= 3.8.0)
+Recommends: librsvg2-common,
+            gvfs-backends,
+Suggests: brasero (>= 2.26),
+          eog,
+          evince | pdf-viewer,
+          totem | mp3-decoder,
+          xdg-user-dirs,
+          tracker,
+          gnome-sushi,
+Breaks: gnome-volume-manager (<< 2.24),
+        rhythmbox (<< 0.12),
+        gnome-session (<< 2.28),
+        nautilus-sendto-empathy (<< 3.0),
+        gnome-bluetooth (<< 3.0)
+Replaces: nautilus-sendto, nautilus-data (<< 1:3.18.1-1ubuntu1)
+Description: file manager and graphical shell for GNOME
+ Nautilus is the official file manager for the GNOME desktop. It allows
+ one 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
+ one 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-extension1a
+Architecture: any
+Multi-Arch: same
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libnautilus-extension1
+Replaces: libnautilus-extension1
+Breaks: nautilus (<< 1:3.0)
+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
+Multi-Arch: same
+Section: libdevel
+Depends: libnautilus-extension1a (= ${binary:Version}),
+         gir1.2-nautilus-3.0 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.35.3),
+         libgtk-3-dev (>= 3.13.2),
+         ${shlibs:Depends},
+         ${misc:Depends}
+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: gir1.2-nautilus-3.0
+Architecture: any
+Multi-Arch: same
+Section: introspection
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Conflicts: gir1.0-nautilus-3.0
+Replaces: gir1.0-nautilus-3.0
+Description: libraries for nautilus components - gir bindings
+ Nautilus is the official file manager and graphical shell for the
+ GNOME desktop.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
+
+Package: nautilus-data
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: 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	2016-08-01 08:30:30 +0000
@@ -0,0 +1,154 @@
+Source: nautilus
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <[e-mail]>
+XSBC-Original-Maintainer: Josselin Mouette <[e-mail]>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
+               dh-migrations,
+               cdbs (>= 0.4.90),
+               gnome-pkg-tools (>= 0.19.4ubuntu1),
+               libglib2.0-dev (>= 2.35.3),
+               libatk1.0-dev (>= 1.32.0),
+               libgtk-3-dev (>= 3.13.2),
+               libgail-3-dev,
+               libgnome-desktop-3-dev (>= 3.0.0),
+               libtracker-sparql-1.0-dev,
+               libxml2-dev (>= 2.7.8),
+               libexif-dev (>= 0.6.20),
+               libexempi-dev (>= 2.1.0),
+               libnotify-dev (>= 0.7.0),
+               intltool (>= 0.40.1),
+               gtk-doc-tools (>= 1.4),
+               libxt-dev,
+               libx11-dev,
+               libselinux1-dev [linux-any],
+               libxrender-dev,
+               libxext-dev,
+               x11proto-core-dev,
+               shared-mime-info (>= 0.50),
+               gobject-introspection (>= 0.9.12-4~),
+               gsettings-desktop-schemas (>= 3.8.0),
+               libgirepository1.0-dev (>= 0.9.12),
+               libglib2.0-doc,
+               libgtk-3-doc,
+               libunity-dev (>= 5.0.0),
+               libzeitgeist-2.0-dev,
+Homepage: http://www.gnome.org/projects/nautilus/
+Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu
+Standards-Version: 3.9.6
+
+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,
+         gsettings-desktop-schemas (>= 3.8.0)
+Recommends: librsvg2-common,
+            gvfs-backends,
+Suggests: brasero (>= 2.26),
+          eog,
+          evince | pdf-viewer,
+          totem | mp3-decoder,
+          xdg-user-dirs,
+          tracker,
+          gnome-sushi,
+Breaks: gnome-volume-manager (<< 2.24),
+        rhythmbox (<< 0.12),
+        gnome-session (<< 2.28),
+        nautilus-sendto-empathy (<< 3.0),
+        gnome-bluetooth (<< 3.0)
+Replaces: nautilus-sendto, nautilus-data (<< 1:3.18.1-1ubuntu1)
+Description: file manager and graphical shell for GNOME
+ Nautilus is the official file manager for the GNOME desktop. It allows
+ one 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
+ one 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-extension1a
+Architecture: any
+Multi-Arch: same
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Conflicts: libnautilus-extension1
+Replaces: libnautilus-extension1
+Breaks: nautilus (<< 1:3.0)
+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
+Multi-Arch: same
+Section: libdevel
+Depends: libnautilus-extension1a (= ${binary:Version}),
+         gir1.2-nautilus-3.0 (= ${binary:Version}),
+         libglib2.0-dev (>= 2.35.3),
+         libgtk-3-dev (>= 3.13.2),
+         ${shlibs:Depends},
+         ${misc:Depends}
+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: gir1.2-nautilus-3.0
+Architecture: any
+Multi-Arch: same
+Section: introspection
+Depends: ${gir:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Conflicts: gir1.0-nautilus-3.0
+Replaces: gir1.0-nautilus-3.0
+Description: libraries for nautilus components - gir bindings
+ Nautilus is the official file manager and graphical shell for the
+ GNOME desktop.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings.
+
+Package: nautilus-data
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: 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	2016-08-01 08:30:30 +0000
@@ -0,0 +1,51 @@
+This package was debianized by Takuo KITAME <[e-mail]> 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:
+  Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+  Copyright (C) 1997-2000, 2008 Free Software Foundation, Inc.
+  Copyright (C) 1999, 2000, 2001 Eazel, Inc.
+  Copyright (C) 1999, 2000, 2003, 2004 Red Hat, Inc.
+  Copyright (C) 2001, 2002 Anders Carlsson
+  Copyright (C) 2001 Maciej Stachowiak
+  Copyright (C) 2002, 2004 James Willcox
+  Copyright (C) 2002 Bent Spoon Software
+  Copyright (C) 2002 Christophe Fergeau
+  Copyright (C) 2002 Darin Adler
+  Copyright (C) 2002 Jan Arne Petersen
+  Copyright (C) 2002 Sun Microsystems, Inc.
+  Copyright (C) 2003, 2004, 2005 Christian Persch
+  Copyright (C) 2003, 2004 Marco Pesenti Gritti
+  Copyright (C) 2005 Jamie McCracken
+  Copyright (C) 2005 Raffaele Sandrini
+  Copyright (C) 2005 Roberto Majadas
+  Copyright (C) 2005 Vincent Untz
+  Copyright (C) 2006 Paolo Borelli
+  Copyright (C) 2006 Zbigniew Chyla
+  Copyright (C) 2007 Collabora Ltd.
+  Copyright (C) 2007 Martin Wehner
+  Copyright (C) 2007 Nokia Corporation
+  Copyright (C) 2008-2010 Cosimo Cecchi
+  Copyright (C) 2009 Alexander Larsson
+  Copyright (C) 2011 Ignacio Casal Quinteiro
+
+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/gir1.2-nautilus-3.0.install'
--- debian/gir1.2-nautilus-3.0.install	1970-01-01 00:00:00 +0000
+++ debian/gir1.2-nautilus-3.0.install	2016-08-01 08:30:30 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/girepository-1.0/Nautilus-3.0.typelib
 
=== added file 'debian/libnautilus-extension-dev.install'
--- debian/libnautilus-extension-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libnautilus-extension-dev.install	2016-08-01 08:30:30 +0000
@@ -0,0 +1,5 @@
+usr/lib/*/libnautilus-extension*.so
+usr/include
+usr/lib/*/pkgconfig
+usr/share/gir-1.0/Nautilus-3.0.gir
+usr/share/gtk-doc
 
=== added file 'debian/libnautilus-extension1a.install'
--- debian/libnautilus-extension1a.install	1970-01-01 00:00:00 +0000
+++ debian/libnautilus-extension1a.install	2016-08-01 08:30:30 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libnautilus-extension*.so.*
 
=== added file 'debian/mount-archive.desktop'
--- debian/mount-archive.desktop	1970-01-01 00:00:00 +0000
+++ debian/mount-archive.desktop	2016-08-01 08:30:30 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+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	2016-08-01 08:30:30 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_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.install'
--- debian/nautilus-data.install	1970-01-01 00:00:00 +0000
+++ debian/nautilus-data.install	2016-08-01 08:30:30 +0000
@@ -0,0 +1,5 @@
+usr/share/gnome-shell
+usr/share/locale
+usr/share/GConf
+usr/share/glib-2.0/schemas/org.gnome.nautilus.gschema.xml
+debian/source_nautilus.py /usr/share/apport/package-hooks
 
=== added file 'debian/nautilus-folder-handler.desktop'
--- debian/nautilus-folder-handler.desktop	1970-01-01 00:00:00 +0000
+++ debian/nautilus-folder-handler.desktop	2016-08-01 08:30:30 +0000
@@ -0,0 +1,126 @@
+[Desktop Entry]
+Name=Files
+Name[ar]=الملفات
+Name[as]=নথিপত্ৰসমূহ
+Name[be]=Файлы
+Name[bg]=Файлове
+Name[bn]=ফাইল
+Name[ca]=Fitxers
+Name[ca@valencia]=Fitxers
+Name[cs]=Soubory
+Name[da]=Filer
+Name[de]=Dateien
+Name[en_GB]=Files
+Name[eo]=Dosieroj
+Name[es]=Archivos
+Name[et]=Failid
+Name[eu]=Fitxategiak
+Name[fa]=پرونده‌ها
+Name[fi]=Tiedostot
+Name[fr]=Fichiers
+Name[ga]=Comhaid
+Name[gl]=Ficheiros
+Name[gu]=ફાઇલો
+Name[he]=קבצים
+Name[hu]=Fájlok
+Name[id]=Berkas
+Name[it]=File
+Name[ja]=ファイル
+Name[kn]=ಕಡತಗಳು
+Name[ko]=파일
+Name[lt]=Failai
+Name[lv]=Faili
+Name[mr]=फाइल्स्
+Name[nb]=Filer
+Name[nl]=Bestanden
+Name[nn]=Filer
+Name[or]=ଫାଇଲଗୁଡିକ
+Name[pa]=ਫਾਇਲਾਂ
+Name[pl]=Pliki
+Name[pt]=Ficheiros
+Name[pt_BR]=Arquivos
+Name[ro]=Fișiere
+Name[ru]=Файлы
+Name[sk]=Súbory
+Name[sl]=Datoteke
+Name[sr]=Датотеке
+Name[sr@latin]=Datoteke
+Name[sv]=Filer
+Name[ta]=கோப்புகள்
+Name[te]=ఫైళ్ళు
+Name[th]=แฟ้ม
+Name[tr]=Dosyalar
+Name[ug]=ھۆججەتلەر
+Name[uk]=Файли
+Name[vi]=Tập tin
+Name[zh_CN]=文件
+Name[zh_HK]=檔案
+Name[zh_TW]=檔案
+Comment=Access and organize files
+Comment[ar]=نظم الملفات و صِل إليها
+Comment[as]=প্ৰবেশাধিকাৰ লওক আৰু নথিপত্ৰসমূহ আয়োজিত কৰক
+Comment[be]=Доступ і кіраванне файламі
+Comment[bg]=Достъп и управление на файлове
+Comment[bn]=ফাইলে ব্যবাহর এবং সাজানো
+Comment[ca]=Organitzeu i accediu a fitxers
+Comment[ca@valencia]=Organitzeu i accediu a fitxers
+Comment[cs]=Přístup a organizace souborů
+Comment[da]=Tilgå og organisér filer
+Comment[de]=Auf Dateien zugreifen und diese organisieren
+Comment[en_GB]=Access and organise files
+Comment[es]=Acceder a los archivos y organizarlos
+Comment[et]=Ligipääs failidele ning failipuu korrastamine
+Comment[eu]=Atzitu eta antolatu fitxategiak
+Comment[fa]=دسترسی و سازماندهی پرونده‌ها
+Comment[fi]=Avaa ja järjestä tiedostoja
+Comment[fr]=Accéder aux fichiers et les organiser
+Comment[gl]=Acceda e organice ficheiros
+Comment[gu]=ફાઇલોને વાપરો અને સંચાલિત કરો
+Comment[he]=גישה לקבצים וארגונם
+Comment[hu]=Fájlok elérése és rendszerezése
+Comment[id]=Mengakses dan mengelola berkas
+Comment[it]=Accede ai file e li organizza
+Comment[ja]=ファイルの操作や整理をします
+Comment[kn]=ಕಡತಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಿ ಹಾಗು ವ್ಯವಸ್ಥಿತವಾಗಿ ಜೋಡಿಸಿ
+Comment[ko]=파일 접근 및 정리
+Comment[lt]= 
+Comment[lv]=Piekļūt un organizēt failus
+Comment[mr]=फाइल्स्ला प्रवेश द्वया व संघटित करा
+Comment[nb]=Aksesser og organiser filer
+Comment[nl]=Bestanden gebruiken en organiseren
+Comment[nn]=Aksesser og organiser filer
+Comment[or]=ଫାଇଲମାନଙ୍କୁ ଅଭିଗମ କରନ୍ତୁ ଏବଂ ସଙ୍ଗଠନ କରନ୍ତୁ
+Comment[pa]=ਫਾਇਲਾਂ ਦੀ ਵਰਤੋਂ ਤੇ ਪਰਬੰਧ
+Comment[pl]=Organizowanie plików
+Comment[pt]=Aceder e organizar ficheiros
+Comment[pt_BR]=Acessar e organizar arquivos
+Comment[ro]=Accesați și organizați fișiere
+Comment[ru]=Управление и доступ к файлам
+Comment[sk]=Prístup a organizácia súborov
+Comment[sl]=Dostop in razvrščanje datotek
+Comment[sr]=Приступите и организујте датотеке
+Comment[sr@latin]=Pristupite i organizujte datoteke
+Comment[sv]=Kom åt och organisera filer
+Comment[ta]=கோப்புகளை அணுகு மற்றும் ஒழுங்கு படுத்து
+Comment[te]=ఫైళ్ళను నిర్వహించు మరియు వాడుకొను
+Comment[th]=เข้าถึงและจัดระเบียบแฟ้ม
+Comment[tr]=Dosyalara erişin ve düzenleyin
+Comment[ug]=ھۆججەتلەرنى تەشكىللەش ۋە زىيارەت
+Comment[uk]=Доступ до файлів
+Comment[vi]=Truy cập và tổ chức tập tin
+Comment[zh_CN]=访问和组织文件
+Comment[zh_HK]=存取與組織檔案
+Comment[zh_TW]=存取與組織檔案
+Exec=nautilus --new-window %U
+Icon=system-file-manager
+Terminal=false
+NoDisplay=true
+Type=Application
+StartupNotify=true
+OnlyShowIn=GNOME;Unity;
+Categories=GNOME;GTK;Utility;Core;
+MimeType=inode/directory;application/x-gnome-saved-search;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=nautilus
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.2.1
 
=== added file 'debian/nautilus-home.desktop'
--- debian/nautilus-home.desktop	1970-01-01 00:00:00 +0000
+++ debian/nautilus-home.desktop	2016-08-01 08:30:30 +0000
@@ -0,0 +1,22 @@
+[Desktop Entry]
+Name=Home Folder
+Comment=Open your personal folder
+Exec=nautilus --new-window %U
+Icon=folder
+Terminal=false
+StartupNotify=true
+Type=Application
+OnlyShowIn=GNOME;Unity;
+Categories=GNOME;GTK;Core;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=nautilus
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.0.0
+X-Ubuntu-Gettext-Domain=nautilus
+Actions=Window;
+NoDisplay=true
+
+[Desktop Action Window]
+Name=Open a New Window
+Exec=nautilus --new-window
+OnlyShowIn=Unity;
 
=== added file 'debian/nautilus-home.desktop.in'
--- debian/nautilus-home.desktop.in	1970-01-01 00:00:00 +0000
+++ debian/nautilus-home.desktop.in	2016-08-01 08:30:30 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Home Folder
+_Comment=Open your personal folder
+Actions=Window;
+NoDisplay=true
+
+[Desktop Action Window]
+_Name=Open a New Window
+Exec=nautilus --new-window
+OnlyShowIn=Unity;
 
=== added file 'debian/nautilus-unity-launcher-icon.py'
--- debian/nautilus-unity-launcher-icon.py	1970-01-01 00:00:00 +0000
+++ debian/nautilus-unity-launcher-icon.py	2016-08-01 08:30:30 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+# Copyright (C) 2013 Canonical
+
+from gi.repository import Gio
+import os,sys
+
+if "com.canonical.Unity.Launcher" not in Gio.Settings.list_schemas():
+    print("No unity schemas found, no migration needed")
+    sys.exit(0)
+
+gsettings=Gio.Settings(schema="com.canonical.Unity.Launcher", path="/com/canonical/unity/launcher/")
+launcher_list = gsettings.get_strv("favorites")
+
+# Unity used nautilus-home.desktop but we are migrating to use the standard nautilus.desktop instead
+try:
+    idx=launcher_list.index("application://nautilus.desktop")
+    launcher_list[idx]="application://org.gnome.Nautilus.desktop"
+except ValueError:
+    pass
+# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
+from subprocess import Popen, PIPE, STDOUT
+p = Popen(['dconf', 'load', '/com/canonical/unity/launcher/'], stdout=PIPE, stdin=PIPE, stderr=STDOUT)
+p.communicate(input="[/]\nfavorites={}".format(launcher_list).encode('utf-8'))
 
=== added file 'debian/nautilus.install'
--- debian/nautilus.install	1970-01-01 00:00:00 +0000
+++ debian/nautilus.install	2016-08-01 08:30:30 +0000
@@ -0,0 +1,12 @@
+debian/nautilus-home.desktop usr/share/applications
+debian/mount-archive.desktop usr/share/applications
+debian/nautilus-folder-handler.desktop usr/share/applications
+usr/bin
+usr/lib/nautilus/nautilus-convert-metadata
+usr/lib/nautilus/extensions-3.0/*.so
+usr/share/appdata
+usr/share/applications
+usr/share/dbus-1
+usr/share/man
+etc/xdg/autostart
+
 
=== added file 'debian/nautilus.migrations'
--- debian/nautilus.migrations	1970-01-01 00:00:00 +0000
+++ debian/nautilus.migrations	2016-08-01 08:30:30 +0000
@@ -0,0 +1,1 @@
+debian/nautilus-unity-launcher-icon.py
 
=== added file 'debian/nautilus.postrm'
--- debian/nautilus.postrm	1970-01-01 00:00:00 +0000
+++ debian/nautilus.postrm	2016-08-01 08:30:30 +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 directory 'debian/patches'
=== added file 'debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch'
--- debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch	2016-08-01 08:30:30 +0000
@@ -0,0 +1,2410 @@
+From d4cd0806f62422fd54e6a77f9c8767388bcb4200 Mon Sep 17 00:00:00 2001
+From: Iain Lane <[e-mail]>
+Date: Mon, 24 Nov 2014 10:43:18 +0000
+Subject: [PATCH 1/2] Respect gtk-dialogs-use-header for all dialogs
+
+https://bugzilla.gnome.org/show_bug.cgi?id=740617
+---
+ .../nautilus-file-conflict-dialog.c                |   10 +-
+ src/nautilus-connect-server-dialog.c               |   10 +-
+ src/nautilus-file-management-properties.c          |   25 +-
+ src/nautilus-file-management-properties.ui         | 1723 ++++++++++----------
+ src/nautilus-properties-window.c                   |   10 +-
+ 5 files changed, 899 insertions(+), 879 deletions(-)
+
+Index: b/libnautilus-private/nautilus-file-conflict-dialog.c
+===================================================================
+--- a/libnautilus-private/nautilus-file-conflict-dialog.c
++++ b/libnautilus-private/nautilus-file-conflict-dialog.c
+@@ -622,9 +622,17 @@
+ 				   GFile *dest_dir)
+ {
+ 	GtkWidget *dialog;
++	GtkSettings *settings;
++	gboolean use_header;
++
++	settings = gtk_settings_get_default ();
++
++	g_object_get (G_OBJECT (settings),
++				  "gtk-dialogs-use-header", &use_header,
++				  NULL);
+ 	
+ 	dialog = GTK_WIDGET (g_object_new (NAUTILUS_TYPE_FILE_CONFLICT_DIALOG,
+-					   "use-header-bar", TRUE,
++					   "use-header-bar", use_header,
+ 					   "modal", TRUE,
+ 					   "title", _("File conflict"),
+ 					   NULL));
+Index: b/src/nautilus-connect-server-dialog.c
+===================================================================
+--- a/src/nautilus-connect-server-dialog.c
++++ b/src/nautilus-connect-server-dialog.c
+@@ -699,9 +699,17 @@
+ nautilus_connect_server_dialog_new (NautilusWindow *window)
+ {
+ 	GtkWidget *dialog;
++	GtkSettings *settings;
++	gboolean use_header;
++
++	settings = gtk_settings_get_default ();
++
++	g_object_get (G_OBJECT (settings),
++				  "gtk-dialogs-use-header", &use_header,
++				  NULL);
+ 
+ 	dialog = gtk_widget_new (NAUTILUS_TYPE_CONNECT_SERVER_DIALOG,
+-				 "use-header-bar", TRUE,
++				 "use-header-bar", use_header,
+ 				 NULL);
+ 
+ 	if (window) {
+Index: b/src/nautilus-file-management-properties.c
+===================================================================
+--- a/src/nautilus-file-management-properties.c
++++ b/src/nautilus-file-management-properties.c
+@@ -151,7 +151,7 @@
+ 
+ 	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ 
+-	for (i = 0; i < items; i++) {	
++	for (i = 0; i < items; i++) {
+ 		item_name = g_strdup_printf ("%s_%d", prefix, i);
+ 		widget = GTK_WIDGET (gtk_builder_get_object (builder, item_name));
+ 		gtk_size_group_add_widget (size_group, widget);
+@@ -591,7 +591,16 @@
+ static  void
+ nautilus_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *window)
+ {
+-	GtkWidget *dialog;
++	GtkWidget *dialog, *vbox;
++	GtkContainer *content_area;
++	GtkSettings *settings;
++	gboolean use_header;
++
++	settings = gtk_settings_get_default ();
++
++	g_object_get (G_OBJECT (settings),
++				  "gtk-dialogs-use-header", &use_header,
++				  NULL);
+ 
+ 	/* setup UI */
+ 	nautilus_file_management_properties_size_group_create (builder,
+@@ -669,7 +678,17 @@
+ 	nautilus_file_management_properties_dialog_setup_list_column_page (builder);
+ 
+ 	/* UI callbacks */
+-	dialog = GTK_WIDGET (gtk_builder_get_object (builder, "file_management_dialog"));
++	dialog = gtk_widget_new (GTK_TYPE_DIALOG,
++				 "use-header-bar", use_header,
++				 "can-focus", FALSE,
++				 "window-position", GTK_WIN_POS_CENTER,
++				 "type-hint", GDK_WINDOW_TYPE_HINT_DIALOG,
++				 "title", _("Files Preferences"),
++				 NULL);
++	vbox = GTK_WIDGET (gtk_builder_get_object (builder, "dialog"));
++	content_area = GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
++	gtk_container_add (content_area, vbox);
++
+ 	g_signal_connect (dialog, "response",
+ 			  G_CALLBACK (gtk_widget_destroy),
+ 			  NULL);
+Index: b/src/nautilus-file-management-properties.ui
+===================================================================
+--- a/src/nautilus-file-management-properties.ui
++++ b/src/nautilus-file-management-properties.ui
+@@ -1,161 +1,88 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <interface>
+   <!-- interface-requires gtk+ 3.0 -->
+-  <object class="GtkDialog" id="file_management_dialog">
++  <object class="GtkBox" id="dialog">
++    <property name="visible">True</property>
+     <property name="can_focus">False</property>
++    <property name="orientation">vertical</property>
++    <property name="spacing">2</property>
+     <property name="border_width">0</property>
+-    <property name="window_position">center</property>
+-    <property name="type_hint">dialog</property>
+-    <property name="title" translatable="yes">Files Preferences</property>
+-    <property name="use_header_bar">1</property>
+-    <child internal-child="vbox">
+-      <object class="GtkBox" id="dialog-vbox1">
++    <child>
++      <object class="GtkNotebook" id="notebook1">
+         <property name="visible">True</property>
+-        <property name="can_focus">False</property>
+-        <property name="orientation">vertical</property>
+-        <property name="spacing">2</property>
++        <property name="can_focus">True</property>
+         <property name="border_width">0</property>
+-        <child internal-child="action_area">
+-          <object class="GtkButtonBox" id="dialog-action_area1">
+-            <property name="visible">False</property>
+-            <property name="can_focus">False</property>
+-            <property name="layout_style">end</property>
+-          </object>
+-          <packing>
+-            <property name="expand">False</property>
+-            <property name="fill">True</property>
+-            <property name="pack_type">end</property>
+-            <property name="position">0</property>
+-          </packing>
+-        </child>
++        <property name="show_border">False</property>
+         <child>
+-          <object class="GtkNotebook" id="notebook1">
++          <object class="GtkBox" id="vbox1">
+             <property name="visible">True</property>
+-            <property name="can_focus">True</property>
+-            <property name="border_width">0</property>
+-            <property name="show_border">False</property>
++            <property name="can_focus">False</property>
++            <property name="border_width">12</property>
++            <property name="orientation">vertical</property>
++            <property name="spacing">18</property>
+             <child>
+-              <object class="GtkBox" id="vbox1">
++              <object class="GtkBox" id="vbox2">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="border_width">12</property>
+                 <property name="orientation">vertical</property>
+-                <property name="spacing">18</property>
++                <property name="spacing">6</property>
+                 <child>
+-                  <object class="GtkBox" id="vbox2">
++                  <object class="GtkLabel" id="label4">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
+-                    <property name="spacing">6</property>
+-                    <child>
+-                      <object class="GtkLabel" id="label4">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">Default View</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Default View</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkAlignment" id="alignment2">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="left_padding">12</property>
+                     <child>
+-                      <object class="GtkAlignment" id="alignment2">
++                      <object class="GtkBox" id="vbox14">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
++                        <property name="orientation">vertical</property>
++                        <property name="spacing">6</property>
+                         <child>
+-                          <object class="GtkBox" id="vbox14">
++                          <object class="GtkBox" id="hbox34">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="orientation">vertical</property>
+-                            <property name="spacing">6</property>
++                            <property name="spacing">12</property>
+                             <child>
+-                              <object class="GtkBox" id="hbox34">
++                              <object class="GtkLabel" id="views_label_0">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="spacing">12</property>
+-                                <child>
+-                                  <object class="GtkLabel" id="views_label_0">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="label" translatable="yes">View _new folders using:</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="mnemonic_widget">default_view_combobox</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkComboBox" id="default_view_combobox">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="model">model1</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer1"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">True</property>
+-                                    <property name="position">1</property>
+-                                  </packing>
+-                                </child>
++                                <property name="xalign">0</property>
++                                <property name="label" translatable="yes">View _new folders using:</property>
++                                <property name="use_underline">True</property>
++                                <property name="mnemonic_widget">default_view_combobox</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+-                                <property name="fill">True</property>
++                                <property name="fill">False</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+                             <child>
+-                              <object class="GtkBox" id="hbox11">
++                              <object class="GtkComboBox" id="default_view_combobox">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="spacing">12</property>
+-                                <child>
+-                                  <object class="GtkLabel" id="views_label_1">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="label" translatable="yes">_Arrange items:</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="mnemonic_widget">sort_order_combobox</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
++                                <property name="model">model1</property>
+                                 <child>
+-                                  <object class="GtkComboBox" id="sort_order_combobox">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="model">model2</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer2"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">True</property>
+-                                    <property name="position">1</property>
+-                                  </packing>
++                                  <object class="GtkCellRendererText" id="renderer1"/>
++                                  <attributes>
++                                    <attribute name="text">0</attribute>
++                                  </attributes>
+                                 </child>
+                               </object>
+                               <packing>
+@@ -164,302 +91,246 @@
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkBox" id="hbox11">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="spacing">12</property>
+                             <child>
+-                              <object class="GtkCheckButton" id="sort_folders_first_checkbutton">
+-                                <property name="label" translatable="yes">Sort _folders before files</property>
++                              <object class="GtkLabel" id="views_label_1">
+                                 <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
++                                <property name="can_focus">False</property>
++                                <property name="xalign">0</property>
++                                <property name="label" translatable="yes">_Arrange items:</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
++                                <property name="mnemonic_widget">sort_order_combobox</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+-                                <property name="position">2</property>
++                                <property name="position">0</property>
+                               </packing>
+                             </child>
+                             <child>
+-                              <object class="GtkCheckButton" id="hidden_files_checkbutton">
+-                                <property name="label" translatable="yes">Show hidden and _backup files</property>
++                              <object class="GtkComboBox" id="sort_order_combobox">
+                                 <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
++                                <property name="can_focus">False</property>
++                                <property name="model">model2</property>
++                                <child>
++                                  <object class="GtkCellRendererText" id="renderer2"/>
++                                  <attributes>
++                                    <attribute name="text">0</attribute>
++                                  </attributes>
++                                </child>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">3</property>
++                                <property name="fill">True</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkCheckButton" id="sort_folders_first_checkbutton">
++                            <property name="label" translatable="yes">Sort _folders before files</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">2</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkCheckButton" id="hidden_files_checkbutton">
++                            <property name="label" translatable="yes">Show hidden and _backup files</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">3</property>
++                          </packing>
+                         </child>
+                       </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">1</property>
+-                      </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkBox" id="vbox3">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
++                <property name="spacing">6</property>
++                <child>
++                  <object class="GtkLabel" id="label5">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Icon View Defaults</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkBox" id="vbox3">
++                  <object class="GtkAlignment" id="alignment1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
+-                    <property name="spacing">6</property>
+-                    <child>
+-                      <object class="GtkLabel" id="label5">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">Icon View Defaults</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
++                    <property name="left_padding">12</property>
+                     <child>
+-                      <object class="GtkAlignment" id="alignment1">
++                      <object class="GtkBox" id="vbox16">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
++                        <property name="orientation">vertical</property>
++                        <property name="spacing">6</property>
+                         <child>
+-                          <object class="GtkBox" id="vbox16">
++                          <object class="GtkBox" id="hbox35">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="orientation">vertical</property>
+-                            <property name="spacing">6</property>
++                            <property name="spacing">12</property>
+                             <child>
+-                              <object class="GtkBox" id="hbox35">
++                              <object class="GtkLabel" id="views_label_2">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="spacing">12</property>
+-                                <child>
+-                                  <object class="GtkLabel" id="views_label_2">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="label" translatable="yes">Default _zoom level:</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="mnemonic_widget">icon_view_zoom_combobox</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkComboBox" id="icon_view_zoom_combobox">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="model">model3</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer3"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">True</property>
+-                                    <property name="position">1</property>
+-                                  </packing>
+-                                </child>
++                                <property name="xalign">0</property>
++                                <property name="label" translatable="yes">Default _zoom level:</property>
++                                <property name="use_underline">True</property>
++                                <property name="mnemonic_widget">icon_view_zoom_combobox</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+-                                <property name="fill">True</property>
++                                <property name="fill">False</property>
+                                 <property name="position">0</property>
+                               </packing>
+                             </child>
+-                          </object>
+-                        </child>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">1</property>
+-                      </packing>
+-                    </child>
+-                  </object>
+-                  <packing>
+-                    <property name="expand">False</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">1</property>
+-                  </packing>
+-                </child>
+-                <child>
+-                  <object class="GtkBox" id="vbox4">
+-                    <property name="visible">True</property>
+-                    <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
+-                    <property name="spacing">6</property>
+-                    <child>
+-                      <object class="GtkLabel" id="label6">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">List View Defaults</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+-                      <object class="GtkAlignment" id="alignment3">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
+-                        <child>
+-                          <object class="GtkBox" id="vbox15">
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">False</property>
+-                            <property name="orientation">vertical</property>
+-                            <property name="spacing">6</property>
+                             <child>
+-                              <object class="GtkBox" id="hbox36">
++                              <object class="GtkComboBox" id="icon_view_zoom_combobox">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="spacing">12</property>
+-                                <child>
+-                                  <object class="GtkLabel" id="views_label_3">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="label" translatable="yes">D_efault zoom level:</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="mnemonic_widget">list_view_zoom_combobox</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
++                                <property name="model">model3</property>
+                                 <child>
+-                                  <object class="GtkComboBox" id="list_view_zoom_combobox">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="model">model5</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer5"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">True</property>
+-                                    <property name="position">1</property>
+-                                  </packing>
++                                  <object class="GtkCellRendererText" id="renderer3"/>
++                                  <attributes>
++                                    <attribute name="text">0</attribute>
++                                  </attributes>
+                                 </child>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+                                 <property name="fill">True</property>
+-                                <property name="position">0</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">0</property>
++                          </packing>
+                         </child>
+                       </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">1</property>
+-                      </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
+-                    <property name="position">3</property>
++                    <property name="position">1</property>
+                   </packing>
+                 </child>
+               </object>
+-            </child>
+-            <child type="tab">
+-              <object class="GtkLabel" id="label1">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <property name="label" translatable="yes">Views</property>
+-              </object>
+               <packing>
+-                <property name="tab_fill">False</property>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
+               </packing>
+             </child>
+             <child>
+-              <object class="GtkBox" id="vbox5">
++              <object class="GtkBox" id="vbox4">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="border_width">12</property>
+                 <property name="orientation">vertical</property>
+-                <property name="spacing">10</property>
++                <property name="spacing">6</property>
+                 <child>
+-                  <object class="GtkBox" id="vbox6">
++                  <object class="GtkLabel" id="label6">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
+-                    <property name="spacing">6</property>
+-                    <child>
+-                      <object class="GtkLabel" id="label10">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">Behavior</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">List View Defaults</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkAlignment" id="alignment3">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="left_padding">12</property>
+                     <child>
+-                      <object class="GtkAlignment" id="alignment5">
++                      <object class="GtkBox" id="vbox15">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
++                        <property name="orientation">vertical</property>
++                        <property name="spacing">6</property>
+                         <child>
+-                          <object class="GtkBox" id="vbox17">
++                          <object class="GtkBox" id="hbox36">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="orientation">vertical</property>
++                            <property name="spacing">12</property>
+                             <child>
+-                              <object class="GtkRadioButton" id="single_click_radiobutton">
+-                                <property name="label" translatable="yes">_Single click to open items</property>
++                              <object class="GtkLabel" id="views_label_3">
+                                 <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
++                                <property name="can_focus">False</property>
++                                <property name="xalign">0</property>
++                                <property name="label" translatable="yes">D_efault zoom level:</property>
+                                 <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
++                                <property name="mnemonic_widget">list_view_zoom_combobox</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+@@ -468,282 +339,405 @@
+                               </packing>
+                             </child>
+                             <child>
+-                              <object class="GtkRadioButton" id="double_click_radiobutton">
+-                                <property name="label" translatable="yes">_Double click to open items</property>
++                              <object class="GtkComboBox" id="list_view_zoom_combobox">
+                                 <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
+-                                <property name="group">single_click_radiobutton</property>
++                                <property name="can_focus">False</property>
++                                <property name="model">model5</property>
++                                <child>
++                                  <object class="GtkCellRendererText" id="renderer5"/>
++                                  <attributes>
++                                    <attribute name="text">0</attribute>
++                                  </attributes>
++                                </child>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="padding">6</property>
++                                <property name="fill">True</property>
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">True</property>
++                            <property name="position">0</property>
++                          </packing>
+                         </child>
+                       </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">1</property>
+-                      </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">3</property>
++              </packing>
++            </child>
++          </object>
++        </child>
++        <child type="tab">
++          <object class="GtkLabel" id="label1">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Views</property>
++          </object>
++          <packing>
++            <property name="tab_fill">False</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkBox" id="vbox5">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="border_width">12</property>
++            <property name="orientation">vertical</property>
++            <property name="spacing">10</property>
++            <child>
++              <object class="GtkBox" id="vbox6">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
++                <property name="spacing">6</property>
++                <child>
++                  <object class="GtkLabel" id="label10">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Behavior</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkBox" id="vbox7">
++                  <object class="GtkAlignment" id="alignment5">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
+-                    <property name="spacing">6</property>
++                    <property name="left_padding">12</property>
+                     <child>
+-                      <object class="GtkLabel" id="label12">
++                      <object class="GtkBox" id="vbox17">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">Executable Text Files</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+-                      <object class="GtkAlignment" id="alignment6">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
++                        <property name="orientation">vertical</property>
+                         <child>
+-                          <object class="GtkBox" id="vbox18">
++                          <object class="GtkRadioButton" id="single_click_radiobutton">
++                            <property name="label" translatable="yes">_Single click to open items</property>
+                             <property name="visible">True</property>
+-                            <property name="can_focus">False</property>
+-                            <property name="orientation">vertical</property>
+-                            <property name="spacing">6</property>
+-                            <child>
+-                              <object class="GtkRadioButton" id="scripts_execute_radiobutton">
+-                                <property name="label" translatable="yes">_Run executable text files when they are opened</property>
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">0</property>
+-                              </packing>
+-                            </child>
+-                            <child>
+-                              <object class="GtkRadioButton" id="scripts_view_radiobutton">
+-                                <property name="label" translatable="yes">_View executable text files when they are opened</property>
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
+-                                <property name="group">scripts_execute_radiobutton</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">1</property>
+-                              </packing>
+-                            </child>
+-                            <child>
+-                              <object class="GtkRadioButton" id="scripts_confirm_radiobutton">
+-                                <property name="label" translatable="yes">_Ask each time</property>
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
+-                                <property name="group">scripts_execute_radiobutton</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">2</property>
+-                              </packing>
+-                            </child>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
+                           </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkRadioButton" id="double_click_radiobutton">
++                            <property name="label" translatable="yes">_Double click to open items</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                            <property name="group">single_click_radiobutton</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="padding">6</property>
++                            <property name="position">1</property>
++                          </packing>
+                         </child>
+                       </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">1</property>
+-                      </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
++                    <property name="fill">False</property>
+                     <property name="position">1</property>
+                   </packing>
+                 </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkBox" id="vbox7">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
++                <property name="spacing">6</property>
+                 <child>
+-                  <object class="GtkBox" id="vbox8">
++                  <object class="GtkLabel" id="label12">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
+-                    <property name="spacing">6</property>
+-                    <child>
+-                      <object class="GtkLabel" id="label14">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">Trash</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Executable Text Files</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkAlignment" id="alignment6">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="left_padding">12</property>
+                     <child>
+-                      <object class="GtkAlignment" id="alignment7">
++                      <object class="GtkBox" id="vbox18">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
++                        <property name="orientation">vertical</property>
++                        <property name="spacing">6</property>
+                         <child>
+-                          <object class="GtkBox" id="vbox19">
++                          <object class="GtkRadioButton" id="scripts_execute_radiobutton">
++                            <property name="label" translatable="yes">_Run executable text files when they are opened</property>
+                             <property name="visible">True</property>
+-                            <property name="can_focus">False</property>
+-                            <property name="orientation">vertical</property>
+-                            <property name="spacing">6</property>
+-                            <child>
+-                              <object class="GtkCheckButton" id="trash_confirm_checkbutton">
+-                                <property name="label" translatable="yes">Ask before _emptying the Trash or deleting files</property>
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">0</property>
+-                              </packing>
+-                            </child>
+-                            <child>
+-                              <object class="GtkCheckButton" id="trash_delete_checkbutton">
+-                                <property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property>
+-                                <property name="visible">True</property>
+-                                <property name="can_focus">True</property>
+-                                <property name="receives_default">False</property>
+-                                <property name="use_action_appearance">False</property>
+-                                <property name="use_underline">True</property>
+-                                <property name="draw_indicator">True</property>
+-                              </object>
+-                              <packing>
+-                                <property name="expand">False</property>
+-                                <property name="fill">False</property>
+-                                <property name="position">1</property>
+-                              </packing>
+-                            </child>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkRadioButton" id="scripts_view_radiobutton">
++                            <property name="label" translatable="yes">_View executable text files when they are opened</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                            <property name="group">scripts_execute_radiobutton</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkRadioButton" id="scripts_confirm_radiobutton">
++                            <property name="label" translatable="yes">_Ask each time</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                            <property name="group">scripts_execute_radiobutton</property>
+                           </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">2</property>
++                          </packing>
+                         </child>
+                       </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">1</property>
+-                      </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
+-                    <property name="fill">True</property>
+-                    <property name="position">2</property>
++                    <property name="fill">False</property>
++                    <property name="position">1</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
+                 <property name="position">1</property>
+               </packing>
+             </child>
+-            <child type="tab">
+-              <object class="GtkLabel" id="label2">
++            <child>
++              <object class="GtkBox" id="vbox8">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="label" translatable="yes">Behavior</property>
++                <property name="orientation">vertical</property>
++                <property name="spacing">6</property>
++                <child>
++                  <object class="GtkLabel" id="label14">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Trash</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkAlignment" id="alignment7">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="left_padding">12</property>
++                    <child>
++                      <object class="GtkBox" id="vbox19">
++                        <property name="visible">True</property>
++                        <property name="can_focus">False</property>
++                        <property name="orientation">vertical</property>
++                        <property name="spacing">6</property>
++                        <child>
++                          <object class="GtkCheckButton" id="trash_confirm_checkbutton">
++                            <property name="label" translatable="yes">Ask before _emptying the Trash or deleting files</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkCheckButton" id="trash_delete_checkbutton">
++                            <property name="label" translatable="yes">I_nclude a Delete command that bypasses Trash</property>
++                            <property name="visible">True</property>
++                            <property name="can_focus">True</property>
++                            <property name="receives_default">False</property>
++                            <property name="use_action_appearance">False</property>
++                            <property name="use_underline">True</property>
++                            <property name="draw_indicator">True</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                      </object>
++                    </child>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
+               </object>
+               <packing>
+-                <property name="position">1</property>
+-                <property name="tab_fill">False</property>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">2</property>
+               </packing>
+             </child>
++          </object>
++          <packing>
++            <property name="position">1</property>
++          </packing>
++        </child>
++        <child type="tab">
++          <object class="GtkLabel" id="label2">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Behavior</property>
++          </object>
++          <packing>
++            <property name="position">1</property>
++            <property name="tab_fill">False</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkBox" id="vbox26">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="border_width">12</property>
++            <property name="orientation">vertical</property>
++            <property name="spacing">18</property>
+             <child>
+-              <object class="GtkBox" id="vbox26">
++              <object class="GtkBox" id="vbox27">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="border_width">12</property>
+                 <property name="orientation">vertical</property>
+-                <property name="spacing">18</property>
++                <property name="spacing">6</property>
+                 <child>
+-                  <object class="GtkBox" id="vbox27">
++                  <object class="GtkLabel" id="label28">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
+-                    <property name="spacing">6</property>
+-                    <child>
+-                      <object class="GtkLabel" id="label28">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">Icon Captions</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Icon Captions</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkAlignment" id="alignment8">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="left_padding">12</property>
+                     <child>
+-                      <object class="GtkAlignment" id="alignment8">
++                      <object class="GtkBox" id="vbox28">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
++                        <property name="orientation">vertical</property>
++                        <property name="spacing">6</property>
++                        <child>
++                          <object class="GtkLabel" id="label29">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <property name="xalign">0</property>
++                            <property name="label" translatable="yes">Choose the order of information to appear beneath icon names. More information will appear when zooming in closer.</property>
++                            <property name="wrap">True</property>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">0</property>
++                          </packing>
++                        </child>
+                         <child>
+-                          <object class="GtkBox" id="vbox28">
++                          <object class="GtkBox" id="hbox28">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="orientation">vertical</property>
+-                            <property name="spacing">6</property>
+                             <child>
+-                              <object class="GtkLabel" id="label29">
++                              <object class="GtkLabel" id="captions_label_0">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="xalign">0</property>
+-                                <property name="label" translatable="yes">Choose the order of information to appear beneath icon names. More information will appear when zooming in closer.</property>
+-                                <property name="wrap">True</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+@@ -752,32 +746,10 @@
+                               </packing>
+                             </child>
+                             <child>
+-                              <object class="GtkBox" id="hbox28">
++                              <object class="GtkComboBoxText" id="captions_0_combobox">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <child>
+-                                  <object class="GtkLabel" id="captions_label_0">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkComboBoxText" id="captions_0_combobox">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="entry_text_column">0</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">1</property>
+-                                  </packing>
+-                                </child>
++                                <property name="entry_text_column">0</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+@@ -785,133 +757,133 @@
+                                 <property name="position">1</property>
+                               </packing>
+                             </child>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">1</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkBox" id="hbox29">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
+                             <child>
+-                              <object class="GtkBox" id="hbox29">
++                              <object class="GtkLabel" id="captions_label_1">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <child>
+-                                  <object class="GtkLabel" id="captions_label_1">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="use_underline">True</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkComboBoxText" id="captions_1_combobox">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="entry_text_column">0</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">1</property>
+-                                  </packing>
+-                                </child>
++                                <property name="use_underline">True</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+-                                <property name="position">2</property>
++                                <property name="position">0</property>
+                               </packing>
+                             </child>
+                             <child>
+-                              <object class="GtkBox" id="hbox30">
++                              <object class="GtkComboBoxText" id="captions_1_combobox">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <child>
+-                                  <object class="GtkLabel" id="captions_label_2">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkComboBoxText" id="captions_2_combobox">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="entry_text_column">0</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">1</property>
+-                                  </packing>
+-                                </child>
++                                <property name="entry_text_column">0</property>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">1</property>
++                              </packing>
++                            </child>
++                          </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">2</property>
++                          </packing>
++                        </child>
++                        <child>
++                          <object class="GtkBox" id="hbox30">
++                            <property name="visible">True</property>
++                            <property name="can_focus">False</property>
++                            <child>
++                              <object class="GtkLabel" id="captions_label_2">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                              </object>
++                              <packing>
++                                <property name="expand">False</property>
++                                <property name="fill">False</property>
++                                <property name="position">0</property>
++                              </packing>
++                            </child>
++                            <child>
++                              <object class="GtkComboBoxText" id="captions_2_combobox">
++                                <property name="visible">True</property>
++                                <property name="can_focus">False</property>
++                                <property name="entry_text_column">0</property>
+                               </object>
+                               <packing>
+                                 <property name="expand">False</property>
+                                 <property name="fill">False</property>
+-                                <property name="position">3</property>
++                                <property name="position">1</property>
+                               </packing>
+                             </child>
+                           </object>
++                          <packing>
++                            <property name="expand">False</property>
++                            <property name="fill">False</property>
++                            <property name="position">3</property>
++                          </packing>
+                         </child>
+                       </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">1</property>
+-                      </packing>
+                     </child>
+                   </object>
+                   <packing>
+                     <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">1</property>
++                  </packing>
++                </child>
++              </object>
++              <packing>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
++              </packing>
++            </child>
++            <child>
++              <object class="GtkBox" id="box1">
++                <property name="visible">True</property>
++                <property name="can_focus">False</property>
++                <property name="orientation">vertical</property>
++                <child>
++                  <object class="GtkLabel" id="label7">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">List View</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
+                     <property name="fill">True</property>
+                     <property name="position">0</property>
+                   </packing>
+                 </child>
+                 <child>
+-                  <object class="GtkBox" id="box1">
++                  <object class="GtkAlignment" id="alignment4">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
++                    <property name="left_padding">12</property>
+                     <child>
+-                      <object class="GtkLabel" id="label7">
++                      <object class="GtkCheckButton" id="use_tree_view_checkbutton">
++                        <property name="label" translatable="yes">Navigate folders in a tree</property>
+                         <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
++                        <property name="can_focus">True</property>
++                        <property name="receives_default">False</property>
+                         <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">List View</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
+-                    <child>
+-                      <object class="GtkAlignment" id="alignment4">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
+-                        <child>
+-                          <object class="GtkCheckButton" id="use_tree_view_checkbutton">
+-                            <property name="label" translatable="yes">Navigate folders in a tree</property>
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">True</property>
+-                            <property name="receives_default">False</property>
+-                            <property name="xalign">0</property>
+-                            <property name="draw_indicator">True</property>
+-                          </object>
+-                        </child>
++                        <property name="draw_indicator">True</property>
+                       </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">1</property>
+-                      </packing>
+                     </child>
+                   </object>
+                   <packing>
+@@ -922,164 +894,146 @@
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">2</property>
+-              </packing>
+-            </child>
+-            <child type="tab">
+-              <object class="GtkLabel" id="label24">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <property name="label" translatable="yes">Display</property>
+-              </object>
+-              <packing>
+-                <property name="position">2</property>
+-                <property name="tab_fill">False</property>
++                <property name="expand">False</property>
++                <property name="fill">True</property>
++                <property name="position">1</property>
+               </packing>
+             </child>
++          </object>
++          <packing>
++            <property name="position">2</property>
++          </packing>
++        </child>
++        <child type="tab">
++          <object class="GtkLabel" id="label24">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">Display</property>
++          </object>
++          <packing>
++            <property name="position">2</property>
++            <property name="tab_fill">False</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkBox" id="vbox29">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="border_width">12</property>
++            <property name="orientation">vertical</property>
++            <property name="spacing">18</property>
+             <child>
+-              <object class="GtkBox" id="vbox29">
++              <object class="GtkBox" id="vbox30">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="border_width">12</property>
+                 <property name="orientation">vertical</property>
+-                <property name="spacing">18</property>
++                <property name="spacing">6</property>
+                 <child>
+-                  <object class="GtkBox" id="vbox30">
++                  <object class="GtkBox" id="list_columns_vbox">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+                     <property name="orientation">vertical</property>
+                     <property name="spacing">6</property>
+                     <child>
+-                      <object class="GtkBox" id="list_columns_vbox">
++                      <object class="GtkLabel" id="label33">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="orientation">vertical</property>
+-                        <property name="spacing">6</property>
+-                        <child>
+-                          <object class="GtkLabel" id="label33">
+-                            <property name="visible">True</property>
+-                            <property name="can_focus">False</property>
+-                            <property name="xalign">0</property>
+-                            <property name="label" translatable="yes">Choose the order of information to appear in the list view.</property>
+-                            <property name="wrap">True</property>
+-                          </object>
+-                          <packing>
+-                            <property name="expand">False</property>
+-                            <property name="fill">False</property>
+-                            <property name="position">0</property>
+-                          </packing>
+-                        </child>
+-                        <child>
+-                          <placeholder/>
+-                        </child>
++                        <property name="xalign">0</property>
++                        <property name="label" translatable="yes">Choose the order of information to appear in the list view.</property>
++                        <property name="wrap">True</property>
+                       </object>
+                       <packing>
+-                        <property name="expand">True</property>
+-                        <property name="fill">True</property>
+-                        <property name="position">1</property>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">0</property>
+                       </packing>
+                     </child>
++                    <child>
++                      <placeholder/>
++                    </child>
+                   </object>
+                   <packing>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+-                    <property name="position">0</property>
++                    <property name="position">1</property>
+                   </packing>
+                 </child>
+               </object>
+               <packing>
+-                <property name="position">3</property>
+-              </packing>
+-            </child>
+-            <child type="tab">
+-              <object class="GtkLabel" id="label30">
+-                <property name="visible">True</property>
+-                <property name="can_focus">False</property>
+-                <property name="label" translatable="yes">List Columns</property>
+-              </object>
+-              <packing>
+-                <property name="position">3</property>
+-                <property name="tab_fill">False</property>
++                <property name="expand">True</property>
++                <property name="fill">True</property>
++                <property name="position">0</property>
+               </packing>
+             </child>
++          </object>
++          <packing>
++            <property name="position">3</property>
++          </packing>
++        </child>
++        <child type="tab">
++          <object class="GtkLabel" id="label30">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="label" translatable="yes">List Columns</property>
++          </object>
++          <packing>
++            <property name="position">3</property>
++            <property name="tab_fill">False</property>
++          </packing>
++        </child>
++        <child>
++          <object class="GtkBox" id="vbox9">
++            <property name="visible">True</property>
++            <property name="can_focus">False</property>
++            <property name="border_width">12</property>
++            <property name="orientation">vertical</property>
++            <property name="spacing">18</property>
+             <child>
+-              <object class="GtkBox" id="vbox9">
++              <object class="GtkBox" id="vbox11">
+                 <property name="visible">True</property>
+                 <property name="can_focus">False</property>
+-                <property name="border_width">12</property>
+                 <property name="orientation">vertical</property>
+-                <property name="spacing">18</property>
++                <property name="spacing">6</property>
+                 <child>
+-                  <object class="GtkBox" id="vbox11">
++                  <object class="GtkLabel" id="label18">
+                     <property name="visible">True</property>
+                     <property name="can_focus">False</property>
+-                    <property name="orientation">vertical</property>
+-                    <property name="spacing">6</property>
+-                    <child>
+-                      <object class="GtkLabel" id="label18">
+-                        <property name="visible">True</property>
+-                        <property name="can_focus">False</property>
+-                        <property name="xalign">0</property>
+-                        <property name="label" translatable="yes">Files</property>
+-                        <attributes>
+-                          <attribute name="weight" value="bold"/>
+-                        </attributes>
+-                      </object>
+-                      <packing>
+-                        <property name="expand">False</property>
+-                        <property name="fill">False</property>
+-                        <property name="position">0</property>
+-                      </packing>
+-                    </child>
++                    <property name="xalign">0</property>
++                    <property name="label" translatable="yes">Files</property>
++                    <attributes>
++                      <attribute name="weight" value="bold"/>
++                    </attributes>
++                  </object>
++                  <packing>
++                    <property name="expand">False</property>
++                    <property name="fill">False</property>
++                    <property name="position">0</property>
++                  </packing>
++                </child>
++                <child>
++                  <object class="GtkAlignment" id="alignment11">
++                    <property name="visible">True</property>
++                    <property name="can_focus">False</property>
++                    <property name="left_padding">12</property>
+                     <child>
+-                      <object class="GtkAlignment" id="alignment11">
++                      <object class="GtkBox" id="vbox21">
+                         <property name="visible">True</property>
+                         <property name="can_focus">False</property>
+-                        <property name="left_padding">12</property>
++                        <property name="orientation">vertical</property>
++                        <property name="spacing">6</property>
+                         <child>
+-                          <object class="GtkBox" id="vbox21">
++                          <object class="GtkBox" id="hbox20">
+                             <property name="visible">True</property>
+                             <property name="can_focus">False</property>
+-                            <property name="orientation">vertical</property>
+-                            <property name="spacing">6</property>
++                            <property name="spacing">12</property>
+                             <child>
+-                              <object class="GtkBox" id="hbox20">
++                              <object class="GtkLabel" id="preview_label_0">
+                                 <property name="visible">True</property>
+                                 <property name="can_focus">False</property>
+-                                <property name="spacing">12</property>
+-                                <child>
+-                                  <object class="GtkLabel" id="preview_label_0">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="xalign">0</property>
+-                                    <property name="label" translatable="yes">Show _thumbnails:</property>
+-                                    <property name="use_underline">True</property>
+-                                    <property name="mnemonic_widget">preview_image_combobox</property>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>
+-                                    <property name="fill">False</property>
+-                                    <property name="position">0</property>
+-                                  </packing>
+-                                </child>
+-                                <child>
+-                                  <object class="GtkComboBox" id="preview_image_combobox">
+-                                    <property name="visible">True</property>
+-                                    <property name="can_focus">False</property>
+-                                    <property name="model">model7</property>
+-                                    <child>
+-                                      <object class="GtkCellRendererText" id="renderer7"/>
+-                                      <attributes>
+-                                        <attribute name="text">0</attribute>
+-                                      </attributes>
+-                                    </child>
+-                                  </object>
+-                                  <packing>
+-                                    <property name="expand">False</property>