merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'

     and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'

38 files changed, 331 insertions, 32 deletions

diff --git a/packages/gpephone/addressbook_svn.bb b/packages/gpephone/addressbook_svn.bb
index 663c38c09c..cb913bc663 100644
--- a/packages/gpephone/addressbook_svn.bb
+++ b/packages/gpephone/addressbook_svn.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "LiPS address book"
 SECTION = "gpe"
 PRIORITY    = "optional"
 PR          = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/almmgrd_svn.bb b/packages/gpephone/almmgrd_svn.bb
new file mode 100644
index 0000000000..70d02ff018
--- /dev/null
+++ b/packages/gpephone/almmgrd_svn.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Alarm manager daemon"
+SECTION = "gpephone"
+PRIORITY = "required"
+LICENSE = "LiPS"
+DEPENDS = "glib-2.0 libiac sqlite3 libcalenabler2 libalmmgr"
+PV = "0.0+svnr-${SRCREV}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
diff --git a/packages/gpephone/calendar2/.mtn2git_empty b/packages/gpephone/calendar2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/calendar2/.mtn2git_empty
diff --git a/packages/gpephone/calendar2/disable-broken-tests.patch b/packages/gpephone/calendar2/disable-broken-tests.patch
new file mode 100644
index 0000000000..fa3102f5a0
--- /dev/null
+++ b/packages/gpephone/calendar2/disable-broken-tests.patch
@@ -0,0 +1,9 @@
+--- calendar2/Makefile.am~	2008-01-24 16:54:38.000000000 +0100
++++ calendar2/Makefile.am	2008-01-24 16:54:38.000000000 +0100
+@@ -1,5 +1,5 @@
+ #SUBDIRS			= src announce atd schedule test res po
+-SUBDIRS			= src test res po
++SUBDIRS			= src res po
+ 
+ desktopdir				= $(GPE_DIR)/share/applications
+ desktop_in_files	= cal.desktop.in
diff --git a/packages/gpephone/calendar2_svn.bb b/packages/gpephone/calendar2_svn.bb
new file mode 100644
index 0000000000..c066fc77c0
--- /dev/null
+++ b/packages/gpephone/calendar2_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Calendar application for GPE Phone Edition"
+LICENSE     = "LiPS"
+SECTION = "gpe"
+PRIORITY    = "optional"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r1"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgemwidget dbus-glib libcalenabler2 libiac"
+
+inherit gpephone autotools
+
+SRC_URI = "${GPEPHONE_SVN} \
+           file://disable-broken-tests.patch;patch=1"
+
+S = ${WORKDIR}/${PN}
+
+FILES_${PN} += "${datadir}/database ${datadir}/res"
diff --git a/packages/gpephone/contact_svn.bb b/packages/gpephone/contact_svn.bb
index 0b785ac9f0..ef4d2707ab 100644
--- a/packages/gpephone/contact_svn.bb
+++ b/packages/gpephone/contact_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpe"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget"
-PV = "0.0+svn-${SRCREV}"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
 inherit gpephone autotools
diff --git a/packages/gpephone/dialer_svn.bb b/packages/gpephone/dialer_svn.bb
new file mode 100644
index 0000000000..7b1b883652
--- /dev/null
+++ b/packages/gpephone/dialer_svn.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "GPE Phone Edition phone dialer"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ libgpephone libgemwidget"
+PV = "0.0+svnr-${SRCREV}"
+PR = "r0"
+
+inherit gpephone autotools
+
+SRC_URI = ${GPEPHONE_SVN}
+
+EXTRA_OECONF = "--disable-hiker"
+
+S = "${WORKDIR}/${PN}"
+
+
+FILES_${PN} += "${datadir}"
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpephone/firewall_svn.bb b/packages/gpephone/firewall_svn.bb
index 77b2122449..b3d7aee848 100644
--- a/packages/gpephone/firewall_svn.bb
+++ b/packages/gpephone/firewall_svn.bb
@@ -5,8 +5,6 @@ PRIORITY    = "optional"
 PR          = "r0"
 PV = "0.0+svnr-${SRCREV}"
 
-SRCREV_pn-${PN} ?= "1400"
-
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf-dbus"
diff --git a/packages/gpephone/gpe-applauncher_0.11.bb b/packages/gpephone/gpe-applauncher_0.11.bb
index 1efcd793e0..204f7828f9 100644
--- a/packages/gpephone/gpe-applauncher_0.11.bb
+++ b/packages/gpephone/gpe-applauncher_0.11.bb
@@ -2,7 +2,7 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r1"
+PR          = "r2"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
@@ -18,7 +18,7 @@ inherit gpephone autotools
 SRC_URI += "file://hotkeys.conf \
             file://softkeys.conf"
 
-EXTRA_OECONF = "--disable-gridlayout"
+EXTRA_OECONF = "--enable-gridlayout"
 
 FILES_${PN} = '${datadir} ${bindir}'
 FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
diff --git a/packages/gpephone/gpe-applauncher_svn.bb b/packages/gpephone/gpe-applauncher_svn.bb
index 4fe82877e3..9360c6f6d3 100644
--- a/packages/gpephone/gpe-applauncher_svn.bb
+++ b/packages/gpephone/gpe-applauncher_svn.bb
@@ -2,8 +2,8 @@ LICENSE     = "GPL"
 DESCRIPTION = "A cellphone application launcher."
 SECTION = "gpe"
 PRIORITY    = "optional"
-PR          = "r0"
-PV          = "0.11+svn-${SRCREV}"
+PR          = "r1"
+PV          = "0.11+svnr-${SRCREV}"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 DEFAULT_PREFERENCE = "-1"
@@ -24,7 +24,7 @@ RDEPENDS_${PN} += "gpe-applauncher-config"
 SRC_URI += "file://hotkeys.conf \
             file://softkeys.conf"
 
-EXTRA_OECONF = "--disable-gridlayout"
+EXTRA_OECONF = "--enable-gridlayout"
 
 FILES_${PN} = '${datadir} ${bindir}'
 FILES_gpe-applauncher-config = '${sysconfdir}/gpe/'
diff --git a/packages/gpephone/libabenabler2_svn.bb b/packages/gpephone/libabenabler2_svn.bb
index ea070092a2..004ba3ec46 100644
--- a/packages/gpephone/libabenabler2_svn.bb
+++ b/packages/gpephone/libabenabler2_svn.bb
@@ -3,15 +3,15 @@ SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 librecord2 gconf sqlite3"
-PV = "0.0+svn-${SRCDATE}"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
+inherit gpephone pkgconfig autotools
+
 SRC_URI = "${GPEPHONE_SVN}"
 
 S = "${WORKDIR}/${PN}"
 
-inherit gpephone pkgconfig autotools
-
 do_stage () {
         autotools_stage_all
 }
diff --git a/packages/gpephone/libabenabler_svn.bb b/packages/gpephone/libabenabler_svn.bb
index f362c853d6..4468c3580e 100644
--- a/packages/gpephone/libabenabler_svn.bb
+++ b/packages/gpephone/libabenabler_svn.bb
@@ -4,7 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 librecord liblipsevent libim sqlite3"
 PR          = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/libalmmgr_svn.bb b/packages/gpephone/libalmmgr_svn.bb
new file mode 100644
index 0000000000..cbae037109
--- /dev/null
+++ b/packages/gpephone/libalmmgr_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "LiPS alarm framework library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "glib-2.0 libiac"
+PV = "0.0+svnr-${SRCREV}"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+        autotools_stage_all
+}
diff --git a/packages/gpephone/libcalenabler2_svn.bb b/packages/gpephone/libcalenabler2_svn.bb
index 6144e055de..e3bf129ab1 100644
--- a/packages/gpephone/libcalenabler2_svn.bb
+++ b/packages/gpephone/libcalenabler2_svn.bb
@@ -2,17 +2,16 @@ DESCRIPTION = "LiPS calendar API."
 SECTION = "gpe/libs"
 PRIORITY = "optional"
 LICENSE = "LiPS"
-DEPENDS = "glib-2.0 sqlite3 libical"
-PV = "0.0+svn-${SRCREV}"
+DEPENDS = "glib-2.0 sqlite3 libical libalmmgr"
+PV = "0.0+svnr-${SRCREV}"
 PR = "r0"
 
-SRC_URI = "${GPEPHONE_SVN}"
 
-S = "${WORKDIR}/${PN}"
+inherit gpephone pkgconfig autotools
 
-GPE_TARBALL_SUFFIX = "bz2"
+SRC_URI = "${GPEPHONE_SVN}"
 
-inherit gpephone pkgconfig autotools
+S = "${WORKDIR}/${PN}"
 
 do_stage () {
     autotools_stage_all
diff --git a/packages/gpephone/libgemwidget_svn.bb b/packages/gpephone/libgemwidget_svn.bb
new file mode 100644
index 0000000000..f4e2e350d8
--- /dev/null
+++ b/packages/gpephone/libgemwidget_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Extended widget library for GPE phone environment."
+LICENSE     = "LiPS"
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ libiac libgpephone gnome-vfs libxdamage libxcomposite libgpewidget"
+PV = "1.0+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+FILES_${PN} += "${datadir}/gem"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/libgpephone_svn.bb b/packages/gpephone/libgpephone_svn.bb
new file mode 100644
index 0000000000..ce960ac3cc
--- /dev/null
+++ b/packages/gpephone/libgpephone_svn.bb
@@ -0,0 +1,16 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "Base library for GPE phone environment."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ gtk-doc dbus-glib"
+PV = "0.4+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/libiac2/.mtn2git_empty b/packages/gpephone/libiac2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/libiac2/.mtn2git_empty
diff --git a/packages/gpephone/libiac2/disable-tests.patch b/packages/gpephone/libiac2/disable-tests.patch
new file mode 100644
index 0000000000..5345d1cc97
--- /dev/null
+++ b/packages/gpephone/libiac2/disable-tests.patch
@@ -0,0 +1,25 @@
+--- Makefile.am~	2008-01-10 17:43:18.000000000 +0100
++++ Makefile.am	2008-01-10 17:43:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-SUBDIRS			= src include test po
++SUBDIRS			= src include po
+ 
+ if BUILD_DAEMON
+ SUBDIRS += daemon
+--- configure.ac~	2008-01-10 17:50:03.000000000 +0100
++++ configure.ac	2008-01-10 17:50:03.000000000 +0100
+@@ -40,14 +40,11 @@
+ AM_CONDITIONAL(BUILD_DAEMON,
+ 							 test x$enable_daemon = xyes)
+ 
+-AM_PATH_CUNIT
+-
+ AC_CONFIG_FILES([
+ Makefile
+ daemon/Makefile
+ src/Makefile
+ include/Makefile
+-test/Makefile
+ po/Makefile.in
+ libiac2.pc
+ ])
diff --git a/packages/gpephone/libiac2_svn.bb b/packages/gpephone/libiac2_svn.bb
new file mode 100644
index 0000000000..7ae0c7b693
--- /dev/null
+++ b/packages/gpephone/libiac2_svn.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "LiPS IPC library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ gtk-doc dbus-glib"
+PV = "0.0+svnr-${SRCREV}"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN} \
+           file://disable-tests.patch;patch=1;pnum=0"
+
+EXTRA_OECONF = "--enable-gui --enable-test=no  --with-cuint=no"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+        autotools_stage_all
+}
diff --git a/packages/gpephone/libiac_svn.bb b/packages/gpephone/libiac_svn.bb
new file mode 100644
index 0000000000..0cd1d6487d
--- /dev/null
+++ b/packages/gpephone/libiac_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "LiPS IPC library."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+LICENSE = "LiPS"
+DEPENDS = "gtk+ gtk-doc"
+PV = "1.0+svnr-${SRCREV}"
+PR = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+        autotools_stage_all
+}
diff --git a/packages/gpephone/libim2/.mtn2git_empty b/packages/gpephone/libim2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gpephone/libim2/.mtn2git_empty
diff --git a/packages/gpephone/libim2/disable-tests.patch b/packages/gpephone/libim2/disable-tests.patch
new file mode 100644
index 0000000000..c794abd777
--- /dev/null
+++ b/packages/gpephone/libim2/disable-tests.patch
@@ -0,0 +1,11 @@
+--- libim2/Makefile.am~	2008-01-12 01:24:42.000000000 +0100
++++ libim2/Makefile.am	2008-01-12 01:24:42.000000000 +0100
+@@ -2,7 +2,7 @@
+ # have all needed files, that a GNU package needs
+ AUTOMAKE_OPTIONS = foreign 1.4
+ 
+-SUBDIRS = src include test
++SUBDIRS = src include
+ 
+ #servicesdir = @DBUS_SERVICES_DIR@
+ #services_DATA = improxy.service
diff --git a/packages/gpephone/libim2_svn.bb b/packages/gpephone/libim2_svn.bb
new file mode 100644
index 0000000000..510877ce3e
--- /dev/null
+++ b/packages/gpephone/libim2_svn.bb
@@ -0,0 +1,22 @@
+LICENSE     = "LGPL"
+DESCRIPTION = "LiPS instant messenger library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 librecord2 libabenabler2 liblipsevent2 telepathy-glib telepathy-mission-control"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN} \
+           file://disable-tests.patch;patch=1"
+
+EXTRA_OECONF = "--enable-test=no"
+
+S = ${WORKDIR}/libim2
+
+FILES_${PN} += " ${datadir}/dbus-1"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/liblipsevent2_svn.bb b/packages/gpephone/liblipsevent2_svn.bb
new file mode 100644
index 0000000000..5d2330c671
--- /dev/null
+++ b/packages/gpephone/liblipsevent2_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "LiPS event model library."
+LICENSE     = "LiPS"
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/libmsgenabler2_svn.bb b/packages/gpephone/libmsgenabler2_svn.bb
new file mode 100644
index 0000000000..a294dc93b7
--- /dev/null
+++ b/packages/gpephone/libmsgenabler2_svn.bb
@@ -0,0 +1,23 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS message backend library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 dbus-glib librecord2 liblipsevent2 telepathy-mission-control libgsmd-lips"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r2"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = ${WORKDIR}/${PN}
+
+FILES_${PN} += "${datadir}/libmsgenabler2 ${libdir}/msg-providers/*.0"
+FILES_${PN}-dev += "${libdir}/msg-providers/*.so ${libdir}/msg-providers/*a"
+FILES_${PN}-dbg += "${libdir}/msg-providers/.debug"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/libmsgenabler_1.0.bb b/packages/gpephone/libmsgenabler_1.0.bb
index 0522507db0..b8d202a5dd 100644
--- a/packages/gpephone/libmsgenabler_1.0.bb
+++ b/packages/gpephone/libmsgenabler_1.0.bb
@@ -3,12 +3,14 @@ DESCRIPTION = "LiPS message backend library."
 SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 dbus-glib librecord sqlite3"
-PR          = "r0"
+PR          = "r1"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpephone pkgconfig autotools
 
+FILES_${PN} += "$(datadir)/libmsgenabler"
+
 do_stage () {
 	autotools_stage_all
 }
diff --git a/packages/gpephone/libmsgenabler_svn.bb b/packages/gpephone/libmsgenabler_svn.bb
new file mode 100644
index 0000000000..c8672e143e
--- /dev/null
+++ b/packages/gpephone/libmsgenabler_svn.bb
@@ -0,0 +1,21 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS message backend library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "glib-2.0 dbus-glib librecord sqlite3"
+PV = "1.0+svnr-${SRCREV}"
+PR          = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+FILES_${PN} += "$(datadir)/libmsgenabler"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/librecord2_svn.bb b/packages/gpephone/librecord2_svn.bb
index 6580f6566f..378032dabf 100644
--- a/packages/gpephone/librecord2_svn.bb
+++ b/packages/gpephone/librecord2_svn.bb
@@ -4,7 +4,7 @@ SECTION = "gpe/libs"
 PRIORITY    = "optional"
 DEPENDS     = "glib-2.0 e2fsprogs-libs sqlite3"
 PR          = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/libsettings_svn.bb b/packages/gpephone/libsettings_svn.bb
index e436849d74..74e1190c5a 100644
--- a/packages/gpephone/libsettings_svn.bb
+++ b/packages/gpephone/libsettings_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpe/libs"
 PRIORITY = "required"
 LICENSE = "LiPS"
 DEPENDS = "glib-2.0 gconf-dbus"
-PV = "0.0+svn-${SRCDATE}"
+PV = "0.0+svnr-${SRCREV}"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/gpephone/libtapi_svn.bb b/packages/gpephone/libtapi_svn.bb
new file mode 100644
index 0000000000..68e578728a
--- /dev/null
+++ b/packages/gpephone/libtapi_svn.bb
@@ -0,0 +1,17 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS telephony library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ libglade libgsmd"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/libvoc_svn.bb b/packages/gpephone/libvoc_svn.bb
new file mode 100644
index 0000000000..3389c7d10a
--- /dev/null
+++ b/packages/gpephone/libvoc_svn.bb
@@ -0,0 +1,17 @@
+LICENSE     = "LiPS"
+DESCRIPTION = "LiPS voice call library."
+SECTION = "gpe/libs"
+PRIORITY    = "optional"
+DEPENDS     = "gtk+ libglade libgsmd"
+PV = "0.0+svnr-${SRCREV}"
+PR          = "r0"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+do_stage () {
+	autotools_stage_all
+}
diff --git a/packages/gpephone/machined_svn.bb b/packages/gpephone/machined_svn.bb
index 5c96cfa97c..0c5ccfff51 100644
--- a/packages/gpephone/machined_svn.bb
+++ b/packages/gpephone/machined_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 dbus-glib gtk+"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb
index 37c99f7dd1..281ee72c26 100644
--- a/packages/gpephone/ptim-engine_svn.bb
+++ b/packages/gpephone/ptim-engine_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb
index 304c103505..4384feccbd 100644
--- a/packages/gpephone/ptim-headers_svn.bb
+++ b/packages/gpephone/ptim-headers_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 
 inherit gpephone pkgconfig autotools
 
diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb
index 3461de6225..71b004e92b 100644
--- a/packages/gpephone/ptim-helper_svn.bb
+++ b/packages/gpephone/ptim-helper_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb
index 5c8042c5d5..da0f4e6af4 100644
--- a/packages/gpephone/ptim-manager_svn.bb
+++ b/packages/gpephone/ptim-manager_svn.bb
@@ -3,7 +3,7 @@ SECTION = "gpephone"
 PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers libiac"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
 PR = "r2"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gpephone/quickdial_svn.bb b/packages/gpephone/quickdial_svn.bb
index 4533bf4ee8..2a52510d86 100644
--- a/packages/gpephone/quickdial_svn.bb
+++ b/packages/gpephone/quickdial_svn.bb
@@ -5,11 +5,9 @@ PRIORITY    = "optional"
 PR          = "r0"
 PV = "0.0+svnr-${SRCREV}"
 
-SRCREV_pn-${PN} ?= "1393"
-
 DEFAULT_PREFERENCE = "-1"
 
-DEPENDS = "gtk+ librecord2 libgpephone hiker"
+DEPENDS = "gtk+ librecord2 libgpephone"
 
 inherit gpephone autotools pkgconfig
 
@@ -17,5 +15,6 @@ SRC_URI = "${GPEPHONE_SVN}"
 
 S = "${WORKDIR}/${PN}"
 
+EXTRA_OECONF = "--disable-hiker"
 
 FILES_${PN} += "${datadir}/qdial/database"
diff --git a/packages/gpephone/useen_svn.bb b/packages/gpephone/useen_svn.bb
index 93d180ba52..1a180683a7 100644
--- a/packages/gpephone/useen_svn.bb
+++ b/packages/gpephone/useen_svn.bb
@@ -5,8 +5,6 @@ PRIORITY    = "optional"
 PR          = "r0"
 PV = "0.0+svnr-${SRCREV}"
 
-SRCREV_pn-${PN} ?= "1400"
-
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS = "glib-2.0"