lp:~noskcaj/ubuntu/utopic/xfce4-session/merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/utopic/xfce4-session at revision 82

Sean Davis (community): Approve on 2014-07-21

Ubuntu branches: Pending requested 2014-07-21

Diff: 3504 lines (+515/-2614)

26 files modified

.pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in (+0/-192)
.pc/applied-patches (+0/-5)
.pc/xflock4-light-locker-support.patch/scripts/xflock4 (+0/-50)
.pc/xubuntu_ignore-gdm-lang.patch/xfce4-session/main.c (+0/-334)
.pc/xubuntu_runtime-logind-support.patch/configure.ac (+0/-216)
.pc/xubuntu_runtime-logind-support.patch/xfce4-session/Makefile.am (+0/-143)
.pc/xubuntu_runtime-logind-support.patch/xfce4-session/xfsm-shutdown.c (+0/-818)
.pc/xubuntu_runtime-logind-support.patch/xfce4-session/xfsm-systemd.c (+0/-229)
.pc/xubuntu_runtime-logind-support.patch/xfce4-session/xfsm-systemd.h (+0/-55)
.pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in (+0/-192)
.pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in (+0/-192)
configure.ac (+4/-4)
debian/changelog (+62/-0)
debian/control (+3/-4)
debian/patches/02_add-dm-tool-to-xflock4.patch (+10/-0)
debian/patches/03_runtime-logind-support.patch (+394/-0)
debian/patches/series (+1/-1)
debian/rules (+6/-6)
scripts/xflock4 (+1/-2)
scripts/xinitrc.in (+0/-6)
scripts/xinitrc.in.in (+1/-7)
xfce4-session/Makefile.am (+4/-2)
xfce4-session/main.c (+8/-0)
xfce4-session/xfsm-shutdown.c (+21/-55)
xfce4-session/xfsm-systemd.c (+0/-85)
xfce4-session/xfsm-systemd.h (+0/-16)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

82. By Jackson Doak on 2014-07-21

* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's
      already an xsession script to do that, and $GDM_LANG might not contain
      a valid locale code.
    + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils,
      export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and
      gnome-menus.
    + debian/patches/xubuntu_runtime-logind-support.patch:
      Check for logind support at runtime
    + xflock4-light-locker-support.patch.
  - Add startxfce4.user-session.upstart
* Drop xubuntu_runtime-logind-support.patch, fixed in debian

81. By Sean Davis on 2014-03-20

debian/control: use xscreensaver or light-locker in recommends
(LP: #1295482)

80. By Jan Henke on 2014-03-18

Update xflock4-light-locker-support.patch to prefer light-locker
over xscreensaver. LP: #1291019

79. By Jackson Doak on 2013-11-24

Add xflock4-light-locker-support.patch. LP: #1254366

78. By Mario Limonciello on 2013-11-12

Add mythbuntu to the list of xsessions to be potentially ran by upstart.

77. By Jackson Doak on 2013-10-31

* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's
      already an xsession script to do that, and $GDM_LANG might not contain
      a valid locale code.
    + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils,
      export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and
      gnome-menus.
    + debian/patches/xubuntu_runtime-logind-support.patch:
      Check for logind support at runtime
  - debian/rules:
    + call xdt-autogen after patching
    + clean up autogenerated files modified by xdt-autogen.
  - debian/control:
    + add build-dep on libpolkit-gobject-1-dev (>= 0.100).
    + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen
      after patching.
    + don't recommend consolekit anymore.

76. By Iain Lane on 2013-10-31

releasing package xfce4-session version 4.10.1-3ubuntu1

75. By Jackson Doak on 2013-10-23

Fix configure override

74. By Jackson Doak on 2013-10-23

* Merge from Debian unstable, remaining Ubuntu changes:
    - debian/patches:
      + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's
        already an xsession script to do that, and $GDM_LANG might not contain
        a valid locale code.
      + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils,
        export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and
        gnome-menus.
      + debian/patches/xubuntu_runtime-logind-support.patch:
        Check for logind support at runtime
    - debian/rules:
      + call xdt-autogen after patching
      + clean up autogenerated files modified by xdt-autogen.
    - debian/control:
      + add build-dep on libpolkit-gobject-1-dev (>= 0.100).
      + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen
        after patching.
      + don't recommend consolekit anymore.

73. By Lionel Le Folgoc on 2013-07-01

* Merge from Debian unstable, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu_ignore-gdm-lang.patch: do not set $LANG to $GDM_LANG, there's
      already an xsession script to do that, and $GDM_LANG might not contain
      a valid locale code.
    + xubuntu_set-xdg-current-desktop.patch: added. Taken from xfce4-utils,
      export XDG_CURRENT_DESKTOP=XFCE, can be useful with alacarte and
      gnome-menus. lp #927172

* debian/patches:
  - xfsm-startup-random-crash.patch: dropped, included in 4.10.1.
  - xubuntu_ignore-gdm-lang.patch: updated to apply cleanly.

* Check for logind support at runtime (lp: #1178373):
  - debian/patches/xubuntu_runtime-logind-support.patch: added.
  - debian/rules:
    + call xdt-autogen after patching
    + clean up autogenerated files modified by xdt-autogen.
  - debian/control:
    + add build-dep on libpolkit-gobject-1-dev (>= 0.100).
    + add build-dep on xfce4-dev-tools and libtool in order to run xdt-autogen
      after patching.
    + don't recommend consolekit anymore.