[meld] Move .desktop file to data/

[Kai Willadsen <kaiw src gnome org>]

commit c60a68c0445ad9b6000545e0f8a8acaed0be4786
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Tue Aug 25 08:48:08 2009 +1000

    Move .desktop file to data/

 GNUmakefile                             |    8 ++++----
 meld.desktop.in => data/meld.desktop.in |    0
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/GNUmakefile b/GNUmakefile
index 44465e4..28c6af4 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -29,7 +29,7 @@ all: $(addsuffix .install,$(SPECIALS)) meld.desktop
 
 .PHONY:clean
 clean: 
-	-rm -f *.pyc vc/*.pyc *.install meld.desktop *.bak data/ui/*.bak
+	-rm -f *.pyc vc/*.pyc *.install data/meld.desktop *.bak data/ui/*.bak
 	$(MAKE) -C po clean
 	$(MAKE) -C help clean
 
@@ -53,7 +53,7 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop
 		$(DESTDIR)$(libdir_)/vc
 	install -m 644 paths.py.install \
 		$(DESTDIR)$(libdir_)/paths.py
-	install -m 644 meld.desktop \
+	install -m 644 data/meld.desktop \
 		$(DESTDIR)$(sharedir)/applications
 	$(PYTHON)    -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
 	$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
@@ -72,8 +72,8 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop
 	$(MAKE) -C po install
 	$(MAKE) -C help install
 
-meld.desktop: meld.desktop.in
-	intltool-merge -d po meld.desktop.in meld.desktop
+meld.desktop: data/meld.desktop.in
+	intltool-merge -d po data/meld.desktop.in data/meld.desktop
 
 %.install: %
 	$(PYTHON) tools/install_paths \
diff --git a/meld.desktop.in b/data/meld.desktop.in
similarity index 100%
rename from meld.desktop.in
rename to data/meld.desktop.in