[gnome-shell-extensions] Clean up classic session definition

[Matthias Clasen <matthiasc src gnome org>]

commit 43c4e7fa2ec1c1ba45b51687e7e2556c04b63e4b
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Dec 17 10:57:35 2014 -0500

    Clean up classic session definition
    
    The gnome-shell-classic desktop file just launches gnome-shell
    without options these days, so we don't need a separate desktop file.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=741660

 data/Makefile.am                         |    7 -------
 data/gnome-classic.session.desktop.in.in |    2 +-
 data/gnome-shell-classic.desktop.in.in   |   17 -----------------
 3 files changed, 1 insertions(+), 25 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 3e151e0..ff70c5c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,10 +1,5 @@
 include $(top_srcdir)/include.mk
 
-desktopdir = $(datadir)/applications
-desktop_in_in_files = gnome-shell-classic.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-
 sessiondir = $(datadir)/gnome-session/sessions
 session_in_in_files = gnome-classic.session.desktop.in.in
 session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
@@ -56,7 +51,6 @@ extension_list:=$(subst $(space),$(comma),$(extensions))
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
-       $(desktop_in_in_files) \
        $(session_in_in_files) \
        $(xsession_in_files) \
        $(mode_in_files) \
@@ -65,7 +59,6 @@ EXTRA_DIST = \
        $(NULL)
 
 CLEANFILES = \
-       $(desktop_DATA) \
        $(session_DATA) \
        $(xsession_DATA) \
        $(mode_DATA) \
diff --git a/data/gnome-classic.session.desktop.in.in b/data/gnome-classic.session.desktop.in.in
index c52a82a..e176fd3 100644
--- a/data/gnome-classic.session.desktop.in.in
+++ b/data/gnome-classic.session.desktop.in.in
@@ -1,3 +1,3 @@
 [GNOME Session]
 _Name=GNOME Classic
-RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
+RequiredComponents=gnome-shell;gnome-settings-daemon;nautilus-classic;