[gnome-settings-daemon] data: Don't distribute preconfigured file

[Bastien Nocera <hadess src gnome org>]

commit 4d61a2905e7d3b93d5a20e5665a402682598092a
Author: Rico Tzschichholz <ricotz t-online de>
Date:   Fri Dec 23 19:54:07 2011 +0100

    data: Don't distribute preconfigured file
    
    gnome-settings-daemon.desktop.in is a generated file, don't ship
    it in the tarball.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=666772

 data/Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index db9b612..19decc2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -42,8 +42,8 @@ convert_DATA = gnome-settings-daemon.convert
 
 @INTLTOOL_DESKTOP_RULE@
 desktopdir = $(sysconfdir)/xdg/autostart
-desktop_in_files = gnome-settings-daemon.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_in_files = gnome-settings-daemon.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 
 gnome-settings-daemon.desktop.in: gnome-settings-daemon.desktop.in.in
 	$(AM_V_GEN) sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $  tmp && mv $  tmp $@
@@ -68,7 +68,6 @@ EXTRA_DIST = 					\
 	$(all_schemas:.xml=.xml.in.in)		\
 	$(service_in_files)			\
 	$(desktop_in_files)			\
-	gnome-settings-daemon.desktop.in.in	\
 	$(gsettings_ENUM_FILES)			\
 	gnome-settings-daemon.pc.in		\
 	$(api_DATA)				\
@@ -78,6 +77,7 @@ DISTCLEANFILES = 			\
 	$(all_schemas)			\
 	$(service_DATA)			\
 	$(desktop_DATA)			\
+	gnome-settings-daemon.desktop.in \
 	$(NULL)
 
 MAINTAINERCLEANFILES =			\