Merge lp://staging/~noskcaj/ubuntu/trusty/xfdesktop4/4.11.3 into lp://staging/ubuntu/trusty/xfdesktop4
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~noskcaj/ubuntu/trusty/xfdesktop4/4.11.3 |
| Merge into: | lp://staging/ubuntu/trusty/xfdesktop4 |
| Diff against target: |
12232 lines (+2877/-2351) 52 files modified
.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c (+31/-28) .pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c (+31/-28) ChangeLog (+402/-0) INSTALL (+2/-2) Makefile.in (+11/-4) NEWS (+34/-0) README (+2/-2) aclocal.m4 (+198/-103) backgrounds/Makefile.in (+1/-1) common/Makefile.in (+3/-3) common/xfdesktop-common.h (+1/-1) common/xfdesktop-thumbnailer.c (+22/-8) config.guess (+35/-162) config.h.in (+0/-3) config.sub (+26/-6) configure (+208/-208) configure.ac (+2/-2) debian/changelog (+17/-0) debian/patches/xubuntu_improve-nautilus-interactions.patch (+3/-3) debian/patches/xubuntu_set-accountsservice-user-bg.patch (+2/-2) doc/Makefile.in (+1/-1) ltmain.sh (+13/-19) missing (+2/-2) pixmaps/Makefile.in (+1/-1) po/Makefile.in.in (+4/-5) po/cs.po (+122/-117) po/de.po (+150/-144) po/en_AU.po (+96/-92) po/es.po (+95/-91) po/id.po (+148/-144) po/is.po (+98/-93) po/kk.po (+117/-113) po/ms.po (+117/-112) po/pl.po (+114/-108) po/pt.po (+96/-92) po/ru.po (+100/-96) po/sl.po (+101/-96) po/sv.po (+97/-92) po/tr.po (+97/-93) po/zh_CN.po (+108/-104) settings/Makefile.in (+3/-3) settings/main.c (+8/-8) settings/xfdesktop-settings-ui.glade (+1/-1) settings/xfdesktop-settings-ui.h (+1/-1) src/Makefile.in (+3/-3) src/xfce-desktop.c (+31/-28) src/xfce-workspace.c (+1/-1) src/xfdesktop-application.c (+2/-6) src/xfdesktop-file-icon-manager.c (+46/-75) src/xfdesktop-file-utils.c (+10/-3) src/xfdesktop-icon-view.c (+63/-40) src/xfdesktop-volume-icon.c (+0/-1) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/trusty/xfdesktop4/4.11.3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Holbach | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge new bugfix release from debian
To post a comment you must log in.
Unmerged revisions
- 95. 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.
* New upstream development release.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks. Uploaded.