From: Koos Vriezen <koos.vriezen@gmail.com>
Date: Tue, 2 Aug 2011 21:02:39 +0000 (+0200)
Subject: Adjust for proper harmattan installation
X-Git-Url: http://git.maemo.org/git/?p=worldtv99;a=commitdiff_plain;h=043bf568ff48ffe35d667763c40b4dd3231f00b6

Adjust for proper harmattan installation

gconf path changed and installation directory changed, plus removing
unneeded hildon configure stuff
---

diff --git a/autogen.sh b/autogen.sh
index 3af226d..e8bedf3 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@ set -x
 glib-gettextize --copy --force
 libtoolize --automake --copy --force
 intltoolize --automake --copy --force
-aclocal-1.7
+aclocal-1.11
 autoconf --force
 autoheader --force
-automake-1.7 --add-missing --copy --force-missing --foreign
+automake-1.11 --add-missing --copy --force-missing --foreign
diff --git a/configure.ac b/configure.ac
index ab79db5..f38df76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,25 +18,11 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "${GETTEXT_PACKAGE}", [Name of gettext pac
 ALL_LINGUAS="en_GB"
 AM_GLIB_GNU_GETTEXT
 
-# Application locale install directory
-localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`
-
-# Application pixmaps install directory
-pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir`
-
-# Help file install directory
-helpfile_engbdir=$datadir/osso-help/en_GB
-
-package_appdir=$datadir/applications/worldtv99
+package_appdir=$datadir/apps/worldtv99
 
 # Define as variables in Makefiles
-AC_SUBST(localedir)
-AC_SUBST(helpfile_engbdir)
 AC_SUBST(package_appdir)
 
-AC_DEFINE_UNQUOTED([LOCALEDIR], "${localedir}", [Runtime locale catalog files path])
-AC_DEFINE_UNQUOTED([PIXMAPDIR], "${pixmapdir}", [Runtime pixmap files path])
-
 # Produce output files
 AC_OUTPUT(
 	  Makefile \
diff --git a/debian/changelog b/debian/changelog
index 8bfea49..4324c38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+worldtv99 (0.5.1-1) unstable; urgency=low
+
+  * Move to /usr/share/apps/worldtv
+
+ -- Koos Vriezen <koos.vriezen@gmail.com>  Mon, 01 Aug 2011 20:42:36 +0200
+
 worldtv99 (0.5.0-3) unstable; urgency=low
 
   * XSBC-Bugtracker required
diff --git a/debian/control b/debian/control
index 317be38..ab05d7e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: worldtv99
 Section: user/multimedia
 Priority: optional
 Maintainer: Koos Vriezen <koos.vriezen@gmail.com>
-Build-Depends: debhelper (>= 5), autotools-dev, gconf2, osso-af-settings
+Build-Depends: debhelper (>= 5), autotools-dev, gconf2
 Standards-Version: 3.7.2
 XSBC-Bugtracker: https://bugs.maemo.org/enter_bug.cgi?product=kmplayer
 
diff --git a/debian/dirs b/debian/dirs
index 9ecda26..030c244 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1 +1 @@
-usr/share/applications
+usr/share/apps
diff --git a/debian/postinst b/debian/postinst
index bf47de6..4adac17 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-gconftool -s -t string /apps/maemo/kmplayer/lists/WorldTV99 /usr/share/applications/worldtv99/WorldTV99.xml
+gconftool -s -t string /apps/meego/kmplayer/lists/WorldTV99 /usr/share/apps/worldtv99/WorldTV99.xml
 
 #DEBHELPER#
 
diff --git a/debian/postrm b/debian/postrm
index 8e889ef..dbd9fac 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-gconftool -u  /apps/maemo/kmplayer/lists/WorldTV99
+gconftool -u  /apps/meego/kmplayer/lists/WorldTV99
 
 #DEBHELPER#