From: Roman Moravcik <roman.moravcik@gmail.com>
Date: Thu, 18 Feb 2010 16:33:03 +0000 (+0100)
Subject: Imported version 0.2-3
X-Git-Tag: v0.2-3
X-Git-Url: http://vcs.maemo.org/git/?p=mstardict;a=commitdiff_plain;h=af2d95a1be517767f316780598bb1206ee517ac5

Imported version 0.2-3
---

diff --git a/configure.ac b/configure.ac
index 87ee46d..b8c8d0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,10 +44,6 @@ dnl fill cflags for libstardict
 PKG_CHECK_MODULES(LIB_STARDICT, glib-2.0 >= 2.6.1 gtk+-2.0 >= 2.12 sigc++-2.0)
 AC_SUBST(LIB_STARDICT_CFLAGS)
 
-# Discover where to install the .desktop file:
-HILDON_DESKTOP_ENTRY_DIR=`pkg-config osso-af-settings --variable=desktopentrydir`
-AC_SUBST(HILDON_DESKTOP_ENTRY_DIR)
-
 AC_OUTPUT([
  Makefile
  data/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 995a9ba..7d90353 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
 imagesdir = $(datadir)/icons/hicolor/48x48/hildon
 images_DATA = mstardict.png
 
-desktopdir = $(HILDON_DESKTOP_ENTRY_DIR)
+desktopdir = $(datadir)/applications/hildon
 desktop_in_files = mstardict.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
diff --git a/debian/changelog b/debian/changelog
index ab2520c..e4b92dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mstardict (0.2-3) unstable; urgency=low
+
+  * Fixed installation of desktop file.
+
+ -- Roman Moravcik <roman.moravcik@gmail.com>  Thu, 28 Jan 2010 14:50:13 +0100
+
 mstardict (0.2-2) unstable; urgency=low
 
   * Improvments of UI.