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

Proposed by Tim Lunn on 2015-01-24
Status: Merged
Merged at revision: 322
Proposed branch: lp:~darkxst/gnome-session/wayland-split
Merge into: lp:~ubuntu-desktop/gnome-session/ubuntu
Diff against target: 136 lines (+60/-6)
5 files modified
debian/changelog (+14/-0)
debian/control (+22/-2)
debian/control.in (+22/-2)
debian/gnome-session-wayland.install (+2/-0)
debian/gnome-session.install (+0/-2)
To merge this branch: bzr merge lp:~darkxst/gnome-session/wayland-split
Reviewer Review Type Date Requested Status
Robert Ancell 2015-01-24 Approve on 2015-02-01
Review via email: mp+247500@code.launchpad.net

Description of the change

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

To post a comment you must log in.
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) wrote :

Thanks Tim!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1gnome-session (3.14.0-2ubuntu3) vivid; urgency=medium
2
3 * Split wayland session into gnome-session-wayland (LP: #247500)
4 - control.in: add gnome-session-wayland package and depend on xwayland
5 - gnome-session-wayland.install: install wayland session
6
7 -- Tim Lunn <tim@feathertop.org> Fri, 09 Jan 2015 16:33:51 +1100
8
9gnome-session (3.14.0-2ubuntu2) vivid; urgency=medium
10
11 * debian/control.in: Remove circular gnome-shell dep to ease upgrades.
12
13 -- Adam Conrad <adconrad@ubuntu.com> Fri, 31 Oct 2014 18:01:05 -0600
14
1gnome-session (3.14.0-2ubuntu1) vivid; urgency=medium15gnome-session (3.14.0-2ubuntu1) vivid; urgency=medium
216
3 * Merge from Debian, Remaining Changes:17 * Merge from Debian, Remaining Changes:
418
=== 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 @@
42Architecture: all42Architecture: all
43Depends: ${misc:Depends},43Depends: ${misc:Depends},
44 gnome-settings-daemon (>= 3.0),44 gnome-settings-daemon (>= 3.0),
45 gnome-shell (>= 3.0),
46 gnome-session-bin (>= ${binary:Version}),45 gnome-session-bin (>= ${binary:Version}),
47 gnome-session-bin (<< ${gnome:NextVersion}),46 gnome-session-bin (<< ${gnome:NextVersion}),
48 gnome-session-common (= ${binary:Version})47 gnome-session-common (= ${binary:Version})
@@ -68,6 +67,28 @@
68 session, based on the GNOME Shell. It can be started from a display67 session, based on the GNOME Shell. It can be started from a display
69 manager such as GDM, and requires 3D acceleration to work properly.68 manager such as GDM, and requires 3D acceleration to work properly.
7069
70Package: gnome-session-wayland
71Architecture: any
72Depends: ${misc:Depends},
73 gnome-settings-daemon (>= 3.0),
74 gnome-session-bin (>= ${binary:Version}),
75 gnome-session-bin (<< ${gnome:NextVersion}),
76 gnome-session-common (= ${binary:Version}),
77 xwayland [linux-any]
78Recommends: session-migration
79Breaks: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
80Replaces: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
81Provides: x-session-manager
82Description: GNOME Session Manager - GNOME 3 session
83 The GNOME Session Manager is in charge of starting the core components
84 of the GNOME desktop, and applications that should be launched at
85 login time. It also features a way to save and restore currently
86 running applications.
87 .
88 This package contains the required components for the wayland GNOME 3
89 session, based on the GNOME Shell. It can be started from a display
90 manager such as GDM, and requires 3D acceleration to work properly.
91
71Package: ubuntu-session92Package: ubuntu-session
72Architecture: all93Architecture: all
73Depends: ${misc:Depends},94Depends: ${misc:Depends},
@@ -92,7 +113,6 @@
92 dbus-x11,113 dbus-x11,
93 gsettings-desktop-schemas,114 gsettings-desktop-schemas,
94 upower (>= 0.9.0),115 upower (>= 0.9.0),
95# xwayland [linux-any]
96Recommends: libpam-systemd [linux-any], consolekit [!linux-any]116Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
97Conflicts: gnome-session (<< 3.9.90-0ubuntu8)117Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
98Breaks: gdm (<< 3.8)118Breaks: gdm (<< 3.8)
99119
=== 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 @@
38Architecture: all38Architecture: all
39Depends: ${misc:Depends},39Depends: ${misc:Depends},
40 gnome-settings-daemon (>= 3.0),40 gnome-settings-daemon (>= 3.0),
41 gnome-shell (>= 3.0),
42 gnome-session-bin (>= ${binary:Version}),41 gnome-session-bin (>= ${binary:Version}),
43 gnome-session-bin (<< ${gnome:NextVersion}),42 gnome-session-bin (<< ${gnome:NextVersion}),
44 gnome-session-common (= ${binary:Version})43 gnome-session-common (= ${binary:Version})
@@ -64,6 +63,28 @@
64 session, based on the GNOME Shell. It can be started from a display63 session, based on the GNOME Shell. It can be started from a display
65 manager such as GDM, and requires 3D acceleration to work properly.64 manager such as GDM, and requires 3D acceleration to work properly.
6665
66Package: gnome-session-wayland
67Architecture: linux-any
68Depends: ${misc:Depends},
69 gnome-settings-daemon (>= 3.0),
70 gnome-session-bin (>= ${binary:Version}),
71 gnome-session-bin (<< ${gnome:NextVersion}),
72 gnome-session-common (= ${source:Version}),
73 xwayland
74Recommends: session-migration
75Breaks: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
76Replaces: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
77Provides: x-session-manager
78Description: GNOME Session Manager - GNOME 3 session
79 The GNOME Session Manager is in charge of starting the core components
80 of the GNOME desktop, and applications that should be launched at
81 login time. It also features a way to save and restore currently
82 running applications.
83 .
84 This package contains the required components for the wayland GNOME 3
85 session, based on the GNOME Shell. It can be started from a display
86 manager such as GDM, and requires 3D acceleration to work properly.
87
67Package: ubuntu-session88Package: ubuntu-session
68Architecture: all89Architecture: all
69Depends: ${misc:Depends},90Depends: ${misc:Depends},
@@ -88,7 +109,6 @@
88 dbus-x11,109 dbus-x11,
89 gsettings-desktop-schemas,110 gsettings-desktop-schemas,
90 upower (>= 0.9.0),111 upower (>= 0.9.0),
91# xwayland [linux-any]
92Recommends: libpam-systemd [linux-any], consolekit [!linux-any]112Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
93Conflicts: gnome-session (<< 3.9.90-0ubuntu8)113Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
94Breaks: gdm (<< 3.8)114Breaks: gdm (<< 3.8)
95115
=== 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 @@
1usr/share/gnome-session/sessions/gnome-wayland.session
2usr/share/wayland-sessions/gnome-wayland.desktop
03
=== 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 @@
1usr/share/doc1usr/share/doc
2usr/share/xsessions/gnome.desktop2usr/share/xsessions/gnome.desktop
3usr/share/gnome-session/sessions/gnome.session3usr/share/gnome-session/sessions/gnome.session
4#usr/share/gnome-session/sessions/gnome-wayland.session
5#usr/share/wayland-sessions/gnome-wayland.desktop

Subscribers

People subscribed via source and target branches

to all changes: