2 files changed, 10 insertions, 31 deletions
diff --git a/packages/xfce4-panel/xfce4-panel.inc b/packages/xfce4-panel/xfce4-panel.inc
index 4950da6f68..30473eea06 100644
--- a/packages/xfce4-panel/xfce4-panel.inc
+++ b/packages/xfce4-panel/xfce4-panel.inc
@@ -2,17 +2,14 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
-DESCRIPTION="XFCE4 Panel"
+DESCRIPTION = "XFCE4 Panel"
 SECTION = "x11"
-DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
+DEPENDS = "startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
+
 inherit pkgconfig xfce
 
 EXTRA_OECONF += " --enable-startup-notification"
 
-do_install() {
-	oe_runmake DESTDIR=${D} install
-}
-
 HEADERS="controls.h global.h icons.h main.h panel.h item.h \
 	item_dialog.h plugins.h xfce_support.h xfce.h"
 
@@ -23,3 +20,10 @@ do_stage() {
 		install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file
 	done
 }
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+}
+
+PACKAGES += "${PN}-plugins"
+FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so*"
diff --git a/packages/xfce4-panel/xfce4-panel_4.2.0.bb b/packages/xfce4-panel/xfce4-panel_4.2.0.bb
deleted file mode 100644
index 4950da6f68..0000000000
--- a/packages/xfce4-panel/xfce4-panel_4.2.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-# xfce4-panel OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION="XFCE4 Panel"
-SECTION = "x11"
-DEPENDS="startup-notification x11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
-inherit pkgconfig xfce
-
-EXTRA_OECONF += " --enable-startup-notification"
-
-do_install() {
-	oe_runmake DESTDIR=${D} install
-}
-
-HEADERS="controls.h global.h icons.h main.h panel.h item.h \
-	item_dialog.h plugins.h xfce_support.h xfce.h"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/xfce4/panel
-
-	for file in ${HEADERS}; do 
-		install -m 644 ${S}/panel/$file ${STAGING_INCDIR}/xfce4/panel/$file
-	done
-}