lp://qastaging/~noskcaj/ubuntu/trusty/xfce4-session/4.10.1-3

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntu/trusty/xfce4-session at revision 75

Ubuntu branches: Pending requested 2013-10-23

Diff: 413 lines (+291/-9)

14 files modified

.pc/01_fix-xrdb-call.patch/scripts/xinitrc.in.in (+192/-0)
.pc/applied-patches (+1/-0)
.pc/xubuntu_set-xdg-current-desktop.patch/scripts/xinitrc.in.in (+1/-1)
debian/55xfce4-session (+18/-0)
debian/changelog (+53/-0)
debian/control (+3/-3)
debian/defaults.list (+1/-0)
debian/patches/01_fix-xrdb-call.patch (+11/-0)
debian/patches/series (+1/-0)
debian/rules (+4/-4)
debian/xfce4-session.dirs (+2/-0)
debian/xfce4-session.install (+2/-0)
debian/xfce4-session.links (+1/-0)
scripts/xinitrc.in.in (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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.

72. By Stéphane Graber on 2013-06-03

Update startxfce4 job to also start for ubuntu-studio.

71. By Stéphane Graber on 2013-05-31

Add startxfce4 upstart user job to xfce4-session.

70. By Ricardo F. Teixeira on 2013-05-01

debian/patches/xfsm-startup-random-crash.patch: added. Fix random crashes. lp: #1104435

69. By Lionel Le Folgoc on 2012-11-09

* Merge from Debian experimental, 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

* Drop now obsolete delta wrt to gnome-keyring integration. lp: #1010409
* The patch added by the Debian upload fixes lp: #978333.

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

* Merge from Debian experimental, remaining Ubuntu changes:
  - debian/control: build-depends on libgnome-keyring-dev to enable GNOME
    Keyring services support.
  - debian/rules: pass --enable-libgnome-keyring to dh_auto_configure.
  - 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.

* debian/patches:
  - 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

67. By Lionel Le Folgoc on 2012-05-17

* Merge from Debian testing, remaining Ubuntu changes:
  - debian/control: build-depends on libgconf2-dev and libgnome-keyring-dev
    to enable GNOME services support.
  - debian/rules: pass --enable-gnome --enable-libgnome-keyring to
    dh_auto_configure.
  - debian/patches:
    + xubuntu_lock-the-screen-on-hibernate-suspend.patch: copy the behavior
      of xfce4-power-manager for consistency.
    + 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.

66. By Colin Watson on 2012-02-14

Use maintscript support in dh_installdeb rather than writing out
dpkg-maintscript-helper commands by hand. This adds a Pre-Dependency on
a sufficient version of dpkg.