[gnome-panel/wip/gnome-3.10+: 36/75] misc: remove session related files

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 4ad7990fd23a0c3147788570edcf33b08e45caa9
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Jul 9 16:55:19 2014 +0300

    misc: remove session related files
    
    GNOME Flashback session will be available in gnome-flashback
    package.

 data/Makefile.am                               |   24 +--------------
 data/gnome-fallback.desktop.in.in              |    7 ----
 data/gnome-flashback-compiz.desktop.in.in      |    7 ----
 data/gnome-flashback-compiz.session.desktop.in |    3 --
 data/gnome-flashback.session.desktop.in        |    3 --
 gnome-panel/Makefile.am                        |   17 ++---------
 gnome-panel/gnome-session-flashback.in         |   38 ------------------------
 po/POTFILES.in                                 |    4 --
 po/POTFILES.skip                               |    1 -
 9 files changed, 4 insertions(+), 100 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 3458bfc..83f82e2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -30,39 +30,17 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-sessiondir = $(datadir)/gnome-session/sessions
-session_in_files = gnome-flashback.session.desktop.in gnome-flashback-compiz.session.desktop.in
-session_DATA = gnome-flashback.session
-
-xsessiondir = $(datadir)/xsessions
-xsession_in_in_files = gnome-fallback.desktop.in.in gnome-flashback-compiz.desktop.in.in
-xsession_in_files = gnome-fallback.desktop.in gnome-flashback-compiz.desktop.in
-xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
-
-%.session: %.session.desktop.in
-       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c 
$(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-
-%.desktop.in: %.desktop.in.in
-       $(AM_V_GEN)sed -e 's,[ ]libexecdir[@],$(libexecdir),g' <$< >$@
-
- INTLTOOL_DESKTOP_RULE@
-
 default_layoutdir   = $(datadir)/gnome-panel
 default_layout_DATA = panel-default-layout.layout
 
 EXTRA_DIST =                           \
        $(gsettings_schemas_in_in)      \
-       $(session_in_files)             \
-       $(xsession_in_in_files)         \
        $(default_layout_DATA)
 
 CLEANFILES =                   \
        $(gsettings__enum_file) \
        $(gsettings_SCHEMAS_in) \
        $(gsettings_SCHEMAS)    \
-       *.gschema.valid         \
-       $(session_DATA)         \
-       $(xsession_DATA)        \
-       $(xsession_in_files)
+       *.gschema.valid
 
 -include $(top_srcdir)/git.mk
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index 1b40334..149eaaf 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -4,8 +4,7 @@ bin_PROGRAMS = \
        gnome-panel                     \
        gnome-desktop-item-edit         \
        panel-test-applets
-libexec_SCRIPTS = gnome-panel-add                              \
-                 gnome-session-flashback
+libexec_SCRIPTS = gnome-panel-add
 
 AM_CPPFLAGS =                                                  \
        $(PANEL_CFLAGS)                                         \
@@ -178,14 +177,6 @@ gnome-panel-add: gnome-panel-add.in Makefile
                < $< > $@
        $(AM_V_at)chmod a+x $@
 
-gnome-session-flashback: gnome-session-flashback.in Makefile
-       $(AM_V_GEN)sed                                          \
-               -e 's![ ]PACKAGE[@]!$(PACKAGE)!g'               \
-               -e 's![ ]VERSION[@]!$(VERSION)!g'               \
-               -e 's![ ]LIBEXECDIR[@]!$(libexecdir)!g'         \
-               < $< > $@
-       $(AM_V_at)chmod a+x $@
-
 panel_enum_headers =                                           \
        $(top_srcdir)/gnome-panel/panel-enums.h                 \
        $(top_srcdir)/gnome-panel/panel-enums-gsettings.h       \
@@ -277,15 +268,13 @@ EXTRA_DIST =                                      \
        nothing.h                               \
        panel-marshal.list                      \
        $(desktop_in_files)                     \
-       gnome-panel-add.in                      \
-       gnome-session-flashback.in
+       gnome-panel-add.in
 
 CLEANFILES = \
        $(BUILT_SOURCES) \
        $(sys_DATA) \
        $(desktop_DATA) \
-       gnome-panel-add \
-       gnome-session-flashback
+       gnome-panel-add
 
 dist-hook:
        cd $(distdir) ; rm -f $(CLEANFILES)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 51de3dc..bc65c4c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,10 +23,6 @@ applets/wncklet/window-menu.c
 applets/wncklet/wncklet.c
 applets/wncklet/workspace-switcher.c
 [type: gettext/glade]applets/wncklet/workspace-switcher.ui
-data/gnome-fallback.desktop.in.in
-data/gnome-flashback-compiz.desktop.in.in
-data/gnome-flashback.session.desktop.in
-data/gnome-flashback-compiz.session.desktop.in
 data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 06397e7..2c75bac 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -4,7 +4,6 @@ applets/clock/GNOME_ClockApplet_Factory.server.in
 applets/fish/GNOME_FishApplet_Factory.server.in
 applets/notification_area/GNOME_NotificationAreaApplet.server.in
 applets/wncklet/GNOME_Wncklet_Factory.server.in
-data/gnome-fallback.desktop.in
 data/org.gnome.gnome-panel.applet.clock.gschema.xml.in
 data/org.gnome.gnome-panel.applet.fish.gschema.xml.in
 data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in