Merge lp://staging/~azzar1/nautilus/higidpi-desktop-view-margins into lp://staging/~vcs-imports/nautilus/master-git
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~azzar1/nautilus/higidpi-desktop-view-margins |
| Merge into: | lp://staging/~vcs-imports/nautilus/master-git |
| Diff against target: |
12971 lines (+12613/-0) 71 files modified
.bzr-builddeb/default.conf (+2/-0) debian/changelog (+2397/-0) debian/compat (+1/-0) debian/control (+158/-0) debian/control.in (+154/-0) debian/copyright (+51/-0) debian/gir1.2-nautilus-3.0.install (+1/-0) debian/libnautilus-extension-dev.install (+5/-0) debian/libnautilus-extension1a.install (+1/-0) debian/mount-archive.desktop (+9/-0) debian/mount-archive.desktop.in (+9/-0) debian/nautilus-data.install (+5/-0) debian/nautilus-folder-handler.desktop (+126/-0) debian/nautilus-home.desktop (+22/-0) debian/nautilus-home.desktop.in (+10/-0) debian/nautilus-unity-launcher-icon.py (+24/-0) debian/nautilus.install (+12/-0) debian/nautilus.migrations (+1/-0) debian/nautilus.postrm (+15/-0) debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch (+2410/-0) debian/patches/0001-application-use-correct-order-to-watch-for-GSettings.patch (+32/-0) debian/patches/0001-desktop-window-restore-transparency.patch (+70/-0) debian/patches/0001-nautilus_file_peek_display_name-Don-t-return-NULL.patch (+31/-0) debian/patches/0002-Only-use-a-header-bar-in-GNOME-shell.patch (+82/-0) debian/patches/0002-desktop-window-restore-transparency-again.patch (+30/-0) debian/patches/03_translations_list_update.patch (+13/-0) debian/patches/04_suppress_umount_in_ltsp.patch (+29/-0) debian/patches/06_never_exec_nonexec_launchers.patch (+22/-0) debian/patches/08_clean_session_capplet.patch (+9/-0) debian/patches/11_copy_skipping_pager.patch (+23/-0) debian/patches/12_unity_launcher_support.patch (+886/-0) debian/patches/14_bring_del_instead_ctrl_del.patch (+34/-0) debian/patches/15_use-ubuntu-help.patch (+123/-0) debian/patches/16_unity_new_documents.patch (+125/-0) debian/patches/17_static_unity_quicklist.patch (+14/-0) debian/patches/18_unity_icon_color.patch (+12/-0) debian/patches/19_unity_open_location_xid.patch (+236/-0) debian/patches/20_add_timestamp_to_operations.patch (+359/-0) debian/patches/dont_wrap_labels_after_dots.patch (+34/-0) debian/patches/git_desktop_grid.patch (+39/-0) debian/patches/git_dnd_segfault.patch (+34/-0) debian/patches/git_file_dnd.patch (+42/-0) debian/patches/git_hover_hidebar.patch (+225/-0) debian/patches/git_multiple_desktop_names.patch (+40/-0) debian/patches/git_name_column.patch (+29/-0) debian/patches/git_nomodel_segfault.patch (+68/-0) debian/patches/git_null_uri.patch (+26/-0) debian/patches/git_open_dir_with.patch (+19/-0) debian/patches/git_revert_location_entry.patch (+26/-0) debian/patches/git_sidebar_selection.patch (+134/-0) debian/patches/git_slot_order.patch (+50/-0) debian/patches/git_unmount_seg.patch (+20/-0) debian/patches/git_valid_list.patch (+47/-0) debian/patches/git_wrap_label.patch (+51/-0) debian/patches/hidpi_desktop_view_margins.patch (+43/-0) debian/patches/ignore-no-desktop-if-not-first-launch.patch (+41/-0) debian/patches/interactive_search.patch (+1036/-0) debian/patches/restore-traditional-menu-bar.patch (+521/-0) debian/patches/revert_remove_unused_GtkActions.patch (+243/-0) debian/patches/series (+44/-0) debian/patches/ubuntu_backspace_behaviour.patch (+84/-0) debian/patches/ubuntu_infobars_color.patch (+38/-0) debian/patches/ubuntu_new_gtksidebar.patch (+263/-0) debian/patches/ubuntu_revert_no_wallpaper.patch (+859/-0) debian/patches/ubuntu_sync_background_to_accountsservice.patch (+99/-0) debian/patches/ubuntu_tracker_only_on_GNOME.patch (+63/-0) debian/patches/zg_activity_logging.patch (+784/-0) debian/rules (+39/-0) debian/source/format (+1/-0) debian/source_nautilus.py (+25/-0) debian/watch (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~azzar1/nautilus/higidpi-desktop-view-margins |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| VCS imports | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-08-01.
Unmerged revisions
- 513. By Andrea Azzarone
-
* debian/
patches/ hidpi_desktop_ view_margins. patch:
- scale desktop workarea margins. - 512. By Sebastien Bacher
-
* debian/
patches/ git_hover_ hidebar. patch:
- hide the selection info bar on mouse over (lp: #797485) - 511. By Iain Lane
-
* debian/
patches/ restore- traditional- menu-bar. patch:
- update menubar visibility on GktSettings changes - 510. By Iain Lane
-
More 3.20 updates
- 509. By Iain Lane
-
Modify both to work with GTK 3.18 too, by using old CSS name and avoiding
new API. - 508. By Iain Lane
-
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
-
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
-
releasing package nautilus version 1:3.18.
4.is.3. 14.3-0ubuntu4 - 505. By Sebastien Bacher
-
* 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
-
releasing package nautilus version 1:3.18.
4.is.3. 14.3-0ubuntu3
