Merge lp:~bregma/unity8-desktop-session/lp-1296733 into lp:unity8-desktop-session

[Stephen M. Webb]

remove unity8-desktop-session-x11 because it's unsupported

remove unity8-desktop-session-x11 because it's unsupported

[lp:~bregma/unity8-desktop-session/lp-1296733]

69. By Stephen M. Webb on 2014-08-14

failed build on missing files

[Christopher Townsend (townsend)]

LGTM

review: Approve

=== removed file 'data/10-unity8-x11.conf'
--- data/10-unity8-x11.conf	2014-05-29 15:03:57 +0000
+++ data/10-unity8-x11.conf	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-[SeatDefaults]
-user-session=unity8-x11

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2014-08-07 19:19:20 +0000
+++ data/Makefile.am	2014-08-14 23:17:27 +0000
@@ -1,10 +1,10 @@
-# This file is part of Unity8-session-x11, a desktop session configration
+# This file is part of Unity8-session, a desktop session configration
 # package.
 #
 # Copyright 2013-2014 Canonical Ltd.
 # 
-# Unity8-session-x11 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
+# 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
@@ -24,22 +24,18 @@
 	sensors.txt
 
 dist_icon_DATA = \
-	custom_unity8-mir_badge.png \
-	custom_unity8-x11_badge.png
+	custom_unity8-mir_badge.png
 
 dist_lightdm_conf_DATA = \
-	10-unity8-x11.conf \
 	55-unity8.conf
 
 dist_lightdm_session_DATA = \
-	unity8-mir.desktop \
-	unity8-x11.desktop
+	unity8-mir.desktop
 
 dist_bin_SCRIPTS = \
 	lightdm-unity8-session
 
 EXTRA_DIST = \
 	unity8-mir.desktop.in \
-	custom_unity8-mir_badge.xcf \
-	custom_unity8-x11_badge.xcf
+	custom_unity8-mir_badge.xcf
 

=== removed file 'data/custom_unity8-x11_badge.png'
Binary files data/custom_unity8-x11_badge.png	2013-11-26 20:39:38 +0000 and data/custom_unity8-x11_badge.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/custom_unity8-x11_badge.xcf'
Binary files data/custom_unity8-x11_badge.xcf	2013-11-26 20:39:38 +0000 and data/custom_unity8-x11_badge.xcf	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/unity8-x11.desktop'
--- data/unity8-x11.desktop	2013-11-26 20:06:38 +0000
+++ data/unity8-x11.desktop	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Name=Unity8-X11
-Exec=/usr/bin/unity8
-Type=Application

=== modified file 'debian/control'
--- debian/control	2014-07-28 02:35:32 +0000
+++ debian/control	2014-08-14 23:17:27 +0000
@@ -28,14 +28,3 @@
  .
  This package is provided for evaluation and demonstration purposes only.
 
-Package: unity8-desktop-session-x11
-Architecture: all
-Depends: ubuntu-desktop-mir,
-         unity8,
-         unity8-fake-env,
-         ${misc:Depends}
-Description: Unity8 desktop session for X11
- .
- A desktop session running Unity8 on an X11 back end.
- .
- This package is provided for evaluation and demonstration purposes only.

=== modified file 'debian/rules'
--- debian/rules	2013-11-26 21:05:01 +0000
+++ debian/rules	2014-08-14 23:17:27 +0000
@@ -5,3 +5,6 @@
 
 override_dh_autoreconf:
 	NOCONFIGURE=1 dh_autoreconf /bin/sh -- ./autogen.sh
+
+override_dh_install:
+	dh_install --fail-missing

=== removed file 'debian/unity8-desktop-session-mir.install'
--- debian/unity8-desktop-session-mir.install	2014-08-07 19:19:20 +0000
+++ debian/unity8-desktop-session-mir.install	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-usr/bin/*
-usr/share/lightdm/lightdm.conf.d/55-unity8.conf
-usr/share/lightdm/sessions/unity8-mir.desktop
-usr/share/unity-greeter/custom_unity8-mir_badge.png

=== removed file 'debian/unity8-desktop-session-x11.install'
--- debian/unity8-desktop-session-x11.install	2014-08-07 15:11:11 +0000
+++ debian/unity8-desktop-session-x11.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/share/lightdm/lightdm.conf.d/10-unity8-x11.conf
-usr/share/lightdm/sessions/unity8-x11.desktop
-usr/share/unity-greeter/custom_unity8-x11_badge.png