diff options
author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-08-20 00:26:51 +0000 |
---|---|---|
committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-08-20 00:26:51 +0000 |
commit | d14f1d32d10f03cba0f148a4b38cfb7b9915858d (patch) | |
tree | f22bcec3620a70c527bd3b3ace850705f21a0496 | |
parent | 18175b3ef0d09bedf347ce292dd8dd1ec94fa6bf (diff) | |
parent | f923801e024e0b18362e51140d59ad94d87af913 (diff) |
merge of '5a27dc2251870d3b0fba8216aa90a9b93350f68e'
and 'f94b55ab9207117d34fe0171c0ec596dc4ac85b5'
5 files changed, 6 insertions, 4 deletions
diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb index 976c8c4142..c746da6c8f 100644 --- a/packages/flumotion/flumotion_0.4.1.bb +++ b/packages/flumotion/flumotion_0.4.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Fluendo Streaming Server" LICENSE = "GPL" -DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk" +DEPENDS = "gstreamer python-imaging python-gst python-twisted python-pygtk" RDEPENDS = "python-resource python-pprint python-threading \ python-imaging python-xml python-curses \ python-compression python-fcntl python-pygobject \ diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb index 3f1c0e594f..1d79379863 100644 --- a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb @@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" S = "${WORKDIR}/midpath-0.3rc1" -DEPENDS = "classpath qt-mt" +DEPENDS = "classpath qte-mt" RCONFLICTS = "midpath-backend-qte" inherit qt3x11 diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb index ba12796d28..f26ea4eac5 100644 --- a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb @@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" S = "${WORKDIR}/midpath-0.3rc1" -DEPENDS = "classpath qt-mt" +DEPENDS = "classpath qte-mt" inherit qt4x11 diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb index c812b34234..6d7cb9dba7 100644 --- a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb +++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb @@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz" S = "${WORKDIR}/midpath-0.3rc1" -DEPENDS = "classpath qt-mt" +DEPENDS = "classpath qte-mt" RCONFLICTS = "midpath-backend-qt3" inherit qt3e diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb index acbf3da7b9..e394547fd5 100644 --- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb +++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb @@ -4,6 +4,8 @@ DEPENDS = "imagemagick-native librsvg-native" PV = "0.1.0+svnr${SRCREV}" PR = "r2" +EXCLUDE_FROM_WORLD = "1" + inherit openmoko2 SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http" |