Last commit made on 2017-03-07
Get this branch:
git clone -b ubuntu/zesty https://git.launchpad.net/ubuntu/+source/nautilus
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

499ba0b... by Jeremy Bicha on 2017-03-07

Import patches-unapplied version 1:3.20.4-0ubuntu2 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 580198f1b298e0c5be87625de2db27c8fd2ddfc6

New changelog entries:
  * Add debian/hicolor/*, debian/source/include/binaries,
    debian/nautilus-data.install, git_use-own-icons.patch:
    - Backport icons and related changes from 3.24 since
      adwaita-icon-theme 3.24 no longer includes a Nautilus icon
      (LP: #1669655)
  * Add debian/patches/git_shell-search-partial-words.patch:
    - Backport 3.22 commit to re-enable GNOME Shell search plugin
      to return matching partial-word results instead of just full-word

580198f... by Iain Lane on 2017-02-28

Import patches-unapplied version 1:3.20.4-0ubuntu1 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 5412daec2bb763ec1a5a3b76f1deca2de65d9d53

New changelog entries:
  * New upstream release 3.20.4.
    + Don't allow the main view to shrink (LP: #166833)
    + Fix crash when no selection
    + Avoid crash when closing view that is still loading
  * debian/patches/0003-nautilus-canvas-Don-t-lay-down-desktop-icons-if-we-h.patch:
    Drop, included in this version.

5412dae... by Iain Lane on 2016-10-27

Import patches-unapplied version 1:3.20.3-1ubuntu4 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: b81ff388dac7e21e6783cbb13f658a32ff10f518

New changelog entries:
  * debian/patches/ubuntu_revert_no_wallpaper.patch: Ensure that
    widget_realized_cb is always called, as this sets up the signals that set
    things up on monitor change, amongst other things. The constructor might
    be called after the widget is realized, meaning the signal handler doesn't
    fire (LP: #1626935)

b81ff38... by Iain Lane on 2016-10-07

Import patches-unapplied version 1:3.20.3-1ubuntu3 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 196fbb31956a33b7956f4445a97b96910032d55f

New changelog entries:
  * d/p/0003-nautilus-canvas-Don-t-lay-down-desktop-icons-if-we-h.patch:
    Cherry-pick patch from upstream. Delay laying out the desktop's icons
    until we know the size of the desktop window. Should fix overlapping
    icons, such as those we see in live environments currently. (LP: #1611955)

196fbb3... by Jeremy Bicha on 2016-09-14

Import patches-unapplied version 1:3.20.3-1ubuntu2 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: 468d7775c7f2812f4276a399008809a16b0f400b

New changelog entries:
  [ Jeremy Bicha ]
  * Fully multiarchify
  * Add multiarch_fallback.patch:
    Load extensions from non-multiarch directory too
  [ Michael Biebl ]
  * Enforce strictly versioned dependency between nautilus and
  * Add a symbols files for libnautilus-extension1a, use the Jessie version as
    base to generate the symbols file.
  * Add Build-Depends-Package to libnautilus-extension1a.symbols.
    This ensures proper dependencies when a package has a Build-Depends on a
    higher version of libnautilus-extension-dev then what it gets from the
    used symbols.
  * Drop override for dh_makeshlibs, no longer necessary.

468d777... by Jeremy Bicha on 2016-09-09

Import patches-unapplied version 1:3.20.3-1ubuntu1 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: f024cb35656848e2ced27b99705688bea44eed4c

New changelog entries:
  * Merge with Debian. Remaining changes:
    - debian/control.in:
      + Build-Depends on dh-migrations, libunity-dev, and libzeitgeist-2.0-dev
      + updated gnome-pkg-tools requirement
      + lower gnome-sushi Recommends to a Suggests
      + Replace nautilus-data (<< 1:3.18.1-1ubuntu1) for appdata move
      + 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:
      + 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.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 they are not due to nautilus code directly
    - debian/rules:
      + use dh_migrations and build compat desktop entries
      + Bump dbgsym migration version
    - debian/patches/03_translations_list_update.patch:
      + Translate the mount-archive menu entry
    - 04_suppress_umount_in_ltsp.patch:
      + Don't list unmount and eject actions on LTSP clients
    - 06_never_exec_nonexec_launchers.patch:
      + Implement non-exec policy for .desktop handler.
    - 08_clean_session_capplet.patch:
      + use NoDisplay for the new autostart desktop to keep the capplet clean
    - 12_unity_launcher_support.patch:
      + unity launcher integration (list bookmarks in the context menu,
        display a bar on the icon during copies)
    - 15_use-ubuntu-help.patch:
      + use the ubuntu documentation
    - 16_unity_new_documents.patch:
      + display the "new document" menu under unity, even if there is no
        template installed
    - 18_unity_icon_color.patch:
      + specify a background color for the unity launcher icon
    - 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
    - 19_unity_open_location_xid.patch:
      + Add a new dbus property to store the lists of opened locations
        referenced by their parent nautilus window XID.
    - 20_add_timestamp_to_operations.patch:
      + Add *WithTimestamp dbus methods for file operations that
        might trigger a dialog, that should be presented with time.
    - 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
    - interactive_search.patch:
      + Restore interactive search as an option
    - revert_del_get_treeview.patch:
      + Restore function needed by above patch
    - ubuntu_infobars_color.patch:
      + set infobar type to "other" rather than "question" to avoid blue
    - ubuntu_tracker_only_on_GNOME.patch:
      + only start the tracker index on GNOME sessions
    - ubuntu_backspace_behaviour.patch:
      + restore backspace behaviour to go back
    - zg_activity_logging.patch:
      + Use zeitgeist-2.0
    - ubuntu_sync_background_to_accountsservice.patch:
      + write the background image to accountsservice when it changes
    - 0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch
    - 0002-Only-use-a-header-bar-in-GNOME-shell.patch
      + Otherwise use a normal titlebar and use the headerbar like a toolbar
  * Disabled patch that need to be rewritten:
    - 16_unity_new_documents.patch
  * Dropped patches, applied in new version:
    - 0001-desktop-canvas-view-scale-desktop-workarea.patch
    - 0003-Fix-white-desktop.patch with new fix from git

f024cb3... by Andreas Henriksson on 2016-08-30

Import patches-unapplied version 3.20.3-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: cd35487e940e725eca33074c5d0dbf0d1dca7b27

New changelog entries:
  [ Jeremy Bicha ]
  * New upstream release (3.20.2)
  * Drop format patch, applied in new version
  * 0001-desktop-canvas-view-scale-desktop-workarea.patch:
    - Add git patch to fix desktop margins with high-dpi scaling
  * Convert from cdbs to dh
  * Add debian/docs to explicitly install AUTHORS, NEWS, and THANKS
  * Partially multiarchify but still install nautilus extensions to
    /usr/lib/nautilus/extensions-3.0/ (from Ubuntu)
  * Enable parallel building and all hardening flags
  * Update homepage
  [ Andreas Henriksson ]
  * New upstream release (3.20.3)
  * Drop d/p/0001-desktop-canvas-view-scale-desktop-workarea.patch again,
    now included in upstream release.

cd35487... by Laurent Bigonville on 2016-06-04

Import patches-unapplied version 3.20.1-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6b373b8d0dfc30a23c8d6c4c95c57fc2fd7ab2ed

New changelog entries:
  * debian/nautilus.install: Move nautilus-autostart.desktop back to
    etc/xdg/autostart. We are trying to remove the non-standard
    /usr/share/gnome/autostart/ path.
  * debian/control.in: gnome-icon-theme-symbolic from the dependencies, do not
    force an icon theme and rely on the one installed by the metapackages

6b373b8... by Laurent Bigonville on 2016-05-04

Import patches-unapplied version 3.20.1-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0ba6e98e9edb22c803af8f1ab15fc2ede493ea95

New changelog entries:
  * Only enable SELinux on Linux architectures, should fix FTBFS on other ones

0ba6e98... by Michael Biebl on 2016-05-03

Import patches-unapplied version 3.20.1-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 959d6682e2a7093cbc29784ca00d812688b58fb7

New changelog entries:
  * New upstream release.
  * Drop obsolete Breaks, Conflicts and Replaces from pre-wheezy.
  * Bump Standards-Version to 3.9.8.
  * Fix format string handling in show_unhandled_type_error(), patch taken
    from bgo#765918.