[gdm/gnome-2-20] Move default.desktop.in to default.desktop.in.in and build default.desktop.in via configure. This f

[Brian Cameron <bcameron src gnome org>]

commit 00842e8de0a7c8b5d64352d38b24cd26c7ee736c
Author: Brian Cameron <Brian Cameron sun com>
Date:   Thu Jun 3 15:38:22 2010 -0500

    Move default.desktop.in to default.desktop.in.in and build default.desktop.in
    via configure.  This fixes a "make distcheck" failure.

 config/Makefile.am           |    2 +-
 config/default.desktop.in.in |   11 +++++++++++
 configure.ac                 |    1 +
 po/POTFILES.in               |    2 +-
 po/POTFILES.skip             |    1 +
 5 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/config/Makefile.am b/config/Makefile.am
index b156cae..075a54c 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -19,7 +19,7 @@ EXTRA_DIST = \
 	gdm.conf.in \
 	gdm.conf-custom.in \
 	$(DESKTOP_FILES) \
-	default.desktop.in \
+	default.desktop.in.in \
 	gnome.desktop.in.in \
 	CDE.desktop.in \
 	ssh.desktop.in.in \
diff --git a/config/default.desktop.in.in b/config/default.desktop.in.in
new file mode 100644
index 0000000..8bed5b3
--- /dev/null
+++ b/config/default.desktop.in.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+# The names/descriptions should really be better
+_Name=Run Xclient script
+_Comment=This session runs the Xclients script
+Exec=default
+# The "default" Exec is a very special one and is handled specially in
+# the Xsession script, you could also have "custom" which would just run
+# "~/.xsession" directly
+Icon=
+Type=Application
diff --git a/configure.ac b/configure.ac
index f8367bd..dab0a35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1399,6 +1399,7 @@ config/Init
 config/PreSession
 config/PostSession
 config/gdmprefetchlist
+config/default.desktop.in
 config/gnome.desktop.in
 config/ssh.desktop.in
 ])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f3ef8f0..20b6751 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,7 @@
 # Please keep this file in alphabetical order.
 common/gdm-config.c
 config/CDE.desktop.in
-config/default.desktop.in
+config/default.desktop.in.in
 config/gettextfoo.h
 config/gnome.desktop.in.in
 config/ssh.desktop.in.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 6e35c5e..3021c70 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -6,6 +6,7 @@
 # Without these files, "make distcheck" fails.  Please do not
 # remove these unless you fix "make distcheck" a different way.
 #
+config/default.desktop.in
 config/gnome.desktop.in
 config/ssh.desktop.in
 gui/gdmsetup.desktop.in