Merge lp:~ted/unity8-desktop-session/snap-session into lp:unity8-desktop-session

[Ted Gould]

Add a Unity8 Session that is contained in a snap

There once was a session *snap* *snap*
That didn't have desktop features early enough to make project management happy *snap* *snap*
So they had to come up with other shipping solutions *snap* *snap*
And this MR is part of that *snap* *snap*

[Stephen M. Webb (bregma)]

I'd like to see a couple of changes, see inline comments.

review: Needs Fixing

[Christopher Townsend (townsend)]

Maybe call the script unity8-snap-install to differentiate that it is for installing the U8 snap session.

Also, although not necessary, but I think a small manpage just explaining what the unity8(-snap)-install script is doing would be nice. Plus, that would get lintian off our back for this:)

[Christopher Townsend (townsend)]

I built the package, added a local apt repository with the 3 debs generated, then tried to install unity8-session-snap and apt wants to remove the following packages:

The following packages will be REMOVED:
  dbus-user-session ubuntu-desktop ubuntu-session unity8-desktop-session

I don't thikn we want the ubuntu-desktop task and ubuntu-session packages removed. This is due to the Conflicts of dbus-user-session. I don't entirely understand why that is a Conflicts...

review: Needs Information

[lp:~ted/unity8-desktop-session/snap-session]

102. By Ted Gould on 2016-10-06

Catching up to trunk

103. By Ted Gould on 2016-10-06

Putting on different lines

104. By Ted Gould on 2016-10-06

Use dash instead of bash

105. By Ted Gould on 2016-10-06

Changing name to unity8-snap-install

106. By Ted Gould on 2016-10-06

Adding a man page

[Ted Gould (ted)]

Updated from comments.

Yes, we don't want it to conflict long term, that's where things are today. We need to fix the snap before we can remove those.

[lp:~ted/unity8-desktop-session/snap-session]

107. By Ted Gould on 2016-10-06

Don't conflict with user session

[Christopher Townsend (townsend)]

Quicky inline nitpick. Will try it out soon.

[lp:~ted/unity8-desktop-session/snap-session]

108. By Ted Gould on 2016-10-18

Removing comma

[Stephen M. Webb (bregma)]

review: Approve

[lp:~ted/unity8-desktop-session/snap-session]

109. By Ted Gould on 2016-10-25

New icon for the snap

110. By Ted Gould on 2016-10-25

Comment out conflicts for now

[Ted Gould (ted)]

Removed the conflicts until the snap becomes more usable. Changed the icon so you can tell the difference. Both for zesty until the snap becomes a useful solution.

[Christopher Townsend (townsend)]

Ok, approving and we'll let it all shake out.

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2013-11-26 21:07:31 +0000
+++ Makefile.am	2016-10-25 16:11:22 +0000
@@ -17,5 +17,5 @@
 
 AM_MAKEFLAGS = --no-print-directory
 
-SUBDIRS = data
+SUBDIRS = data scripts
 EXTRA_DIST = autogen.sh

=== modified file 'configure.ac'
--- configure.ac	2016-02-11 15:29:21 +0000
+++ configure.ac	2016-10-25 16:11:22 +0000
@@ -25,4 +25,6 @@
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([data/Makefile])
+AC_CONFIG_FILES([scripts/Makefile])
+
 AC_OUTPUT

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2016-07-14 14:26:54 +0000
+++ data/Makefile.am	2016-10-25 16:11:22 +0000
@@ -24,13 +24,15 @@
 	sensors.txt
 
 dist_icon_DATA = \
-	custom_unity8_badge.png
+	custom_unity8_badge.png \
+	custom_unity8-snap_badge.png
 
 dist_lightdm_conf_DATA = \
 	45-unity8.conf
 
 dist_lightdm_session_DATA = \
-	unity8.desktop
+	unity8.desktop \
+	unity8-snap.desktop
 
 dist_bin_SCRIPTS = \
 	lightdm-unity8-session

=== added file 'data/custom_unity8-snap_badge.png'
Binary files data/custom_unity8-snap_badge.png	1970-01-01 00:00:00 +0000 and data/custom_unity8-snap_badge.png	2016-10-25 16:11:22 +0000 differ
=== added file 'data/unity8-snap.desktop'
--- data/unity8-snap.desktop	1970-01-01 00:00:00 +0000
+++ data/unity8-snap.desktop	2016-10-25 16:11:22 +0000
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Unity8
+Exec=/snap/bin/unity8-session
+TryExec=/snap/bin/unity8-session
+Type=Application
+X-LightDM-Session-Type=mir

=== modified file 'debian/control'
--- debian/control	2016-09-28 13:56:39 +0000
+++ debian/control	2016-10-25 16:11:22 +0000
@@ -10,7 +10,9 @@
 
 Package: unity8-desktop-session
 Architecture: all
-Conflicts: ubuntu-desktop-mir
+Conflicts: ubuntu-desktop-mir,
+#           unity8-session-snap
+# Remove conflicts while in development
 Replaces: unity8-desktop-session-mir (<< 1.0.13)
 Breaks: unity8-desktop-session-mir (<< 1.0.13)
 Depends: mir-graphics-drivers-desktop,
@@ -45,3 +47,19 @@
 Priority: extra
 Description: transitional dummy package
  This is a transitional dummy package.  It can safely be removed.
+
+Package: unity8-session-snap
+Architecture: all
+# Conflicts: unity8-desktop-session
+# Remove conflicts while in development
+Depends: lightdm,
+         mir-graphics-drivers-desktop,
+         snapd,
+         unity-system-compositor,
+         ${misc:Depends}
+Description: Unity8 session from a Snap
+ Provides the files to setup LightDM to run a Snap based Unity8
+ session. It also, as part of it's execution, installs that snap.
+ .
+ This package is provided for evaluation and demonstration purposes only.
+

=== added file 'debian/unity8-session-snap.install'
--- debian/unity8-session-snap.install	1970-01-01 00:00:00 +0000
+++ debian/unity8-session-snap.install	2016-10-25 16:11:22 +0000
@@ -0,0 +1,4 @@
+usr/share/lightdm/sessions/unity8-snap.desktop
+usr/share/unity-greeter/custom_unity8-snap_badge.png
+usr/share/man/man1/unity8-snap-install.*
+usr/bin/unity8-snap-install

=== added directory 'scripts'
=== added file 'scripts/Makefile.am'
--- scripts/Makefile.am	1970-01-01 00:00:00 +0000
+++ scripts/Makefile.am	2016-10-25 16:11:22 +0000
@@ -0,0 +1,22 @@
+# This file is part of Unity8-session, a desktop session configration
+# package.
+#
+# Copyright 2016 Canonical Ltd.
+# 
+# unity8-desktop-session is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published by
+# the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranties of MERCHANTABILITY, SATISFACTORY
+# QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+# License for more details.
+# 
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+
+dist_bin_SCRIPTS = \
+	unity8-snap-install
+
+dist_man_MANS = \
+	unity8-snap-install.1

=== added file 'scripts/unity8-snap-install'
--- scripts/unity8-snap-install	1970-01-01 00:00:00 +0000
+++ scripts/unity8-snap-install	2016-10-25 16:11:22 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ -f ~/.snap/auth.json ] ; then
+	snap install --devmode --channel=edge unity8-session
+else
+	sudo snap install --devmode --channel=edge unity8-session
+fi

=== added file 'scripts/unity8-snap-install.1'
--- scripts/unity8-snap-install.1	1970-01-01 00:00:00 +0000
+++ scripts/unity8-snap-install.1	2016-10-25 16:11:22 +0000
@@ -0,0 +1,9 @@
+.TH unity8-snap-install "1" "Oct 2016" "unity8-snap-install 1.0.13" "User Commands"
+
+.SH NAME
+unity8-snap-install \- install the Unity8 session snap from snap store
+
+.SH DESCRIPTION
+usage: unity8\-snap\-install
+.PP
+Install the Unity8 session snap with the proper arguments passed to the snap command