4 files changed, 21 insertions, 122 deletions
diff --git a/packages/pyneo/gsm0710muxd_1.7.bb b/packages/pyneo/gsm0710muxd_1.7.bb
new file mode 100644
index 0000000000..23e1dbdb76
--- /dev/null
+++ b/packages/pyneo/gsm0710muxd_1.7.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "gsm 07.10 muxer userspace daemon"
+HOMEPAGE = "http://pyneo.org/muxer"
+AUTHOR = "M. Dietrich"
+LICENSE = "GPL3"
+SECTION = "console/network"
+DEPENDS = "dbus dbus-glib intltool-native"
+PR = "r6"
+
+SRC_URI = "http://pyneo.org/downloads/${PN}-${PV}.tgz"
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "gsm0710muxd"
+INITSCRIPT_PARAMS = "defaults 55"
+
+FILES_${PN} += "${datadir} ${sysconfdir}"
+
+RDEPENDS = "dbus dbus-glib"
+RCONFLICTS = "gsmmux fso-gsm0710muxd"
+RREPLACES = "gsmmux"
+
diff --git a/packages/pyneo/gsm0710muxd_git.bb b/packages/pyneo/gsm0710muxd_git.bb
deleted file mode 100644
index 2ab9f12d2c..0000000000
--- a/packages/pyneo/gsm0710muxd_git.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "GSM 07.10 muxer userspace daemon"
-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.2.2+gitr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/gsm0710muxd.git;protocol=git;branch=master"
-S = "${WORKDIR}/git"
-
-inherit autotools
-
-# install init script for people who want to manually
-# start/stop it, but don't add runlevels.
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 data/gsm0710muxd ${D}${sysconfdir}/init.d/
-}
-
-FILES_${PN} += "${datadir} ${sysconfdir}"
diff --git a/packages/pyneo/pyneod_git.bb b/packages/pyneo/pyneod_git.bb
deleted file mode 100644
index 7cdfaace22..0000000000
--- a/packages/pyneo/pyneod_git.bb
+++ /dev/null
@@ -1,67 +0,0 @@
-DESCRIPTION = "Zad - daemons"
-HOMEPAGE = "http://neo1973-germany.de/wiki/Zad"
-AUTHOR = "M. Dietrich"
-SECTION = "console/network"
-DEPENDS = "python"
-LICENSE = "GPL"
-PV = "0.0.0+gitr${SRCREV}"
-PR = "r0"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "pyneod"
-INITSCRIPT_PARAMS = "defaults 40"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/pyneod"
-
-export D := "${D}"
-export PREFIX = "${prefix}"
-
-do_compile() {
-	:
-}
-
-do_install() {
-	python setup.py
-}
-
-RCONFLICTS = "gsmd"
-RREPLACES = "gsmd"
-RDEPENDS = "\
-  python-codecs \
-  python-compression \
-  python-crypt \
-  python-curses \
-  python-datetime \
-  python-dbus \
-  python-fcntl \
-  python-gdbm \
-  python-gst \
-  python-html \
-  python-io \
-  python-lang \
-  python-logging \
-  python-math \
-  python-mime \
-  python-netclient \
-  python-netserver \
-  python-pickle \
-  python-pprint \
-  python-pycrypto \
-  python-pygobject \
-  python-pyserial \
-  python-re \
-  python-readline \
-  python-shell \
-  python-simplejson \
-  python-sqlite3 \
-  python-stringold \
-  python-syslog \
-  python-threading \
-  python-xml \
-  python-zlib \
-"
-
-FILES_${PN} = "${datadir} ${sysconfdir} ${bindir}"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/pyneo/zad_git.bb b/packages/pyneo/zad_git.bb
deleted file mode 100644
index c7d0235d03..0000000000
--- a/packages/pyneo/zad_git.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Zad - GUI"
-HOMEPAGE = "http://neo1973-germany.de/wiki/Zad"
-AUTHOR = "M. Dietrich"
-SECTION = "python/ui"
-LICENSE = "GPL"
-PV = "0.0.0+gitr${SRCREV}"
-PR = "r0"
-
-SRC_URI = "${FREESMARTPHONE_GIT}/pyneo.git;protocol=git;branch=master"
-S = "${WORKDIR}/git/pyneog"
-
-do_compile() {
-	:
-}
-
-do_install() {
-	find . -name ".svn"|xargs rm -rf
-	install -d ${D}${datadir}/pyneog
-	for i in media *.py; do
-		cp -a $i ${D}${datadir}/pyneog/
-	done
-
-	install -d ${D}${sysconfdir}/X11/Xsession.d/
-	install -m 0755 80pyneog ${D}${sysconfdir}/X11/Xsession.d/
-}
-
-FILES_${PN} = "${datadir} ${bindir} ${sysconfdir}"
-
-RCONFLICTS = "openmoko-session2"
-RREPlACES = "openmoko-session2"
-RDEPENDS = "task-python-efl"
-PACKAGE_ARCH = "${MACHINE_ARCH}"