From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Sun, 2 May 2010 19:22:08 +0000 (+0200)
Subject: move desktop file to data/
X-Git-Tag: azimuth-0.2~18
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=a33dd173170e52b638abb86b050f016f23da2889;hp=5c16fb329da14b1c29c3fcc37485ef1c20b0fc38;p=azimuth

move desktop file to data/
---

diff --git a/.gitignore b/.gitignore
index 90455c7..37da98c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,9 +37,9 @@ stamp-h1
 status
 
 src/azimuth
-src/cpazimuth.desktop
 
 data/azimuth.schemas
+data/cpazimuth.desktop
 
 debian/azimuth.postinst.debhelper
 debian/azimuth.postrm.debhelper
diff --git a/configure.ac b/configure.ac
index 79bc1e9..b82c7ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,7 @@ fi
 AC_OUTPUT([
 	Makefile
 	src/Makefile
-	src/cpazimuth.desktop
 	data/Makefile
 	data/azimuth.schemas
+	data/cpazimuth.desktop
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 32551f0..f7e1e6f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -13,6 +13,8 @@ else
 install-data-local:
 endif
 
+hildoncpdesktopentry_DATA = cpazimuth.desktop
+
 EXTRA_DIST = \
   $(schemas_in_files) \
   $(schemas_DATA)
diff --git a/data/cpazimuth.desktop.in b/data/cpazimuth.desktop.in
new file mode 100644
index 0000000..e9a4396
--- /dev/null
+++ b/data/cpazimuth.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Azimuth
+Comment=Publish my location
+Type=HildonControlPanelPlugin
+Icon=gps_location
+Categories=connectivity
+X-control-panel-plugin=libcpazimuth.so
+X-Text-Domain=hildon-control-panel
diff --git a/src/Makefile.am b/src/Makefile.am
index 41bf042..6e4305b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,9 +30,6 @@ azimuth_SOURCES = \
 	connection-watcher.c \
 	position-publisher.c
 
-
-hildoncpdesktopentry_DATA = cpazimuth.desktop
-
 cpazimuth_LTLIBRARIES = libcpazimuth.la
 
 libcpazimuth_la_LIBADD = $(HILDON_LIBS) $(GCONF_LIBS) \
diff --git a/src/cpazimuth.desktop.in b/src/cpazimuth.desktop.in
deleted file mode 100644
index e9a4396..0000000
--- a/src/cpazimuth.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Azimuth
-Comment=Publish my location
-Type=HildonControlPanelPlugin
-Icon=gps_location
-Categories=connectivity
-X-control-panel-plugin=libcpazimuth.so
-X-Text-Domain=hildon-control-panel