[f-spot] Move desktop files into data/desktop-files/

[Ruben Vermeersch <rubenv src gnome org>]

commit ae3ecf1b2b58ec651b51535def95e85d9d49162a
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat May 15 00:50:17 2010 +0200

    Move desktop files into data/desktop-files/

 .gitignore                                         |    2 +
 Makefile.am                                        |   39 +++-----------------
 configure.ac                                       |    9 +++--
 data/Makefile.am                                   |    1 +
 data/desktop-files/Makefile.am                     |   33 +++++++++++++++++
 .../desktop-files/f-spot-import.desktop.in.in      |    0
 .../desktop-files/f-spot-view.desktop.in.in        |    0
 .../desktop-files/f-spot.desktop.in.in             |    0
 8 files changed, 48 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d04c107..7ffbf8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,6 @@ Makefile.in
 build/m4/shave/shave
 build/m4/shave/shave-libtool
 build/pkg-config/f-spot.pc
+data/desktop-files/*.desktop
+data/desktop-files/*.desktop.in
 docs/*/*.mo
diff --git a/Makefile.am b/Makefile.am
index fada43d..b053119 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = 		\
 	build 		\
+	data 		\
 	lib 		\
 	docs		\
 	icons		\
@@ -9,24 +10,12 @@ SUBDIRS = 		\
 	extensions	\
 	tests
 
-desktop_in_files=	\
-	f-spot.desktop.in	\
-	f-spot-view.desktop.in	\
-	f-spot-import.desktop.in
-
-desktop_files=$(desktop_in_files:.desktop.in=.desktop)
- INTLTOOL_DESKTOP_RULE@
-
 schemadir = $(sysconfdir)/gconf/schemas
 schema_in_files = f-spot.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
-Applicationsdir = $(datadir)/applications
-Applications_DATA = $(desktop_files)
-
 CLEANFILES =			\
-	$(desktop_DATA)		\
 	$(schema_DATA)		\
 	intltool-extract	\
 	intltool-update		\
@@ -42,35 +31,19 @@ EXTRA_DIST =			\
 	Makefile.addins		\
 	gnome-doc-utils.make	\
 	icon-theme-installer	\
-	$(schema_in_files)	\
-        $(desktop_in_files)     \
-        $(desktop_files)
+	$(schema_in_files)
 
 DISTCLEANFILES = \
-        intltool-extract        \
-        intltool-merge          \
-        intltool-update         \
-	gnome-doc-utils.make	\
-        $(desktop_files)
+	intltool-extract        \
+	intltool-merge          \
+	intltool-update         \
+	gnome-doc-utils.make
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
 
-UPDATE_DESKTOP = \
-	if [ -f $(DESTDIR)$(datadir)/applications/defaults.list ] ; then \
-		if which update-desktop-database>/dev/null 2>&1 ; then \
-			update-desktop-database; \
-		fi \
-	fi
-
 install-data-local:
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
 
-install-data-hook: 
-	$(UPDATE_DESKTOP)
-
-uninstall-hook: 
-	$(UPDATE_DESKTOP)
-
 if ENABLE_TESTS
 test:
 	@pushd tests/src/; \
diff --git a/configure.ac b/configure.ac
index 0c595e2..20c3817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,6 +335,12 @@ build/m4/shave/shave
 build/m4/shave/shave-libtool
 build/pkg-config/Makefile
 
+data/Makefile
+data/desktop-files/Makefile
+data/desktop-files/f-spot.desktop.in
+data/desktop-files/f-spot-view.desktop.in
+data/desktop-files/f-spot-import.desktop.in
+
 lib/dpap-sharp/Makefile
 lib/dpap-sharp/lib/Makefile
 lib/dpap-sharp/dpap-client/Makefile
@@ -403,7 +409,4 @@ extensions/Transitions/CoverTransition/Makefile
 tests/Makefile
 tests/src/Makefile
 f-spot.spec
-f-spot.desktop.in
-f-spot-view.desktop.in
-f-spot-import.desktop.in
 )
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..a3d7d21
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = desktop-files
diff --git a/data/desktop-files/Makefile.am b/data/desktop-files/Makefile.am
new file mode 100644
index 0000000..1557a50
--- /dev/null
+++ b/data/desktop-files/Makefile.am
@@ -0,0 +1,33 @@
+desktop_in_files=	\
+	f-spot.desktop.in	\
+	f-spot-view.desktop.in	\
+	f-spot-import.desktop.in
+
+Applicationsdir = $(datadir)/applications
+Applications_DATA = $(desktop_files)
+
+desktop_files=$(desktop_in_files:.desktop.in=.desktop)
+ INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES =			\
+	$(desktop_DATA)
+
+EXTRA_DIST =			\
+	$(desktop_in_files)     \
+	$(desktop_files)
+
+DISTCLEANFILES = \
+	$(desktop_files)
+
+UPDATE_DESKTOP = \
+	if [ -f $(DESTDIR)$(datadir)/applications/defaults.list ] ; then \
+		if which update-desktop-database>/dev/null 2>&1 ; then \
+			update-desktop-database; \
+		fi \
+	fi
+
+install-data-hook: 
+	$(UPDATE_DESKTOP)
+
+uninstall-hook: 
+	$(UPDATE_DESKTOP)
diff --git a/f-spot-import.desktop.in.in b/data/desktop-files/f-spot-import.desktop.in.in
similarity index 100%
rename from f-spot-import.desktop.in.in
rename to data/desktop-files/f-spot-import.desktop.in.in
diff --git a/f-spot-view.desktop.in.in b/data/desktop-files/f-spot-view.desktop.in.in
similarity index 100%
rename from f-spot-view.desktop.in.in
rename to data/desktop-files/f-spot-view.desktop.in.in
diff --git a/f-spot.desktop.in.in b/data/desktop-files/f-spot.desktop.in.in
similarity index 100%
rename from f-spot.desktop.in.in
rename to data/desktop-files/f-spot.desktop.in.in