more meamo improvements, courtesy Florian Boor

4 files changed, 92 insertions, 4 deletions

diff --git a/packages/maemo/osso-application-installer/.mtn2git_empty b/packages/maemo/osso-application-installer/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/osso-application-installer/.mtn2git_empty
diff --git a/packages/maemo/osso-application-installer/fix-buildsystem.patch b/packages/maemo/osso-application-installer/fix-buildsystem.patch
new file mode 100644
index 0000000000..d89522bbb5
--- /dev/null
+++ b/packages/maemo/osso-application-installer/fix-buildsystem.patch
@@ -0,0 +1,65 @@
+diff -urbB osso-application-installer-1.0.03_old/configure.ac osso-application-installer-1.0.03/configure.ac
+--- osso-application-installer-1.0.03_old/configure.ac	2005-05-22 22:06:52.000000000 +0200
++++ osso-application-installer-1.0.03/configure.ac	2005-06-30 12:19:24.000000000 +0200
+@@ -38,9 +38,9 @@
+ AC_SUBST(CP_CFLAGS)
+ AC_SUBST(CP_LIBS)
+ 
+-cp_pluginlibdir=`pkg-config hildon-control-panel --variable=pluginlibdir`
++cp_pluginlibdir=${libdir}/hildon-control-panel
+ AC_SUBST(cp_pluginlibdir)
+-cp_plugindesktopdir=`pkg-config hildon-control-panel --variable=plugindesktopentrydir`
++cp_plugindesktopdir=${datadir}/applications/hildon-control-panel
+ AC_SUBST(cp_plugindesktopdir)
+ 
+ # Localisation-related
+@@ -52,12 +52,12 @@
+ AM_GLIB_GNU_GETTEXT
+ 
+ # Mime crap
+-dnl MIME-type registration check (2.6 / 2.8 version)
+-AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
+-AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno)
++#dnl MIME-type registration check (2.6 / 2.8 version)
++#AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
++#AM_CONDITIONAL(HAVE_26_MIME, test x$UPDATE_MIME_DATABASE != xno)
+ 
+-AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
+-AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
++#AC_PATH_PROG(UPDATE_DESKTOP_DATABASE, update-desktop-database, no)
++#AM_CONDITIONAL(HAVE_28_MIME, test x$UPDATE_DESKTOP_DATABASE != xno)
+ 
+ 
+ applicationinstallerlocaledir=${datadir}/locale
+@@ -76,7 +76,7 @@
+ AC_SUBST(hildonpixmapdir)
+ AC_SUBST(hildonstatusbarlibdir)
+ 
+-dbuslibpathdir=`$PKG_CONFIG --variable=libdir dbus-1`
++dbuslibpathdir=${libdir}
+ dbusconfdir=/etc/dbus-1/system.d
+ dbusservdir=${dbuslibpathdir}/dbus-1.0/services
+ AC_SUBST(dbuslibpathdir)
+diff -urbB osso-application-installer-1.0.03_old/mime/Makefile.am osso-application-installer-1.0.03/mime/Makefile.am
+--- osso-application-installer-1.0.03_old/mime/Makefile.am	2005-05-22 22:06:52.000000000 +0200
++++ osso-application-installer-1.0.03/mime/Makefile.am	2005-06-30 12:19:24.000000000 +0200
+@@ -2,19 +2,3 @@
+ mime_DATA = osso-application-installer.xml
+ 
+ EXTRA_DIST = $(mime_DATA)
+-
+-install-data-hook:
+-if HAVE_26_MIME
+-	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+-endif
+-if HAVE_28_MIME
+-	$(UPDATE_DESKTOP_DATABASE)
+-endif
+-
+-uninstall-hook:
+-if HAVE_26_MIME
+-	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
+-endif
+-if HAVE_28_MIME
+-	$(UPDATE_DESKTOP_DATABASE) 
+-endif
diff --git a/packages/maemo/osso-application-installer_1.0.03-1.bb b/packages/maemo/osso-application-installer_1.0.03-1.bb
new file mode 100644
index 0000000000..947368c46c
--- /dev/null
+++ b/packages/maemo/osso-application-installer_1.0.03-1.bb
@@ -0,0 +1,20 @@
+PR         = "r0"
+LICENSE    = "GPL"
+MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
+
+DEPENDS = "hildon-lgpl hildon-base-lib libosso hildon-libs hildon-control-panel shared-mime-info"
+RDEPENDS = "shared-mime-info"
+
+SRC_URI = "http://repository.maemo.org/pool/maemo/ossw/source/o/${PN}/${PN}_${PV}.tar.gz \
+           file://fix-buildsystem.patch;patch=1"
+
+S = "${WORKDIR}/osso-application-installer-1.0.03"
+
+inherit autotools pkgconfig
+
+FILES_${PN} += "${libdir}/dbus-1.0 ${libdir}/hildon-control-panel/*.so ${datadir}/applications ${datadir}/mime"
+
+pkg_postinst () {
+  echo "Updating MIME database... this may take a while."
+  ${bindir}/update-mime-database ${datadir}/mime
+}
diff --git a/packages/meta/meta-maemo.bb b/packages/meta/meta-maemo.bb
index e6b5b4070a..4144a6c284 100644
--- a/packages/meta/meta-maemo.bb
+++ b/packages/meta/meta-maemo.bb
@@ -1,8 +1,8 @@
 
-PACKAGES = maemo-task-base maemo-task-apps maemo-task-libs-install
+PR          = "r4"
+PACKAGES    = maemo-task-base maemo-task-apps maemo-task-libs-install
 DESCRIPTION = "Meta-package for maemo environment"
-MAINTAINER = "Florian Boor <florian@kernelconcepts.de>"
-PR = "r1"
+MAINTAINER  = "Florian Boor <florian@kernelconcepts.de>"
 
 ALLOW_EMPTY = 1
 
@@ -67,7 +67,10 @@ maemo-task-apps = "\
     hildon-status-bar \
     hildon-home \
     hildon-navigator \
-    hildon-control-panel"
+    hildon-control-panel \
+    osso-application-installer \ 
+    gpe-todo-hildon \
+    gpe-contacts-maemo"
 
 RDEPENDS_maemo-task-apps := "${maemo-task-apps}"
 DEPENDS += " ${maemo-task-apps}"