Merge lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-settings/4.11.1 into lp://qastaging/ubuntu/trusty/xfce4-settings

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-settings/4.11.1
Merge into: lp://qastaging/ubuntu/trusty/xfce4-settings
Diff against target: 99929 lines (+35077/-29524)
121 files modified
.pc/01_use-tango-icon-theme.patch/xfsettingsd/xsettings.xml (+0/-45)
.pc/applied-patches (+0/-2)
.pc/xubuntu_vanilla-session-themes.patch/xfsettingsd/xsettings.xml (+0/-45)
ChangeLog (+2082/-0)
INSTALL (+1/-1)
Makefile.in (+138/-111)
NEWS (+21/-0)
aclocal.m4 (+257/-157)
compile (+7/-2)
config.guess (+95/-74)
config.h.in (+3/-3)
config.sub (+42/-40)
configure (+585/-217)
configure.ac (+18/-7)
debian/changelog (+27/-6)
debian/control (+3/-3)
debian/rules (+5/-6)
debian/xfce4-accessibility-settings.1 (+26/-5)
debian/xfce4-appearance-settings.1 (+25/-5)
debian/xfce4-display-settings.1 (+31/-5)
debian/xfce4-keyboard-settings.1 (+26/-6)
debian/xfce4-mime-settings.1 (+21/-2)
debian/xfce4-mouse-settings.1 (+25/-5)
debian/xfce4-settings-editor.1 (+26/-6)
debian/xfce4-settings-manager.1 (+25/-5)
debian/xfsettingsd.1 (+35/-2)
depcomp (+215/-204)
dialogs/Makefile.in (+111/-89)
dialogs/accessibility-settings/Makefile.am (+1/-1)
dialogs/accessibility-settings/Makefile.in (+108/-69)
dialogs/accessibility-settings/accessibility-dialog.glade (+183/-79)
dialogs/accessibility-settings/accessibility-dialog_ui.h (+459/-391)
dialogs/appearance-settings/Makefile.am (+1/-1)
dialogs/appearance-settings/Makefile.in (+106/-67)
dialogs/appearance-settings/appearance-dialog.glade (+173/-108)
dialogs/appearance-settings/appearance-dialog_ui.h (+331/-288)
dialogs/appearance-settings/main.c (+48/-8)
dialogs/display-settings/Makefile.am (+1/-1)
dialogs/display-settings/Makefile.in (+108/-69)
dialogs/display-settings/display-dialog.glade (+75/-48)
dialogs/display-settings/display-dialog_ui.h (+151/-137)
dialogs/display-settings/main.c (+23/-2)
dialogs/display-settings/minimal-display-dialog.glade (+10/-0)
dialogs/display-settings/minimal-display-dialog_ui.h (+106/-99)
dialogs/keyboard-settings/Makefile.am (+1/-1)
dialogs/keyboard-settings/Makefile.in (+108/-69)
dialogs/keyboard-settings/command-dialog.c (+48/-12)
dialogs/keyboard-settings/keyboard-dialog.glade (+131/-103)
dialogs/keyboard-settings/keyboard-dialog_ui.h (+478/-462)
dialogs/keyboard-settings/xfce-keyboard-settings.c (+227/-22)
dialogs/mime-settings/Makefile.am (+1/-1)
dialogs/mime-settings/Makefile.in (+108/-69)
dialogs/mouse-settings/Makefile.am (+1/-1)
dialogs/mouse-settings/Makefile.in (+108/-69)
dialogs/mouse-settings/main.c (+30/-2)
dialogs/mouse-settings/mouse-dialog.glade (+137/-82)
dialogs/mouse-settings/mouse-dialog_ui.h (+551/-524)
missing (+150/-265)
mkinstalldirs (+0/-162)
po/ar.po (+479/-370)
po/ast.po (+518/-422)
po/bg.po (+1615/-0)
po/bn.po (+363/-257)
po/ca.po (+641/-975)
po/cs.po (+453/-746)
po/da.po (+0/-1765)
po/de.po (+310/-252)
po/el.po (+659/-553)
po/en_AU.po (+1614/-0)
po/en_GB.po (+0/-1639)
po/es.po (+484/-848)
po/eu.po (+421/-307)
po/fi.po (+663/-522)
po/fr.po (+649/-674)
po/gl.po (+638/-524)
po/he.po (+693/-632)
po/hr.po (+607/-613)
po/hu.po (+409/-309)
po/id.po (+415/-310)
po/is.po (+320/-224)
po/it.po (+629/-838)
po/ja.po (+468/-480)
po/kk.po (+413/-308)
po/ko.po (+600/-439)
po/lt.po (+391/-262)
po/lv.po (+377/-279)
po/nb.po (+375/-260)
po/nl.po (+592/-985)
po/nn.po (+386/-249)
po/pa.po (+334/-246)
po/pl.po (+413/-361)
po/pt.po (+356/-303)
po/pt_BR.po (+559/-586)
po/ro.po (+394/-268)
po/ru.po (+623/-645)
po/si.po (+346/-251)
po/sk.po (+640/-527)
po/sr.po (+490/-372)
po/sv.po (+385/-271)
po/te.po (+375/-254)
po/th.po (+1613/-0)
po/tr.po (+0/-1957)
po/ug.po (+607/-535)
po/uk.po (+421/-309)
po/ur.po (+364/-268)
po/ur_PK.po (+364/-268)
po/zh_CN.po (+460/-355)
po/zh_TW.po (+610/-620)
xfce4-settings-editor/Makefile.am (+1/-1)
xfce4-settings-editor/Makefile.in (+108/-69)
xfce4-settings-manager/Makefile.am (+3/-1)
xfce4-settings-manager/Makefile.in (+113/-70)
xfce4-settings-manager/main.c (+13/-0)
xfce4-settings-manager/xfce-settings-manager-dialog.c (+30/-10)
xfsettingsd/Makefile.am (+13/-1)
xfsettingsd/Makefile.in (+146/-76)
xfsettingsd/displays-upower.c (+143/-0)
xfsettingsd/displays-upower.h (+38/-0)
xfsettingsd/displays.c (+1097/-574)
xfsettingsd/pointers.c (+21/-17)
xfsettingsd/xsettings.xml (+2/-2)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-settings/4.11.1
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+202372@code.qastaging.launchpad.net

Description of the change

Merge from debian experimental. Needed for xubuntu.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Unmerged revisions

40. By Jackson Doak

* Merge from Debian experimental, remaining changes:
  - debian/patches/xubuntu_vanilla-session-themes.patch: Fix missing gtk and
    icon themes with the vanilla Xfce session.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: