4 files changed, 17 insertions, 19 deletions
diff --git a/packages/proftpd/proftpd_1.3.2.bb b/packages/proftpd/proftpd_1.3.2.bb
new file mode 100644
index 0000000000..13442b1412
--- /dev/null
+++ b/packages/proftpd/proftpd_1.3.2.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Secure ftp daemon"
+SECTION = "console/network"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.nl.uu.net/pub/unix/ftp/proftpd/ftp/distrib/source/${PN}-${PV}.tar.gz \
+	"
+
diff --git a/packages/python/python-coherence_0.6.0.bb b/packages/python/python-coherence_0.6.0.bb
deleted file mode 100644
index bf9d964f99..0000000000
--- a/packages/python/python-coherence_0.6.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
-SECTION = "devel/python"
-LICENSE = "MIT"
-HOMEPAGE = "http://coherence.beebits.net/wiki"
-PR = "r5"
-
-inherit setuptools
-
-SRC_URI = "http://coherence.beebits.net/download/Coherence-${PV}.tar.gz"
-S = "${WORKDIR}/Coherence-${PV}"
-
-FILES_${PN} += "${datadir}"
-RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules"
-
-
diff --git a/packages/python/python-coherence_0.6.2.bb b/packages/python/python-coherence_0.6.2.bb
index 7d25f0868e..54eed59574 100644
--- a/packages/python/python-coherence_0.6.2.bb
+++ b/packages/python/python-coherence_0.6.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
 SECTION = "devel/python"
 LICENSE = "MIT"
 HOMEPAGE = "http://coherence.beebits.net/wiki"
-PR = "r0"
+PR = "r1"
 
 inherit setuptools
 
@@ -12,6 +12,9 @@ S = "${WORKDIR}/Coherence-${PV}"
 FILES_${PN} += "${datadir}"
 
 DEPENDS = "libxml2 libxml2-native"
-RDEPENDS_${PN} += "python-gst python-dbus python-configobj python-twisted python-twisted-core python-misc python-zopeinterface zope python-modules"
+RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \
+	python-configobj python-twisted python-twisted-core python-twisted-protocols python-misc \
+	python-zopeinterface python-modules python-pygobject python-gdata \
+	python-divmodaxiom"
 
 
diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb
index cd854250b6..05df3dd48d 100644
--- a/packages/zope/zope_3.3.1.bb
+++ b/packages/zope/zope_3.3.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz"
 S = "${WORKDIR}/Zope-${PV}"
@@ -43,5 +43,7 @@ ${libdir}/${PYTHON_DIR}/zope/i18nmessageid/.debug \
 ${libdir}/${PYTHON_DIR}/ZODB/.debug"
 FILES_python-zopeinterface-dbg += "${libdir}/${PYTHON_DIR}/zope/interface/.debug "
 
-FILES_python-zopeinterface = "${libdir}/${PYTHON_DIR}/zope/interface/*.* ${libdir}/${PYTHON_DIR}/zope/interface/common"
+FILES_python-zopeinterface = " ${libdir}/${PYTHON_DIR}/zope/__init__.py* \
+	${libdir}/${PYTHON_DIR}/zope/interface/*.* \
+	${libdir}/${PYTHON_DIR}/zope/interface/common"