lp://staging/~ricardo.teixas/ubuntu/raring/xfce4-session/fix-for-1104435

Created by Ricardo F. Teixeira and last modified
Get this branch:
bzr branch lp://staging/~ricardo.teixas/ubuntu/raring/xfce4-session/fix-for-1104435
Only Ricardo F. Teixeira can upload to this branch. If you are Ricardo F. Teixeira please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ricardo F. Teixeira
Status:
Development

Recent revisions

70. By Ricardo F. Teixeira

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

69. By Lionel Le Folgoc

* 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

* 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

* 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

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.

65. By Lionel Le Folgoc

* New upstream bugfix release.
* debian/rules:
  - use debhelper 9 hardening support.
* Fix paths for multiarch dirs.
* debian/compat bumped to 9.
* debian/control:
  - drop hardening-includes build-dep.
  - update debhelper build-dep to 9 for hardening support.
  - add dpkg-dev 1.16.1 build-dep for hardening support.
  - pre-depends on multiarch-support.

64. By Lionel Le Folgoc

* Merge 4.8.2-2 from Debian testing to harmonize patches, and 4.8.2-3 from
  unstable for the small prerm fix, 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.

* debian/xfce4-autostart-editor.1, debian/manpages: dropped, the binary
  doesn't exist on Xfce 4.6 and later. lp: #911688
* debian/patches:
  - 0001-Do-not-always-save-session-with-xfce4-logout-plugin-.patch: dropped,
    identical to 03_respect-save-settings-logout-plugin.patch.
  - xubuntu_lock-the-screen-on-hibernate-suspend.patch: updated to read the
    'lock-screen-suspend-hibernate' xfconf key from xfpm to avoid locking
    the screen on suspend/hibernate when the user disabled the feature.

63. By Lionel Le Folgoc

* Merge from Debian unstable, 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:
    + 0001-Do-not-always-save-session-with-xfce4-logout-plugin-.patch: let the
      logout panel plugin use the /general/SaveOnExit property. lp: #831772
    + 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.
    + series: apply these patches.
* debian/patches/xubuntu_ignore-gdm-lang.patch: refreshed to apply cleanly.
* This new bugfix release includes updated translations. lp: #781056

62. By Lionel Le Folgoc

* debian/patches:
  - 0001-Do-not-always-save-session-with-xfce4-logout-plugin-.patch: let
    the logout panel plugin use the /general/SaveOnExit property. lp: #831772
  - series: enable it.

61. By Lionel Le Folgoc

* Merge from Debian unstable for the FTBFS fix, 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.
    + series: apply these patches.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp://staging/ubuntu/saucy/xfce4-session
This branch contains Public information 
Everyone can see this information.