opensync stuff: switched to SRCREV

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2463 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 181 insertions, 97 deletions

diff --git a/meta/packages/opensync/libopensync-plugin.inc b/meta/packages/opensync/libopensync-plugin.inc
index b1986a9e6..a15623bb1 100644
--- a/meta/packages/opensync/libopensync-plugin.inc
+++ b/meta/packages/opensync/libopensync-plugin.inc
@@ -1,15 +1,14 @@
+LICENSE ?= "LGPL"
+DEPENDS += " libopensync"
+RRECOMMENDS += " msynctool"
+HOMEPAGE ?= "http://www.opensync.org/"
+PV = "0.22+svnr${SRCREV}"
 
-PV = "0.22+svn${SRCDATE}"
 PLUGIN_NAME ?= "${@bb.data.getVar('PN', d, 1).replace('libopensync-plugin-','')}"
 PLUGIN_SONAME ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-','_')}.so"
 SRC_URI ?= "svn://svn.opensync.org/plugins;module=${PLUGIN_NAME};proto=http"
 S ?= "${WORKDIR}/${PLUGIN_NAME}"
 
-LICENSE ?= "LGPL"
-DEPENDS += " libopensync"
-RRECOMMENDS += " msynctool"
-HOMEPAGE ?= "http://www.opensync.org/"
-
 inherit autotools pkgconfig
 
 FILES_${PN} += "${datadir} ${libdir}/opensync/plugins/*.so"
@@ -21,4 +20,3 @@ do_install() {
 	install -m 644 src/${PLUGIN_NAME} ${D}${datadir}/opensync/defaults
 	install -m 755 src/.libs/${PLUGIN_SONAME} ${D}${libdir}/opensync/plugins/
 }
-
diff --git a/meta/packages/opensync/libopensync_svn.bb b/meta/packages/opensync/libopensync_svn.bb
index 0fb86381e..e3631136e 100644
--- a/meta/packages/opensync/libopensync_svn.bb
+++ b/meta/packages/opensync/libopensync_svn.bb
@@ -1,7 +1,7 @@
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.opensync.org/"
 DEPENDS = "sqlite3 libxml2 zlib glib-2.0"
-PV = "0.22+svn${SRCDATE}"
+PV = "0.22+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.opensync.org;module=trunk;proto=http \
            file://fix-attr.patch;patch=1 \
@@ -21,90 +21,178 @@ LEAD_SONAME = "libopensync.so"
 FILES_${PN} += " ${libdir}/opensync/formats/*.so ${datadir}/opensync/ ${libdir}/*.so"
 
 export HOST_SYS = "${HOST_ARCH}${HOST_VENDOR}-${HOST_OS}"
+#export PKG_CONFIG_PATH = "${STAGING_DIR}/${TARGET_SYS}/share/pkgconfig"
 
 do_stage() {
-install -d ${STAGING_LIBDIR}/formats
-
-install -m 0644 formats/libcontact.so ${STAGING_LIBDIR}/formats/
-install -m 0644 formats/libdata.so ${STAGING_LIBDIR}/formats/
-install -m 0644 formats/libevent.so ${STAGING_LIBDIR}/formats/
-install -m 0644 formats/libfile.so ${STAGING_LIBDIR}/formats/
-install -m 0644 formats/libopensync-*format.so ${STAGING_LIBDIR}/formats/
-install -m 0644 formats/libtodo.so ${STAGING_LIBDIR}/formats/
-install -m 0644 formats/libxmlformat-*.so ${STAGING_LIBDIR}/formats/
-install -m 0644 opensync/libopensync.so ${STAGING_LIBDIR}
-
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/archive/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/data/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/format/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/group/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
-install -d ${STAGING_INCDIR}/opensync-1.0/opensync/version/
-
-install -m 0644 formats/file.h	${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-client.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-context.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-data.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-error.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-format.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-group.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-helper.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-ipc.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync_list.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-mapping.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-merger.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-module.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-plugin.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-serializer.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-support.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-time.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync-version.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-install -m 0644 opensync/opensync_xml.h ${STAGING_INCDIR}/opensync-1.0/opensync/
-
-install -m 0644 opensync/archive/opensync_archive.h ${STAGING_INCDIR}/opensync-1.0/opensync/archive/
-install -m 0644 opensync/data/opensync_change.h ${STAGING_INCDIR}/opensync-1.0/opensync/data/
-install -m 0644 opensync/data/opensync_data.h ${STAGING_INCDIR}/opensync-1.0/opensync/data/
-install -m 0644 opensync/engine/opensync_engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
-install -m 0644 opensync/engine/opensync_obj_engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
-install -m 0644 opensync/engine/opensync_status.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
-install -m 0644 opensync/format/opensync_converter.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
-install -m 0644 opensync/format/opensync_filter.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
-install -m 0644 opensync/format/opensync_format_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
-install -m 0644 opensync/format/opensync_objformat.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
-install -m 0644 opensync/format/opensync_time.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
-install -m 0644 opensync/group/opensync_group_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
-install -m 0644 opensync/group/opensync_group.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
-install -m 0644 opensync/group/opensync_member.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
-install -m 0644 opensync/helper/opensync_anchor.h ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
-install -m 0644 opensync/helper/opensync_hashtable.h ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
-install -m 0644 opensync/ipc/opensync_message.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
-install -m 0644 opensync/ipc/opensync_queue.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
-install -m 0644 opensync/ipc/opensync_serializer.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
-install -m 0644 opensync/mapping/opensync_mapping_entry.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
-install -m 0644 opensync/mapping/opensync_mapping.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
-install -m 0644 opensync/mapping/opensync_mapping_table.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
-install -m 0644 opensync/mapping/opensync_mapping_view.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
-install -m 0644 opensync/merger/opensync_capabilities.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
-install -m 0644 opensync/merger/opensync_capability.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
-install -m 0644 opensync/merger/opensync_merger.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
-install -m 0644 opensync/merger/opensync_xmlfield.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
-install -m 0644 opensync/merger/opensync_xmlfieldlist.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
-install -m 0644 opensync/merger/opensync_xmlformat.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
-install -m 0644 opensync/plugin/opensync_plugin_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
-install -m 0644 opensync/plugin/opensync_plugin.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
-install -m 0644 opensync/plugin/opensync_plugin_info.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
-install -m 0644 opensync/plugin/opensync_sink.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
-install -m 0644 opensync/version/opensync_version.h ${STAGING_INCDIR}/opensync-1.0/opensync/version/
-
-cat ${S}/opensync-1.0.pc | sed -e "s:=${WORKDIR}/image${libdir}:=${STAGING_LIBDIR}:" -e "s:=${WORKDIR}/image${includedir}:=${STAGING_INCDIR}:"  -e "s:=${WORKDIR}/image${datadir}:=${STAGING_DATADIR}:" > ${PKG_CONFIG_PATH}/opensync-1.0.pc
-cat ${S}/osengine-1.0.pc | sed -e "s:=${WORKDIR}/image${libdir}:=${STAGING_LIBDIR}:" -e "s:=${WORKDIR}/image${includedir}:=${STAGING_INCDIR}:"  -e "s:=${WORKDIR}/image${datadir}:=${STAGING_DATADIR}:" > ${PKG_CONFIG_PATH}/osengine-1.0.pc
+    install -d ${STAGING_LIBDIR}/formats
+
+    install -m 0644 formats/libcontact.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libdata.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libevent.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libfile.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libopensync-vformat.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libopensync-xmlformat.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libtodo.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libxmlformat-doc.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libxmlformat-vcal.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libxmlformat-vcard.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 formats/libxmlformat-vtodo.so ${STAGING_LIBDIR}/formats/
+    install -m 0644 opensync/libopensync.so ${STAGING_LIBDIR}
+
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/archive/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/data/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/group/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/version/
+
+    install -m 0644 formats/file.h	${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-client.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-context.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-data.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-error.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-format.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-group.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-helper.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-ipc.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync_list.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-mapping.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-merger.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-module.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-plugin.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-serializer.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-support.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-time.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync-version.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    install -m 0644 opensync/opensync_xml.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+    
+    install -m 0644 opensync/archive/opensync_archive.h ${STAGING_INCDIR}/opensync-1.0/opensync/archive/
+    install -m 0644 opensync/data/opensync_change.h ${STAGING_INCDIR}/opensync-1.0/opensync/data/
+    install -m 0644 opensync/data/opensync_data.h ${STAGING_INCDIR}/opensync-1.0/opensync/data/
+    install -m 0644 opensync/engine/opensync_engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
+    install -m 0644 opensync/engine/opensync_obj_engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
+    install -m 0644 opensync/engine/opensync_status.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
+    install -m 0644 opensync/format/opensync_converter.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+    install -m 0644 opensync/format/opensync_filter.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+    install -m 0644 opensync/format/opensync_format_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+    install -m 0644 opensync/format/opensync_objformat.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+    install -m 0644 opensync/format/opensync_time.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+    install -m 0644 opensync/group/opensync_group_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
+    install -m 0644 opensync/group/opensync_group.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
+    install -m 0644 opensync/group/opensync_member.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
+    install -m 0644 opensync/helper/opensync_anchor.h ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
+    install -m 0644 opensync/helper/opensync_hashtable.h ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
+    install -m 0644 opensync/ipc/opensync_message.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
+    install -m 0644 opensync/ipc/opensync_queue.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
+    install -m 0644 opensync/ipc/opensync_serializer.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
+    install -m 0644 opensync/mapping/opensync_mapping_entry.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+    install -m 0644 opensync/mapping/opensync_mapping.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+    install -m 0644 opensync/mapping/opensync_mapping_table.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+    install -m 0644 opensync/mapping/opensync_mapping_view.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+    install -m 0644 opensync/merger/opensync_capabilities.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+    install -m 0644 opensync/merger/opensync_capability.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+    install -m 0644 opensync/merger/opensync_merger.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+    install -m 0644 opensync/merger/opensync_xmlfield.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+    install -m 0644 opensync/merger/opensync_xmlfieldlist.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+    install -m 0644 opensync/merger/opensync_xmlformat.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+    install -m 0644 opensync/plugin/opensync_plugin_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+    install -m 0644 opensync/plugin/opensync_plugin.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+    install -m 0644 opensync/plugin/opensync_plugin_info.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+    install -m 0644 opensync/plugin/opensync_sink.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+    install -m 0644 opensync/version/opensync_version.h ${STAGING_INCDIR}/opensync-1.0/opensync/version/
+    
+    cat ${S}/opensync-1.0.pc | sed -e "s:=${WORKDIR}/image${libdir}:=${STAGING_LIBDIR}:" -e "s:=${WORKDIR}/image${includedir}:=${STAGING_INCDIR}:"  -e "s:=${WORKDIR}/image${datadir}:=${STAGING_DATADIR}:" > ${PKG_CONFIG_PATH}/opensync-1.0.pc
+    cat ${S}/osengine-1.0.pc | sed -e "s:=${WORKDIR}/image${libdir}:=${STAGING_LIBDIR}:" -e "s:=${WORKDIR}/image${includedir}:=${STAGING_INCDIR}:"  -e "s:=${WORKDIR}/image${datadir}:=${STAGING_DATADIR}:" > ${PKG_CONFIG_PATH}/osengine-1.0.pc
+
+	install -d ${STAGING_LIBDIR}/formats
+
+	install -m 0644 formats/libcontact.so ${STAGING_LIBDIR}/formats/
+	install -m 0644 formats/libdata.so ${STAGING_LIBDIR}/formats/
+	install -m 0644 formats/libevent.so ${STAGING_LIBDIR}/formats/
+	install -m 0644 formats/libfile.so ${STAGING_LIBDIR}/formats/
+	install -m 0644 formats/libopensync-*format.so ${STAGING_LIBDIR}/formats/
+	install -m 0644 formats/libtodo.so ${STAGING_LIBDIR}/formats/
+	install -m 0644 formats/libxmlformat-*.so ${STAGING_LIBDIR}/formats/
+	install -m 0644 opensync/libopensync.so ${STAGING_LIBDIR}
+
+    install -d ${STAGING_INCDIR}/opensync-1.0/opensync/archive/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/data/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/group/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+	install -d ${STAGING_INCDIR}/opensync-1.0/opensync/version/
+
+	install -m 0644 formats/file.h	${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-client.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-context.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-data.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-error.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-format.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-group.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-helper.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-ipc.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync_list.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-mapping.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-merger.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-module.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-plugin.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-serializer.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-support.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-time.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync-version.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+	install -m 0644 opensync/opensync_xml.h ${STAGING_INCDIR}/opensync-1.0/opensync/
+
+	install -m 0644 opensync/archive/opensync_archive.h ${STAGING_INCDIR}/opensync-1.0/opensync/archive/
+	install -m 0644 opensync/data/opensync_change.h ${STAGING_INCDIR}/opensync-1.0/opensync/data/
+	install -m 0644 opensync/data/opensync_data.h ${STAGING_INCDIR}/opensync-1.0/opensync/data/
+	install -m 0644 opensync/engine/opensync_engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
+	install -m 0644 opensync/engine/opensync_obj_engine.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
+	install -m 0644 opensync/engine/opensync_status.h ${STAGING_INCDIR}/opensync-1.0/opensync/engine/
+	install -m 0644 opensync/format/opensync_converter.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+	install -m 0644 opensync/format/opensync_filter.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+	install -m 0644 opensync/format/opensync_format_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+	install -m 0644 opensync/format/opensync_objformat.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+	install -m 0644 opensync/format/opensync_time.h ${STAGING_INCDIR}/opensync-1.0/opensync/format/
+	install -m 0644 opensync/group/opensync_group_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
+	install -m 0644 opensync/group/opensync_group.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
+	install -m 0644 opensync/group/opensync_member.h ${STAGING_INCDIR}/opensync-1.0/opensync/group/
+	install -m 0644 opensync/helper/opensync_anchor.h ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
+	install -m 0644 opensync/helper/opensync_hashtable.h ${STAGING_INCDIR}/opensync-1.0/opensync/helper/
+	install -m 0644 opensync/ipc/opensync_message.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
+	install -m 0644 opensync/ipc/opensync_queue.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
+	install -m 0644 opensync/ipc/opensync_serializer.h ${STAGING_INCDIR}/opensync-1.0/opensync/ipc/
+	install -m 0644 opensync/mapping/opensync_mapping_entry.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+	install -m 0644 opensync/mapping/opensync_mapping.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+	install -m 0644 opensync/mapping/opensync_mapping_table.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+	install -m 0644 opensync/mapping/opensync_mapping_view.h ${STAGING_INCDIR}/opensync-1.0/opensync/mapping/
+	install -m 0644 opensync/merger/opensync_capabilities.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+	install -m 0644 opensync/merger/opensync_capability.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+	install -m 0644 opensync/merger/opensync_merger.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+	install -m 0644 opensync/merger/opensync_xmlfield.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+	install -m 0644 opensync/merger/opensync_xmlfieldlist.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+	install -m 0644 opensync/merger/opensync_xmlformat.h ${STAGING_INCDIR}/opensync-1.0/opensync/merger/
+	install -m 0644 opensync/plugin/opensync_plugin_env.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+	install -m 0644 opensync/plugin/opensync_plugin.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+	install -m 0644 opensync/plugin/opensync_plugin_info.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+	install -m 0644 opensync/plugin/opensync_sink.h ${STAGING_INCDIR}/opensync-1.0/opensync/plugin/
+	install -m 0644 opensync/version/opensync_version.h ${STAGING_INCDIR}/opensync-1.0/opensync/version/
+
+	cat ${S}/opensync-1.0.pc | sed -e "s:=${WORKDIR}/image${libdir}:=${STAGING_LIBDIR}:" -e "s:=${WORKDIR}/image${includedir}:=${STAGING_INCDIR}:"  -e "s:=${WORKDIR}/image${datadir}:=${STAGING_DATADIR}:" > ${PKG_CONFIG_PATH}/opensync-1.0.pc
+	cat ${S}/osengine-1.0.pc | sed -e "s:=${WORKDIR}/image${libdir}:=${STAGING_LIBDIR}:" -e "s:=${WORKDIR}/image${includedir}:=${STAGING_INCDIR}:"  -e "s:=${WORKDIR}/image${datadir}:=${STAGING_DATADIR}:" > ${PKG_CONFIG_PATH}/osengine-1.0.pc
 
 }
 
diff --git a/meta/packages/opensync/libsyncml_svn.bb b/meta/packages/opensync/libsyncml_svn.bb
index 3bb61c486..61fca0685 100644
--- a/meta/packages/opensync/libsyncml_svn.bb
+++ b/meta/packages/opensync/libsyncml_svn.bb
@@ -1,10 +1,9 @@
 DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol."
 HOMEPAGE = "http://libsyncml.opensync.org/"
 LICENSE = "LGPL"
-
 DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez-libs openobex"
+PV = "0.4.2+svnr${SRCREV}"
 
-PV = "0.4.2+svn${SRCDATE}"
 SRC_URI = "svn://svn.opensync.org/libsyncml;module=trunk;proto=http"
 S = "${WORKDIR}/trunk"
 
diff --git a/meta/packages/opensync/msynctool_svn.bb b/meta/packages/opensync/msynctool_svn.bb
index 319cf39d0..88cb8f4b5 100644
--- a/meta/packages/opensync/msynctool_svn.bb
+++ b/meta/packages/opensync/msynctool_svn.bb
@@ -1,10 +1,9 @@
-PV = "0.22+svn${SRCDATE}"
-SRC_URI = "svn://svn.opensync.org/multisync;module=trunk;proto=http"
-S = "${WORKDIR}/trunk"
-
 LICENSE = "GPL"
 DEPENDS = "libopensync"
 HOMEPAGE = "http://www.opensync.org/"
+PV = "0.22+svnr${SRCREV}"
 
-inherit autotools pkgconfig
+SRC_URI = "svn://svn.opensync.org/multisync;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
 
+inherit autotools pkgconfig