Merge lp://qastaging/~noskcaj/ubuntu/trusty/xfdesktop4/4.11.4 into lp://qastaging/ubuntu/trusty/xfdesktop4
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/trusty/xfdesktop4/4.11.4 |
| Merge into: | lp://qastaging/ubuntu/trusty/xfdesktop4 |
| Diff against target: |
19938 lines (+5060/-5780) 57 files modified
.pc/applied-patches (+0/-1) .pc/git-fix-segfault-on-session-start.patch/src/xfce-desktop.c (+0/-1695) .pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c (+58/-34) .pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c (+58/-34) ChangeLog (+475/-0) Makefile.in (+1/-0) NEWS (+69/-0) README (+2/-2) backgrounds/Makefile.in (+1/-0) common/Makefile.in (+1/-0) common/xfdesktop-thumbnailer.c (+1/-1) config.h.in (+3/-0) configure (+423/-413) configure.ac (+18/-14) debian/changelog (+19/-0) debian/patches/git-fix-segfault-on-session-start.patch (+0/-23) debian/patches/series (+0/-1) debian/patches/xubuntu_improve-nautilus-interactions.patch (+3/-3) debian/patches/xubuntu_set-accountsservice-user-bg.patch (+2/-2) doc/Makefile.in (+1/-0) pixmaps/Makefile.in (+1/-0) po/POTFILES.skip (+3/-0) po/bg.po (+148/-151) po/da.po (+184/-183) po/de.po (+180/-182) po/en_AU.po (+147/-150) po/es.po (+150/-153) po/fr.po (+150/-152) po/hr.po (+247/-245) po/hu.po (+182/-181) po/it.po (+148/-151) po/ja.po (+177/-176) po/ko.po (+148/-151) po/ms.po (+147/-150) po/pl.po (+149/-151) po/ru.po (+146/-149) po/sr.po (+148/-151) po/th.po (+141/-144) po/zh_TW.po (+149/-151) settings/Makefile.in (+5/-1) settings/main.c (+80/-34) settings/xfce-backdrop-settings.desktop.in (+3/-2) settings/xfce-backdrop-settings.desktop.in.in (+15/-0) settings/xfdesktop-settings-appearance-frame-ui.glade (+6/-6) settings/xfdesktop-settings-appearance-frame-ui.h (+173/-173) settings/xfdesktop-settings-ui.glade (+1/-0) settings/xfdesktop-settings-ui.h (+345/-344) src/Makefile.am (+5/-9) src/Makefile.in (+13/-20) src/xfce-backdrop.c (+5/-1) src/xfce-desktop.c (+58/-34) src/xfce-workspace.c (+155/-61) src/xfdesktop-app-menu-item.c (+53/-0) src/xfdesktop-file-icon-manager.c (+11/-88) src/xfdesktop-icon-view.c (+49/-9) src/xfdesktop-regular-file-icon.c (+200/-3) src/xfdesktop-regular-file-icon.h (+3/-1) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/xfdesktop4/4.11.4 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
New upstream bugfix release
To post a comment you must log in.
Unmerged revisions
- 97. By Jackson Doak
-
* Merge from debian. Remaining changes:
- debian/patches/ xubuntu_ improve- nautilus- interactions. patch: added,
should prevent nautilus from taking over the desktop if xfdesktop is
running (and vice-versa).
- debian/patches/ xubuntu_ set-accountsser vice-user- bg.patch: update the
user background property of Accountsservice on backdrop change.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.