diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-01-18 11:18:11 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-01-18 11:18:11 +0000 |
commit | 48bc9563ce82fa7602fa718282c8df5dce871136 (patch) | |
tree | 28430c54fedcb1596681bf2dafdd595b4307ff68 /packages | |
parent | ac5f0dfc6727c4877c6cb5d1ca1849ff8ec1f607 (diff) | |
parent | 2336537385c231cec71421c993e914ee0b95dbbe (diff) |
merge of '85bed711422189f6cd0b95f0a006355d223421ba'
and 'd6e4205baf5089d50dbd56f79575fa80e4205b58'
Diffstat (limited to 'packages')
-rw-r--r-- | packages/tasks/task-xfce-base.bb | 7 | ||||
-rw-r--r-- | packages/xfdesktop/xfdesktop.inc | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/packages/tasks/task-xfce-base.bb b/packages/tasks/task-xfce-base.bb index 71aec2a8b0..bd6841f025 100644 --- a/packages/tasks/task-xfce-base.bb +++ b/packages/tasks/task-xfce-base.bb @@ -3,12 +3,13 @@ # Released under the MIT license (see packages/COPYING) DESCRIPTION = "All packages required for an base XFCE installation" +LICENSE = "MIT" ALLOW_EMPTY = "1" PACKAGES = "${PN}" -PR = "r1" +PR = "r2" RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \ xfce4-panel xfce4-panel-plugins xfce-mcs-plugins xfwm4-mcs-plugins \ - xfce-utils-mcs-plugins xfce4-panel-mcs-plugins \ + xfce4-panel-mcs-plugins \ xfdesktop-mcs-plugins" -LICENSE = "MIT" +RRECOMMENDS = "xfce-utils-mcs-plugins" diff --git a/packages/xfdesktop/xfdesktop.inc b/packages/xfdesktop/xfdesktop.inc index 380832d7c3..e3e64ef355 100644 --- a/packages/xfdesktop/xfdesktop.inc +++ b/packages/xfdesktop/xfdesktop.inc @@ -4,7 +4,7 @@ DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" -DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2" +DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel" inherit xfce PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" @@ -12,5 +12,3 @@ PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins" FILES_xfdesktop-backdrops="${datadir}/xfce4/backdrops/*" FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so" FILES_${PN} += "${libdir}/xfce4/panel-plugins/*.so" - - |