Merge lp:~darkxst/gnome-session/wayland-split into lp:~ubuntu-desktop/gnome-session/ubuntu

[Tim Lunn]

this branch includes that last upload to archvies, that wasn't committed to bzr

[lp:~darkxst/gnome-session/wayland-split]

324. By Tim Lunn on 2015-01-24

make architecture linux-any

325. By Tim Lunn on 2015-01-25

fix lintian not-binmuable warning

326. By Tim Lunn on 2015-01-26

Add bug ref

[Robert Ancell (robert-ancell)]

Thanks Tim!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-31 08:19:58 +0000
+++ debian/changelog	2015-01-26 01:56:12 +0000
@@ -1,3 +1,17 @@
+gnome-session (3.14.0-2ubuntu3) vivid; urgency=medium
+
+  * Split wayland session into gnome-session-wayland (LP: #247500)
+    - control.in: add gnome-session-wayland package and depend on xwayland
+    - gnome-session-wayland.install: install wayland session
+
+ -- Tim Lunn <[e-mail]>  Fri, 09 Jan 2015 16:33:51 +1100
+
+gnome-session (3.14.0-2ubuntu2) vivid; urgency=medium
+
+  * debian/control.in: Remove circular gnome-shell dep to ease upgrades.
+
+ -- Adam Conrad <[e-mail]>  Fri, 31 Oct 2014 18:01:05 -0600
+
 gnome-session (3.14.0-2ubuntu1) vivid; urgency=medium
 
   * Merge from Debian, Remaining Changes:
 
=== modified file 'debian/control'
--- debian/control	2014-10-31 08:11:23 +0000
+++ debian/control	2015-01-26 01:56:12 +0000
@@ -42,7 +42,6 @@
 Architecture: all
 Depends: ${misc:Depends},
          gnome-settings-daemon (>= 3.0),
-         gnome-shell (>= 3.0),
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion}),
          gnome-session-common (= ${binary:Version})
@@ -68,6 +67,28 @@
  session, based on the GNOME Shell. It can be started from a display
  manager such as GDM, and requires 3D acceleration to work properly.
 
+Package: gnome-session-wayland
+Architecture: any
+Depends: ${misc:Depends},
+         gnome-settings-daemon (>= 3.0),
+         gnome-session-bin (>= ${binary:Version}),
+         gnome-session-bin (<< ${gnome:NextVersion}),
+         gnome-session-common (= ${binary:Version}),
+         xwayland [linux-any]
+Recommends: session-migration
+Breaks: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
+Replaces: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
+Provides: x-session-manager
+Description: GNOME Session Manager - GNOME 3 session
+ The GNOME Session Manager is in charge of starting the core components
+ of the GNOME desktop, and applications that should be launched at
+ login time. It also features a way to save and restore currently
+ running applications.
+ .
+ This package contains the required components for the wayland GNOME 3
+ session, based on the GNOME Shell. It can be started from a display
+ manager such as GDM, and requires 3D acceleration to work properly.
+
 Package: ubuntu-session
 Architecture: all
 Depends: ${misc:Depends},
@@ -92,7 +113,6 @@
          dbus-x11,
          gsettings-desktop-schemas,
          upower (>= 0.9.0),
-#         xwayland [linux-any]
 Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
 Breaks: gdm (<< 3.8)
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-10-31 04:29:34 +0000
+++ debian/control.in	2015-01-26 01:56:12 +0000
@@ -38,7 +38,6 @@
 Architecture: all
 Depends: ${misc:Depends},
          gnome-settings-daemon (>= 3.0),
-         gnome-shell (>= 3.0),
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion}),
          gnome-session-common (= ${binary:Version})
@@ -64,6 +63,28 @@
  session, based on the GNOME Shell. It can be started from a display
  manager such as GDM, and requires 3D acceleration to work properly.
 
+Package: gnome-session-wayland
+Architecture: linux-any
+Depends: ${misc:Depends},
+         gnome-settings-daemon (>= 3.0),
+         gnome-session-bin (>= ${binary:Version}),
+         gnome-session-bin (<< ${gnome:NextVersion}),
+         gnome-session-common (= ${source:Version}),
+         xwayland
+Recommends: session-migration
+Breaks: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
+Replaces: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
+Provides: x-session-manager
+Description: GNOME Session Manager - GNOME 3 session
+ The GNOME Session Manager is in charge of starting the core components
+ of the GNOME desktop, and applications that should be launched at
+ login time. It also features a way to save and restore currently
+ running applications.
+ .
+ This package contains the required components for the wayland GNOME 3
+ session, based on the GNOME Shell. It can be started from a display
+ manager such as GDM, and requires 3D acceleration to work properly.
+
 Package: ubuntu-session
 Architecture: all
 Depends: ${misc:Depends},
@@ -88,7 +109,6 @@
          dbus-x11,
          gsettings-desktop-schemas,
          upower (>= 0.9.0),
-#         xwayland [linux-any]
 Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
 Breaks: gdm (<< 3.8)
 
=== added file 'debian/gnome-session-wayland.install'
--- debian/gnome-session-wayland.install	1970-01-01 00:00:00 +0000
+++ debian/gnome-session-wayland.install	2015-01-26 01:56:12 +0000
@@ -0,0 +1,2 @@
+usr/share/gnome-session/sessions/gnome-wayland.session
+usr/share/wayland-sessions/gnome-wayland.desktop
 
=== modified file 'debian/gnome-session.install'
--- debian/gnome-session.install	2014-10-31 04:29:34 +0000
+++ debian/gnome-session.install	2015-01-26 01:56:12 +0000
@@ -1,5 +1,3 @@
 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