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
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-10-31 08:19:58 +0000
3+++ debian/changelog 2015-01-26 01:56:12 +0000
4@@ -1,3 +1,17 @@
5+gnome-session (3.14.0-2ubuntu3) vivid; urgency=medium
6+
7+ * Split wayland session into gnome-session-wayland (LP: #247500)
8+ - control.in: add gnome-session-wayland package and depend on xwayland
9+ - gnome-session-wayland.install: install wayland session
10+
11+ -- Tim Lunn <tim@feathertop.org> Fri, 09 Jan 2015 16:33:51 +1100
12+
13+gnome-session (3.14.0-2ubuntu2) vivid; urgency=medium
14+
15+ * debian/control.in: Remove circular gnome-shell dep to ease upgrades.
16+
17+ -- Adam Conrad <adconrad@ubuntu.com> Fri, 31 Oct 2014 18:01:05 -0600
18+
19 gnome-session (3.14.0-2ubuntu1) vivid; urgency=medium
20
21 * Merge from Debian, Remaining Changes:
22
23=== modified file 'debian/control'
24--- debian/control 2014-10-31 08:11:23 +0000
25+++ debian/control 2015-01-26 01:56:12 +0000
26@@ -42,7 +42,6 @@
27 Architecture: all
28 Depends: ${misc:Depends},
29 gnome-settings-daemon (>= 3.0),
30- gnome-shell (>= 3.0),
31 gnome-session-bin (>= ${binary:Version}),
32 gnome-session-bin (<< ${gnome:NextVersion}),
33 gnome-session-common (= ${binary:Version})
34@@ -68,6 +67,28 @@
35 session, based on the GNOME Shell. It can be started from a display
36 manager such as GDM, and requires 3D acceleration to work properly.
37
38+Package: gnome-session-wayland
39+Architecture: any
40+Depends: ${misc:Depends},
41+ gnome-settings-daemon (>= 3.0),
42+ gnome-session-bin (>= ${binary:Version}),
43+ gnome-session-bin (<< ${gnome:NextVersion}),
44+ gnome-session-common (= ${binary:Version}),
45+ xwayland [linux-any]
46+Recommends: session-migration
47+Breaks: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
48+Replaces: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
49+Provides: x-session-manager
50+Description: GNOME Session Manager - GNOME 3 session
51+ The GNOME Session Manager is in charge of starting the core components
52+ of the GNOME desktop, and applications that should be launched at
53+ login time. It also features a way to save and restore currently
54+ running applications.
55+ .
56+ This package contains the required components for the wayland GNOME 3
57+ session, based on the GNOME Shell. It can be started from a display
58+ manager such as GDM, and requires 3D acceleration to work properly.
59+
60 Package: ubuntu-session
61 Architecture: all
62 Depends: ${misc:Depends},
63@@ -92,7 +113,6 @@
64 dbus-x11,
65 gsettings-desktop-schemas,
66 upower (>= 0.9.0),
67-# xwayland [linux-any]
68 Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
69 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
70 Breaks: gdm (<< 3.8)
71
72=== modified file 'debian/control.in'
73--- debian/control.in 2014-10-31 04:29:34 +0000
74+++ debian/control.in 2015-01-26 01:56:12 +0000
75@@ -38,7 +38,6 @@
76 Architecture: all
77 Depends: ${misc:Depends},
78 gnome-settings-daemon (>= 3.0),
79- gnome-shell (>= 3.0),
80 gnome-session-bin (>= ${binary:Version}),
81 gnome-session-bin (<< ${gnome:NextVersion}),
82 gnome-session-common (= ${binary:Version})
83@@ -64,6 +63,28 @@
84 session, based on the GNOME Shell. It can be started from a display
85 manager such as GDM, and requires 3D acceleration to work properly.
86
87+Package: gnome-session-wayland
88+Architecture: linux-any
89+Depends: ${misc:Depends},
90+ gnome-settings-daemon (>= 3.0),
91+ gnome-session-bin (>= ${binary:Version}),
92+ gnome-session-bin (<< ${gnome:NextVersion}),
93+ gnome-session-common (= ${source:Version}),
94+ xwayland
95+Recommends: session-migration
96+Breaks: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
97+Replaces: gnome-session (<< 3.14.0-2ubuntu3~vivid2)
98+Provides: x-session-manager
99+Description: GNOME Session Manager - GNOME 3 session
100+ The GNOME Session Manager is in charge of starting the core components
101+ of the GNOME desktop, and applications that should be launched at
102+ login time. It also features a way to save and restore currently
103+ running applications.
104+ .
105+ This package contains the required components for the wayland GNOME 3
106+ session, based on the GNOME Shell. It can be started from a display
107+ manager such as GDM, and requires 3D acceleration to work properly.
108+
109 Package: ubuntu-session
110 Architecture: all
111 Depends: ${misc:Depends},
112@@ -88,7 +109,6 @@
113 dbus-x11,
114 gsettings-desktop-schemas,
115 upower (>= 0.9.0),
116-# xwayland [linux-any]
117 Recommends: libpam-systemd [linux-any], consolekit [!linux-any]
118 Conflicts: gnome-session (<< 3.9.90-0ubuntu8)
119 Breaks: gdm (<< 3.8)
120
121=== added file 'debian/gnome-session-wayland.install'
122--- debian/gnome-session-wayland.install 1970-01-01 00:00:00 +0000
123+++ debian/gnome-session-wayland.install 2015-01-26 01:56:12 +0000
124@@ -0,0 +1,2 @@
125+usr/share/gnome-session/sessions/gnome-wayland.session
126+usr/share/wayland-sessions/gnome-wayland.desktop
127
128=== modified file 'debian/gnome-session.install'
129--- debian/gnome-session.install 2014-10-31 04:29:34 +0000
130+++ debian/gnome-session.install 2015-01-26 01:56:12 +0000
131@@ -1,5 +1,3 @@
132 usr/share/doc
133 usr/share/xsessions/gnome.desktop
134 usr/share/gnome-session/sessions/gnome.session
135-#usr/share/gnome-session/sessions/gnome-wayland.session
136-#usr/share/wayland-sessions/gnome-wayland.desktop

Subscribers

People subscribed via source and target branches

to all changes: