14 files changed, 87 insertions, 23 deletions
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
new file mode 100644
index 0000000000..6288c0ab91
--- /dev/null
+++ b/conf/distro/include/fso-autorev.inc
@@ -0,0 +1,8 @@
+SRCREV_pn-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-pygsm = "${AUTOREV}"
+SRCREV_pn-pyneod = "${AUTOREV}"
+SRCREV_pn-pynoeg = "${AUTOREV}"
+SRCREV_pn-python-odeviced = "${AUTOREV}"
+SRCREV_pn-python-ophoned = "${AUTOREV}"
+SRCREV_pn-python-pytrc = "${AUTOREV}"
+SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index b465dae3ea..db944f9861 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -37,7 +37,7 @@ SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "295"
+SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
@@ -152,10 +152,12 @@ SRCREV_pn-opkg-sdk ?= "4247"
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-py-odeviced ?= "283"
+SRCREV_pn-python-odeviced ?= "e2ae2c252ef43be23781c2d09567a8d21ca1e965"
+SRCREV_pn-python-ophoned ?= "e657c81a6729aeef21ba4c6b75590658cbbef391"
+SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
-SRCREV_pn-pyneod ?= "88"
-SRCREV_pn-pyneog ?= "88"
+SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
+SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
 SRCREV_pn-python-formencode = "3148"
 SRCREV_pn-python-gsmd = "148"
 SRCREV_pn-python-lightmediascanner = "68"
@@ -173,4 +175,4 @@ SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1971"
-
+SRCREV_pn-zhone ?= "a9496c35328f66ed8e4f840709721c5bacae2bb4"
diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_git.bb
index 07eac3c919..d5e9bd0672 100644
--- a/packages/freesmartphone/gsm0710muxd_svn.bb
+++ b/packages/freesmartphone/gsm0710muxd_git.bb
@@ -1,15 +1,15 @@
 DESCRIPTION = "GSM 07.10 muxer userspace daemon"
-HOMEPAGE = "http://www.freesmartphone.org"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd"
 AUTHOR = "M. Dietrich"
 SECTION = "console/network"
 DEPENDS = "dbus dbus-glib"
 RDEPENDS = "dbus dbus-glib"
 LICENSE = "GPL"
-PV = "0.9.1+svnr${SRCREV}"
-PR = "r1"
+PV = "0.9.1+gitr${SRCREV}"
+PR = "r0"
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
-S = "${WORKDIR}/gsm0710muxd"
+SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
 
 inherit autotools
 
diff --git a/packages/freesmartphone/pygsm_git.bb b/packages/freesmartphone/pygsm_git.bb
new file mode 100644
index 0000000000..7ee9d6824f
--- /dev/null
+++ b/packages/freesmartphone/pygsm_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Python support library for GSM 07.07 / GSM 07.05 daemons"
+AUTHOR = "Michael Dietrich"
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPL"
+PV = "0.0.0+gitr${SRCREV}"
+PR = "r0"
+
+inherit distutils
+
+SRC_URI = "${FREESMARTPHONE_GIT}/pygsm.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+RDEPENDS_${PN} += "\
+  python-dbus \
+  python-pygobject \
+  python-syslog \
+"
diff --git a/packages/freesmartphone/pyneod_svn.bb b/packages/freesmartphone/pyneod_git.bb
index 1ca728afe1..7cdfaace22 100644
--- a/packages/freesmartphone/pyneod_svn.bb
+++ b/packages/freesmartphone/pyneod_git.bb
@@ -1,18 +1,19 @@
-DESCRIPTION = "FIC Neo Smartphone daemons implementing the freesmartphone.org dbus APIs"
+DESCRIPTION = "Zad - daemons"
+HOMEPAGE = "http://neo1973-germany.de/wiki/Zad"
 AUTHOR = "M. Dietrich"
 SECTION = "console/network"
 DEPENDS = "python"
 LICENSE = "GPL"
-PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PV = "0.0.0+gitr${SRCREV}"
+PR = "r0"
 
 inherit update-rc.d
 
 INITSCRIPT_NAME = "pyneod"
 INITSCRIPT_PARAMS = "defaults 40"
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneod"
-S = "${WORKDIR}/pyneod"
+SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/pyneod"
 
 export D := "${D}"
 export PREFIX = "${prefix}"
diff --git a/packages/freesmartphone/pyneog_svn.bb b/packages/freesmartphone/pyneog_git.bb
index 389c7369e5..c7d0235d03 100644
--- a/packages/freesmartphone/pyneog_svn.bb
+++ b/packages/freesmartphone/pyneog_git.bb
@@ -1,12 +1,13 @@
-DESCRIPTION = "FIC Neo Smartphone UI Environment"
+DESCRIPTION = "Zad - GUI"
+HOMEPAGE = "http://neo1973-germany.de/wiki/Zad"
 AUTHOR = "M. Dietrich"
 SECTION = "python/ui"
 LICENSE = "GPL"
-PV = "0.0+svnr${SRCREV}"
+PV = "0.0.0+gitr${SRCREV}"
 PR = "r0"
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=pyneog"
-S = "${WORKDIR}/pyneog"
+SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master"
+S = "${WORKDIR}/git/pyneog"
 
 do_compile() {
 	:
diff --git a/packages/freesmartphone/py-odeviced/.mtn2git_empty b/packages/freesmartphone/python-odeviced/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/freesmartphone/py-odeviced/.mtn2git_empty
+++ b/packages/freesmartphone/python-odeviced/.mtn2git_empty
diff --git a/packages/freesmartphone/py-odeviced/odeviced b/packages/freesmartphone/python-odeviced/odeviced
index 52d3a1d196..52d3a1d196 100644
--- a/packages/freesmartphone/py-odeviced/odeviced
+++ b/packages/freesmartphone/python-odeviced/odeviced
diff --git a/packages/freesmartphone/py-odeviced/odeviced.conf b/packages/freesmartphone/python-odeviced/odeviced.conf
index e69de29bb2..e69de29bb2 100644
--- a/packages/freesmartphone/py-odeviced/odeviced.conf
+++ b/packages/freesmartphone/python-odeviced/odeviced.conf
diff --git a/packages/freesmartphone/py-odeviced/om-gta02/.mtn2git_empty b/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/freesmartphone/py-odeviced/om-gta02/.mtn2git_empty
+++ b/packages/freesmartphone/python-odeviced/om-gta02/.mtn2git_empty
diff --git a/packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf b/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
index b2f979a784..b2f979a784 100644
--- a/packages/freesmartphone/py-odeviced/om-gta02/odeviced.conf
+++ b/packages/freesmartphone/python-odeviced/om-gta02/odeviced.conf
diff --git a/packages/freesmartphone/py-odeviced_svn.bb b/packages/freesmartphone/python-odeviced_git.bb
index 55b230c3ec..d380473878 100644
--- a/packages/freesmartphone/py-odeviced_svn.bb
+++ b/packages/freesmartphone/python-odeviced_git.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "The Open Device Daemon Prototype in Python"
-HOMEPAGE = "http://www.freesmartphone.org"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenDeviceDaemon"
 AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPLv2"
-PV = "0.7.9+svnr${SRCREV}"
+PV = "0.7.9+gitr${SRCREV}"
 PR = "r0"
 
 inherit distutils update-rc.d
@@ -12,10 +12,10 @@ inherit distutils update-rc.d
 INITSCRIPT_NAME = "odeviced"
 INITSCRIPT_PARAMS = "defaults 20"
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=py-odeviced \
+SRC_URI = "${FREESMARTPHONE_GIT}/python-odeviced.git;protocol=git;branch=master \
            file://odeviced \
            file://odeviced.conf"
-S = "${WORKDIR}/py-odeviced"
+S = "${WORKDIR}/git"
 
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d/
diff --git a/packages/freesmartphone/python-ophoned/.mtn2git_empty b/packages/freesmartphone/python-ophoned/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/freesmartphone/python-ophoned/.mtn2git_empty
diff --git a/packages/freesmartphone/python-ophoned_git.bb b/packages/freesmartphone/python-ophoned_git.bb
new file mode 100644
index 0000000000..ebfe0c4b13
--- /dev/null
+++ b/packages/freesmartphone/python-ophoned_git.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "The Open Phone Daemon (Python Implementation)"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/OpenPhoneServer"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
+SECTION = "console/network"
+DEPENDS = "python-cython-native python-pyrex-native"
+LICENSE = "GPLv2"
+PV = "0.0.0+gitr${SRCREV}"
+PR = "r0"
+
+inherit distutils update-rc.d
+
+INITSCRIPT_NAME = "ophoned"
+INITSCRIPT_PARAMS = "defaults 20"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/python-ophoned.git;protocol=git;branch=master \
+           file://ophoned"
+S = "${WORKDIR}/git"
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/init.d/
+	install -m 0755 ${WORKDIR}/ophoned ${D}${sysconfdir}/init.d/
+#	install -m 0644 ${WORKDIR}/odeviced.conf ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/dbus-1/system.d/
+#	mv -f ${D}${datadir}/etc/dbus-1/system.d/odeviced.conf ${D}${sysconfdir}/dbus-1/system.d/
+}
+
+RDEPENDS_${PN} += "\
+  python-dbus \
+  python-pygobject \
+  python-pyrtc \
+  python-syslog \
+"
+
+FILES_${PN} += "${sysconfdir}"