xfdesktop: use a single recipe since we don't have multiple versions packaged

diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc
deleted file mode 100644 (file)
index 35c5ff5..0000000
--- a/packages/xfce/xfdesktop.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# xfdesktop OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="xfce4 Desktop Background Manager"
-SECTION = "x11/base"
-DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel"
-
-inherit xfce
-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 \
-                ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
-                ${datadir}/xfce4/panel-plugins/*.desktop"
-FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug"

diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb
index bc35aca..35c5ff5 100644 (file)
--- a/packages/xfce/xfdesktop_4.4.1.bb
+++ b/packages/xfce/xfdesktop_4.4.1.bb
@@ -2,5 +2,16 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-FILE_PR = "r2"
-require ${PN}.inc
+DESCRIPTION="xfce4 Desktop Background Manager"
+SECTION = "x11/base"
+DEPENDS = "virtual/libx11 libxfcegui4 libxfce4mcs libxml2 xfce4-panel"
+
+inherit xfce
+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 \
+                ${libdir}/xfce4/panel-plugins/xfce4-menu-plugin \
+                ${datadir}/xfce4/panel-plugins/*.desktop"
+FILES_${PN}-dbg += "/usr/libexec/xfce4/panel-plugins/.debug"