summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@embeddedalley.com>2009-02-04 15:48:21 -0500
committerTom Rini <trini@embeddedalley.com>2009-02-04 15:48:21 -0500
commit274d530e71076ca35eeacc47a7e60186aaa8cc35 (patch)
tree6d96cd72fcd3c84e6abe8e92e7e95f32ac42d346
parente16a44c08abde9d85276d12120dbbd37cf980fee (diff)
parentdd80fdb4407d9f6941286d7ef708153e3ecba89c (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--conf/checksums.ini8
-rw-r--r--packages/ddccontrol/ddccontrol-db_20061014.bb10
-rw-r--r--packages/ddccontrol/ddccontrol_0.4.2.bb13
-rw-r--r--packages/python/python-coherence_0.6.0.bb4
4 files changed, 33 insertions, 2 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 691f7eb9e6..15c8c5697e 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3930,6 +3930,14 @@ sha256=4a319a08ae0838234f5b6fbd0b4d2e0fac7560a7553a4e1b043527cc17032aa3
md5=537cda2dff7dfaf87660fee91b2cf78f
sha256=bd7ce3b854678209e8624698a4000d3e5337339c3825c58a4b3a0a2fbf1a7819
+[http://downloads.sourceforge.net/ddccontrol/ddccontrol-0.4.2.tar.bz2]
+md5=b0eb367f3bc0564bd577e38d0b4107fc
+sha256=986f3b4b27ec04e1da493de3aaab01cd5ea9566d7572c1a40b8d43cd7a491e84
+
+[http://downloads.sourceforge.net/ddccontrol/ddccontrol-db-20061014.tar.bz2]
+md5=91951918e5bc553c251776cdff8cea9c
+sha256=ff88f8e5122a2ab7b69a961f267f74d09ec7c54e90453ee80930edf66955c7b8
+
[http://downloads.sourceforge.net/ddclient/ddclient-3.6.3.tar.bz2]
md5=42a3a420e492c0111adc58ac08ff6d04
sha256=28be7102bde3bc9b39be2732b89da9fbab79b7ac3898075ed414a45258bb3026
diff --git a/packages/ddccontrol/ddccontrol-db_20061014.bb b/packages/ddccontrol/ddccontrol-db_20061014.bb
new file mode 100644
index 0000000000..acea818b87
--- /dev/null
+++ b/packages/ddccontrol/ddccontrol-db_20061014.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "ddccontrol - softwarewise change monitor settings"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://sourceforge.net/projects/ddccontrol/"
+
+PR = "r0"
+
+inherit autotools
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ddccontrol/ddccontrol-db-${PV}.tar.bz2"
+
diff --git a/packages/ddccontrol/ddccontrol_0.4.2.bb b/packages/ddccontrol/ddccontrol_0.4.2.bb
new file mode 100644
index 0000000000..2099ebeb4e
--- /dev/null
+++ b/packages/ddccontrol/ddccontrol_0.4.2.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "ddccontrol - softwarewise change monitor settings"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://sourceforge.net/projects/ddccontrol/"
+
+PR = "r0"
+
+inherit autotools
+
+DEPENDS = "pciutils libxml2 gtk+ ddccontrol-db"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ddccontrol/ddccontrol-${PV}.tar.bz2"
+
+FILES_${PN}+= "${datadir}/icons/Bluecurve/48x48/apps/gddccontrol.png"
diff --git a/packages/python/python-coherence_0.6.0.bb b/packages/python/python-coherence_0.6.0.bb
index 8be13c3af5..5656089a06 100644
--- a/packages/python/python-coherence_0.6.0.bb
+++ b/packages/python/python-coherence_0.6.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Coherence is a DLNA/UPnP mediaserver + backends"
SECTION = "python/devel"
LICENSE = "MIT"
HOMEPAGE = "http://coherence.beebits.net/wiki"
-PR = "r1"
+PR = "r2"
inherit setuptools
@@ -10,6 +10,6 @@ SRC_URI = "http://coherence.beebits.net/download/Coherence-${PV}.tar.gz"
S = "${WORKDIR}/Coherence-${PV}"
FILES_${PN} += "${datadir}"
-RDEPENDS_${PN} += "python-twisted"
+RDEPENDS_${PN} += "python-twisted python-twisted-core"