xfce-utils: use a single recipe since we don't have multiple versions packaged

diff --git a/packages/xfce/xfce-utils.inc b/packages/xfce/xfce-utils.inc
deleted file mode 100644 (file)
index d681fd7..0000000
--- a/packages/xfce/xfce-utils.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-# xfce-utils OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE4 Utilities"
-DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager"
-inherit xfce
-
-FILES_${PN} += " \ 
-        ${bindir}/* \
-        ${datadir}/dbus-1/* \
-        ${datadir}/xfce4/AUTHORS \
-        ${datadir}/xfce4/BSD \
-        ${datadir}/xfce4/COPYING \
-        ${datadir}/xfce4/GPL \
-       ${datadir}/xfce4/INFO \
-        ${datadir}/xfce4/LGPL \
-        ${datadir}/xfce4/AUTHORS.html \
-        ${datadir}/xfce4/BSD.html \
-        ${datadir}/xfce4/COPYING.html \
-        ${datadir}/xfce4/GPL.html \
-       ${datadir}/xfce4/INFO.html \
-        ${datadir}/xfce4/LGPL.html"
-
-PACKAGES =+ "${PN}-mcs-plugins"
-FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/"
-
-# NOTE:  This package takes a --with-browser for the default browser
-# NOTE:  Works with gdm also gtkhtml

diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb
index c48026b..d681fd7 100644 (file)
--- a/packages/xfce/xfce-utils_4.4.1.bb
+++ b/packages/xfce/xfce-utils_4.4.1.bb
@@ -2,5 +2,28 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-FILE_PR = "r1"
-require ${PN}.inc
+DESCRIPTION="XFCE4 Utilities"
+DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager"
+inherit xfce
+
+FILES_${PN} += " \ 
+        ${bindir}/* \
+        ${datadir}/dbus-1/* \
+        ${datadir}/xfce4/AUTHORS \
+        ${datadir}/xfce4/BSD \
+        ${datadir}/xfce4/COPYING \
+        ${datadir}/xfce4/GPL \
+       ${datadir}/xfce4/INFO \
+        ${datadir}/xfce4/LGPL \
+        ${datadir}/xfce4/AUTHORS.html \
+        ${datadir}/xfce4/BSD.html \
+        ${datadir}/xfce4/COPYING.html \
+        ${datadir}/xfce4/GPL.html \
+       ${datadir}/xfce4/INFO.html \
+        ${datadir}/xfce4/LGPL.html"
+
+PACKAGES =+ "${PN}-mcs-plugins"
+FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/"
+
+# NOTE:  This package takes a --with-browser for the default browser
+# NOTE:  Works with gdm also gtkhtml