r42303 - in /desktop/experimental/gnome-session: ./ debian/changelog debian/control.in debian/defaults.list debian/gnome-session.install

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Aug 27 09:53:04 2014
New Revision: 42303

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42303
Log:
Merge 3.12.1-4

Modified:
    desktop/experimental/gnome-session/   (props changed)
    desktop/experimental/gnome-session/debian/changelog
    desktop/experimental/gnome-session/debian/control.in
    desktop/experimental/gnome-session/debian/defaults.list   (props changed)
    desktop/experimental/gnome-session/debian/gnome-session.install

Propchange: desktop/experimental/gnome-session/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/unstable/gnome-session:42124

Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=42303&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/changelog	[utf-8] Wed Aug 27 09:53:04 2014
@@ -7,6 +7,13 @@
   * Fix typos in defaults.list. Closes: #759429.
 
  -- Andreas Henriksson <andreas at fatal.se>  Mon, 25 Aug 2014 17:28:45 -0700
+
+gnome-session (3.12.1-4) experimental; urgency=medium
+
+  * gnome-session: Install wayland session files.
+  * gnome-session-bin: add xwayland dependency on linux-any.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sat, 02 Aug 2014 17:22:46 +0200
 
 gnome-session (3.12.1-3) unstable; urgency=medium
 

Modified: desktop/experimental/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control.in?rev=42303&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control.in	[utf-8] Wed Aug 27 09:53:04 2014
@@ -69,7 +69,8 @@
          ${misc:Depends},
          dbus-x11,
          gsettings-desktop-schemas,
-         upower (>= 0.9.0)
+         upower (>= 0.9.0),
+         xwayland [linux-any]
 Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
 Conflicts: gnome-session (<< 2.26.1-5)
 Breaks: gdm3 (<< 3.8)

Propchange: desktop/experimental/gnome-session/debian/defaults.list
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Aug 27 09:53:04 2014
@@ -0,0 +1 @@
+/desktop/unstable/gnome-session/debian/defaults.list:42124

Modified: desktop/experimental/gnome-session/debian/gnome-session.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session.install?rev=42303&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session.install	[utf-8] (original)
+++ desktop/experimental/gnome-session/debian/gnome-session.install	[utf-8] Wed Aug 27 09:53:04 2014
@@ -1,3 +1,5 @@
 usr/share/doc
 usr/share/xsessions/gnome.desktop
 usr/share/gnome-session/sessions/gnome.session
+usr/share/gnome-session/sessions/gnome-wayland.session
+usr/share/wayland-sessions/gnome-wayland.desktop