Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/03 17:20:33+02:00 uni-frankfurt.de!mickeyl
remove more things that don't build w/ gcc 2.95.3

2005/05/03 17:15:36+02:00 uni-frankfurt.de!mickeyl
slight fixes for xfce-image. could anyone more familiar with xfce look at it please? it still doesn't build

BKrev: 42779b52Talu7R2DmQqkKhtMqy5oEQ

diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index 02e9559..10098da 100644 (file)
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -18,9 +18,9 @@ EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/"
 
 # FIXME:  Put icons in their own package too?
 
-PACKAGES += "${PN}-mcs-plugins ${PN}-panel-plugins"
+PACKAGES += "${PN}-mcs-plugins ${PN}-plugins"
 
 FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*"
-FILES_${PN}-panel-plugins += "${libdir}/xfce4/panel-plugins/*.so*"
+FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*"
 FILES_${PN}-doc += " ${datadir}/xfce4/doc"
 FILES_${PN}-mcs-plugins="${libdir}/xfce4/mcs-plugins/*.so"

diff --git a/packages/meta/task-python-sharprom_0.9.0.bb b/packages/meta/task-python-sharprom_0.9.0.bb
index 07132e7..ebcc123 100644 (file)
--- a/packages/meta/task-python-sharprom_0.9.0.bb
+++ b/packages/meta/task-python-sharprom_0.9.0.bb
@@ -1,6 +1,6 @@
 DESCRIPTION= "Everything Python for SharpROM"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-PR = "r1"
+PR = "r2"
 
 NONWORKING = "  python-codes           \
                python-crypto           \
@@ -8,7 +8,8 @@ NONWORKING = "  python-codes            \
                python-pysqlite         \
                python-pygtk            \
                python-pyqwt            \
-               python-sgmlop"
+               python-sgmlop           \
+               python-vorbis"
 
 DEPENDS = "    python-ao               \
                python-constraint       \
@@ -47,7 +48,6 @@ DEPENDS = "   python-ao               \
                python-tlslite          \
                python-urwid            \
                python-vmaps            \
-               python-vorbis           \
                moin                    \
                plone                   \
                twisted                 \

diff --git a/packages/meta/task-xfce-base.bb b/packages/meta/task-xfce-base.bb
index 8accb3a..f11f1a9 100644 (file)
--- a/packages/meta/task-xfce-base.bb
+++ b/packages/meta/task-xfce-base.bb
@@ -5,13 +5,13 @@
 DESCRIPTION = "All packages required for an base XFCE installation"
 ALLOW_EMPTY = 1
 PACKAGES = "${PN}"
+PR = "r1"
 
 DEPENDS = "xfce-mcs-manager xfce-mcs-plugins xfwm4 xfce4-panel \
        xfdesktop xfce-utils"
 
 RDEPENDS= "xfce-mcs-manager xfwm4 xfwm4-theme-default xfce-utils xfdesktop \
-       xfce4-panel xfce4-panel-plugins xfce4-panel-theme-curve \
-       xfce-mcs-plugins xfwm4-mcs-plugins \
+       xfce4-panel xfce4-panel-plugins xfce4-mcs-plugins xfwm4-mcs-plugins \
        xfce-utils-mcs-plugins xfce4-panel-mcs-plugins \
        xfdesktop-mcs-plugins"
 LICENSE = MIT