[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. Commit message: * New upstream release: 3.26.3.1 * debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch, debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch, debian/patches/0018-search-engine-add-locate-based-search-engine.patch: - Follow nautilus settings to search only in current folder (LP: #1767027). This doesn't apply to gnome-shell search provider for indexed searches. * debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch: - Updated to respect upstream requested changes * debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mounted.patch: - don't crash if selecting a volume that is not mounted (LP: #1764779) Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1764779 in nautilus (Ubuntu): "Nautilus crashed open Windows-partition" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1764779 Bug #1767027 in nautilus (Ubuntu): "Search current folder only in nautilus doesn't work (Ubuntu 18.04)" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1767027 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/349800 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. diff --git a/NEWS b/NEWS index 94f1bf4..c78d1d1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Major changes in 3.26.3.1: +* Revert accidental backports of behavioral and visual changes + Major changes in 3.26.3: * Don’t strip extension from folders in compress dialog (Rahul Verma) * Fix items not being focused when selected in list view (António Fernandes) diff --git a/debian/changelog b/debian/changelog index 30d5e5b..5ec2f23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +nautilus (1:3.26.3.1~ubuntu18.04.1) UNRELEASED; urgency=medium + + [ Sebastien Bacher ] + * debian/patches/git_middle_tab.patch: +- don't close the view when middle clicking on an item in the + "other locations" (lp: #1765776) + + [ Marco Trevisan (Treviño) ] + * New upstream release: 3.26.3.1 + * debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch, +debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch, +debian/patches/0018-search-engine-add-locate-based-search-engine.patch: +- Follow nautilus settings to search only in current folder (LP: #1767027). + This doesn't apply to gnome-shell search provider for indexed searches. + * debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch: +- Updated to respect upstream requested changes + * debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mounted.patch: +- don't crash if selecting a volume that is not mounted (LP: #1764779) + + -- Sebastien Bacher Mon, 30 Apr 2018 16:12:53 +0200 + nautilus (1:3.26.3-0ubuntu4) bionic; urgency=medium * debian/patches/server_list_segfault.patch, diff --git a/debian/control.in b/debian/control.in index 0d5ed26..19b2ec4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -33,7 +33,10 @@ Build-Depends: debhelper (>= 10.3), libunity-dev (>= 5.0.0), libzeitgeist-2.0-dev, Homepage: https://wiki.gnome.org/action/show/Apps/Nautilus -Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/nautilus +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/nautilus.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/nautilus +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/nautilus -b ubuntu/bionic Standards-Version: 3.9.8 Package: nautilus diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch index 1a4ee1c..0ec13f1 100644 --- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch @@ -7,19 +7,19 @@ Using GtkRecent items as search engine source in nautilus --- src/meson.build | 2 + src/nautilus-file.h | 1 + - src/nautilus-search-engine-recent.c | 385 - src/nautilus-search-engine-recent.h | 36 - src/nautilus-search-engine.c| 11 ++ - 5 files changed, 435 insertions(+) + src/nautilus-search-engine-recent.c | 427 + src/nautilus-search-engine-recent.h | 36 +++ + src/nautilus-search-engine.c| 11 + + 5 files
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Approve Looks ok now thanks. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/349670 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Right Amr, I had the same feeling... So pushed a fix for both this and ubuntu/master -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/349800 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
I just have a comment on what upstream did for 3.26.3.1. They reverted two commits, which they see as behavioural changes in a stable release, and that makes sense upstream. Revert "files-view: Remove new empty folder name suggestion" https://gitlab.gnome.org/GNOME/nautilus/commit/945c32dec747855047aa9b380d53588c5fcfb57a Revert "nautilus-file: Don't show thumbnails for the first 2 zoom levels" https://gitlab.gnome.org/GNOME/nautilus/commit/d62c0899f34665bdc4752ce8b6844328889f4638 But downstream here in Ubuntu, those behaviours were released as part of 18.04 in nautilus 3.26.3 and removing them might be considered a regression in Ubuntu itself. The changes had been introduced in 3.26.3 during the development cycle of Bionic, so technically that counts as an improvement, not as a behavioural change in stable Ubuntu. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/349800 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-fix-recursive-engines into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
I just have a comment on what upstream did for 3.26.3.1. They reverted two commits, which they see as behavioural changes in a stable release, and that makes sense upstream. Revert "files-view: Remove new empty folder name suggestion" https://gitlab.gnome.org/GNOME/nautilus/commit/945c32dec747855047aa9b380d53588c5fcfb57a Revert "nautilus-file: Don't show thumbnails for the first 2 zoom levels" https://gitlab.gnome.org/GNOME/nautilus/commit/d62c0899f34665bdc4752ce8b6844328889f4638 But downstream here in Ubuntu, those behaviours were released as part of 18.04 in nautilus 3.26.3 and removing them might be considered a regression in Ubuntu itself. The changes had been introduced in 3.26.3 during the development cycle of Bionic, so technically that counts as an improvement, not as a behavioural change in stable Ubuntu. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/349670 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~canonical-desktop-team/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~canonical-desktop-team/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #678421 in gdm (Ubuntu): "Error message for a faulty ~/.profile script" https://bugs.launchpad.net/ubuntu/+source/gdm/+bug/678421 Bug #952185 in Light Display Manager: "~/.pam_environment not parsed by default" https://bugs.launchpad.net/lightdm/+bug/952185 Bug #1262068 in nvidia-prime (Ubuntu): "nvidia-prime should support gdm also" https://bugs.launchpad.net/ubuntu/+source/nvidia-prime/+bug/1262068 Bug #1662031 in Ubuntu GNOME: "Switching language and format broken" https://bugs.launchpad.net/ubuntu-gnome/+bug/1662031 Bug #1766137 in gdm3 (Ubuntu): "[regression] Password accepted but login fails (blank purple screen and mouse pointer only)" https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1766137 Bug #1776487 in gdm3 (Ubuntu): "Logging out does not decrease the number of logged in users" https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1776487 For more details, see: https://code.launchpad.net/~canonical-desktop-team/ubuntu/+source/gdm3/+git/gdm3/+merge/349818 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~canonical-desktop-team/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
