lp:~noskcaj/ubuntu/trusty/xfce4-settings/4.11.1

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/trusty/xfce4-settings

Daniel Holbach (community): Approve on 2014-01-23

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

40. By Jackson Doak on 2014-01-20

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

39. By Micah Gersten on 2013-08-28

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

38. By Logan Rosen on 2013-06-25

* Merge from Debian unstable. Remaining changes:
  - debian/patches/xubuntu_vanilla-session-themes.patch: Fix missing gtk and
    icon themes with the vanilla Xfce session.
* debian/patches/04_fix-crash-without-xi.patch: Drop, as it was applied in
  Debian.

37. By Logan Rosen on 2013-05-24

* Merge from Debian unstable. Remaining changes:
  - debian/patches:
    + 04_fix-crash-without-xi.patch: Fix xfsettingsd crash when
      XGetExtensionVersion () returns NoSuchExtension.
    + xubuntu_vanilla-session-themes.patch: Fix missing gtk and icon themes
      with the vanilla Xfce session.
* debian/patches:
  - 02_fix-gtk3-theme-detection.patch, 03_check-service-name.patch: Drop, as
    they were applied upstream.

36. By Lionel Le Folgoc on 2012-10-29

* debian/patches:
  - 04_fix-crash-without-xi.patch: fix xfsettingsd crash when
    XGetExtensionVersion () returns NoSuchExtension. lp: #354830

35. By Lionel Le Folgoc on 2012-09-09

* debian/patches:
  - 02_fix-gtk3-theme-detection.patch: fix Gtk+3 theme detection in theme
    archives. lp: #1042247
  - 03_check-service-name.patch: check that NameOwnerChanged signals are
    really intended for xfsettingsd (should hopefully fix unthemed/black
    ubiquity windows). lp: #1010487

34. By Lionel Le Folgoc on 2012-05-18

* Merge from Debian experimental, remaining Ubuntu change:
  - debian/patches/xubuntu_vanilla-session-themes.patch: fix missing gtk and
    icon themes with the vanilla Xfce session. lp #947603

33. By Lionel Le Folgoc on 2012-03-13

* debian/patches:
  - xubuntu_vanilla-session-themes.patch: fix missing gtk and icon themes
    with the vanilla Xfce session. lp: #947603

32. By Lionel Le Folgoc on 2012-02-04

* debian/patches:
  - 02_fix-error-in-italian-translation.patch: added, because translating
    %i to %s isn't a really good idea (fix crash in the confirmation dialog
    of xfce4-display-settings). lp: #782634
  - xubuntu_set-lcdfilter.patch: added, set Xft.Lcdfilter when the
    "/Xft/Lcdfilter" xfconf key is present (xfsettingsd 4.9.x already
    does that).

31. By Lionel Le Folgoc on 2012-01-23

* debian/control: add xfce4-dev-tools, autoconf, automake and libtool
  to build-depends, needed for xdt-autogen, and exo-utils, needed for
  exo-csource.
* debian/rules: run xdt-autogen before configure, and clean up autogenerated
  files after build.
* debian/patches:
  - xubuntu_improved-mouse-touchpad-dialog.patch: added, backport the new
    pointing device dialog from master. lp: #818131
  - xubuntu_refreshed-translations.patch: added, new translations taken
    from master.