From f93dd081ef5ce142b3f7b0d5487140879ff703fd Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 17 Oct 2008 12:57:55 +0200
Subject: angstrom feed builder: remove minimo now we have fennec

---
 contrib/angstrom/build-feeds.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 967fe7ca82..722a5c9dc9 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -154,7 +154,6 @@ do
 		      meta-nas-server \
 		      midori \
 		      mileage \
-		      minimo \
 		      mono \
 		      mpfr \
 		      mplayer \
-- 
cgit v1.2.3


From ada680d9ac7180986f600f223b6ec01c7796dff8 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 17 Oct 2008 15:04:50 +0200
Subject: xorg-xserver: change hal to RRECOMMENDS

---
 packages/xorg-xserver/xorg-xserver-common.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index 666946b71a..2c16eeacc9 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -13,7 +13,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \
 libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \
 libxkbui libxxf86misc libxi libdmx libxtst libxres mesa"
 
-RDEPENDS_${PN} = "hal"
+RECOMMENDS_${PN} = "hal"
 
 XORG_PN = "xorg-server"
 SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \
-- 
cgit v1.2.3


From 6a9f1c31286345d8be0b8264d4a7a389f93e3178 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 17 Oct 2008 15:06:47 +0200
Subject: checksums: add another 4.3.2 checksum * why does it include the URL
 in the checks?

---
 conf/checksums.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e4c41a77f9..a4072a35bd 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -4166,6 +4166,10 @@ sha256=afba845e2d38547a63bd3976e90245c81ea176786f9e6966339c6d3761f1133a
 md5=4afa0290cc3a41ac8822666f1110de98
 sha256=66596b80995f88cb66aaaf937598df7a9af10cc06799c3a7a64879e20b552fd5
 
+[ftp://ftp.gnu.org/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
+md5=5dfac5da961ecd5f227c3175859a486d
+sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
+
 [ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2]
 md5=5dfac5da961ecd5f227c3175859a486d
 sha256=bfbf487731ad5dca37efe480a837417de071bd67e685d5c1df6a290707575165
-- 
cgit v1.2.3


From 16cb512d4dea28b429f9ee2400f6c37c49eea749 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 17 Oct 2008 16:04:18 +0200
Subject: angstrom: enable oabi compat for gta01 to keep gllin working,
 schwartz doesn't seem to work 100%

---
 conf/distro/include/angstrom.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index a66b1e4ac7..48cbb49d2c 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -57,6 +57,9 @@ require conf/distro/include/angstrom-package-${ANGSTROM_PKG_FORMAT}.inc
 
 # We don't want to keep OABI compat
 ARM_KEEP_OABI = "0"
+# Do keep OABI compat for om-gta01 to keep the gllin binary working
+ARM_KEEP_OABI_pn-linux-openmoko_om-gta01 = "1"
+
 
 #Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
-- 
cgit v1.2.3


From 6ec5c4c167832805032ffc2e17d76ee6fc1e027f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 17 Oct 2008 16:05:14 +0200
Subject: linux-openmoko: bump PR for OABI change

---
 packages/linux/linux-openmoko_2.6.24+git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 7c65d6c112..524b22a311 100644
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -7,7 +7,7 @@ KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 PV = "${KERNEL_RELEASE}+${PR}+gitr${SRCREV}"
-FILE_PR = "r9"
+FILE_PR = "r10"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
-- 
cgit v1.2.3


From 3e8df80fdfb2da7672e1a771b70ccd30b119b968 Mon Sep 17 00:00:00 2001
From: woglinde <heinold@inf.fu-berlin.de>
Date: Fri, 17 Oct 2008 18:13:39 +0200
Subject: gettext: add patch open() mode from ubuntu * add
 use_open_properly.patch from ubuntu   gettext_0.17-3ubuntu2.diff * bump PR on
 native and target

---
 packages/gettext/gettext-0.17/use_open_properly.patch | 15 +++++++++++++++
 packages/gettext/gettext-native_0.17.bb               |  2 +-
 packages/gettext/gettext_0.17.bb                      |  3 ++-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 packages/gettext/gettext-0.17/use_open_properly.patch

diff --git a/packages/gettext/gettext-0.17/use_open_properly.patch b/packages/gettext/gettext-0.17/use_open_properly.patch
new file mode 100644
index 0000000000..111714b543
--- /dev/null
+++ b/packages/gettext/gettext-0.17/use_open_properly.patch
@@ -0,0 +1,15 @@
+Index: gettext-0.17/gettext-tools/src/write-catalog.c
+===================================================================
+--- gettext-0.17.orig/gettext-tools/src/write-catalog.c	2008-10-16 15:18:16.000000000 +0200
++++ gettext-0.17/gettext-tools/src/write-catalog.c	2008-10-16 18:17:13.000000000 +0200
+@@ -220,7 +220,9 @@
+       /* Open the output file.  */
+       if (!to_stdout)
+ 	{
+-	  fd = open (filename, O_WRONLY | O_CREAT);
++	  fd = open (filename, O_WRONLY | O_CREAT,
++		    /* 0666 in portable POSIX notation: */
++		    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+ 	  if (fd < 0)
+ 	    {
+ 	      const char *errno_description = strerror (errno);
diff --git a/packages/gettext/gettext-native_0.17.bb b/packages/gettext/gettext-native_0.17.bb
index 9f6cb861bd..c07302bc2b 100644
--- a/packages/gettext/gettext-native_0.17.bb
+++ b/packages/gettext/gettext-native_0.17.bb
@@ -1,5 +1,5 @@
 require gettext_${PV}.bb
-FILE_PR = "r2"
+FILE_PR = "r3"
 
 DEPENDS = ""
 PROVIDES = ""
diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb
index 13ac5b9373..fe48080085 100644
--- a/packages/gettext/gettext_0.17.bb
+++ b/packages/gettext/gettext_0.17.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-FILE_PR = "r1"
+FILE_PR = "r2"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
 	   file://autotools.patch;patch=1 \
 	   file://wchar-uclibc.patch;patch=1 \
+	   file://use_open_properly.patch;patch=1 \
 	  "
 
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
-- 
cgit v1.2.3


From 28e4d0d45db2e4d4abb97e5b04adca1f94eb1cde Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@openembedded.org>
Date: Fri, 17 Oct 2008 18:39:03 +0200
Subject: duke3d: fix DEPENDS

---
 packages/duke3d/duke3d_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/duke3d/duke3d_svn.bb b/packages/duke3d/duke3d_svn.bb
index 11c33b1fad..36e46df513 100644
--- a/packages/duke3d/duke3d_svn.bb
+++ b/packages/duke3d/duke3d_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Duke Nukem 3D game engine"
 LICENSE = "GPLv2"
-DEPENDS = "libsdl libsdl-mixer"
+DEPENDS = "virtual/libsdl libsdl-mixer"
 
 SRCREV = "185"
 PV = "0.0+svnr${SRCREV}"
-- 
cgit v1.2.3


From ff3ecd7691c5eaca89fe1cea624e317840992e5a Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 12 May 2008 17:59:41 -0300
Subject: xfce-mcs-manager.inc: fix .pc file to not have tmpdir on includedir
 field

The includedir field was left with full path and this made the package
to fail in sanity checks. This patch changes it to point to
/usr/include as all other package does.
---
 packages/xfce/xfce-mcs-manager.inc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc
index de12b14b05..8ad747b3bc 100644
--- a/packages/xfce/xfce-mcs-manager.inc
+++ b/packages/xfce/xfce-mcs-manager.inc
@@ -14,3 +14,7 @@ do_stage() {
 }
 
 
+do_stage_append () {
+	install -d ${PKG_CONFIG_DIR}
+	sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc
+}
-- 
cgit v1.2.3


From c8f54eb5d185c8d24da981370ca71507dcbd95e4 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:21:44 -0300
Subject: XFCE: allow to set a specific release to be used while grabbing the
 source

This will be used to avoid duplicated code in many XFCE related
recipes. Without that, all recipes that uses a different version then
the global XFCE release need to specify the SRC_URI making harder to
update and change the mirror to be used globaly.
---
 classes/xfce.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass
index c6ccc5fd2c..48e012e67e 100644
--- a/classes/xfce.bbclass
+++ b/classes/xfce.bbclass
@@ -8,7 +8,8 @@ HOMEPAGE = "http://www.xfce.org"
 LICENSE = "LGPL-2"
 DEPENDS += "startup-notification"
 
-SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.bz2"
+XFCE_VERSION = ${PV}
+SRC_URI = "http://www.us.xfce.org/archive/xfce-${XFCE_VERSION}/src/${PN}-${PV}.tar.bz2"
 
 inherit autotools
 
-- 
cgit v1.2.3


From 5c4c08ba74b0c157782a82337849ed3dd7e9659e Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:26:57 -0300
Subject: gtk-xfce-engine: specify the required XFCE release

---
 packages/xfce/gtk-xfce-engine_2.4.1.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/xfce/gtk-xfce-engine_2.4.1.bb b/packages/xfce/gtk-xfce-engine_2.4.1.bb
index bcfecaf53b..655c0cbf1b 100644
--- a/packages/xfce/gtk-xfce-engine_2.4.1.bb
+++ b/packages/xfce/gtk-xfce-engine_2.4.1.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "XFCE theme for GTK"
 
 inherit xfce
-
-SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/gtk-xfce-engine-${PV}.tar.bz2"
+XFCE_VERSION = 4.4.1
 
 FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
                 ${datadir}/themes/"
-- 
cgit v1.2.3


From eaf2c4d0276bcb0d365470d8569630387ca066e9 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:28:48 -0300
Subject: mousepad: specify the required XFCE release

---
 packages/xfce/mousepad_0.2.12.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/xfce/mousepad_0.2.12.bb b/packages/xfce/mousepad_0.2.12.bb
index 670a28dbd7..0d32ba4ade 100644
--- a/packages/xfce/mousepad_0.2.12.bb
+++ b/packages/xfce/mousepad_0.2.12.bb
@@ -2,5 +2,4 @@ DESCRIPTION = "Text editor for Xfce based on Leafpad"
 DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
 
 inherit xfce
-
-SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/mousepad-${PV}.tar.bz2"
+XFCE_VERSION = 4.4.1
-- 
cgit v1.2.3


From 2907b817068cc7f7dd478954e408e01a88c8e095 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:38:32 -0300
Subject: exo: specify the required XFCE release

---
 packages/xfce/exo_0.3.2.bb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb
index b48eeba645..b72ff52a91 100644
--- a/packages/xfce/exo_0.3.2.bb
+++ b/packages/xfce/exo_0.3.2.bb
@@ -1,9 +1,7 @@
-
 DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
 
 inherit  xfce
-
-SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2"
+XFCE_VERSION = 4.4.1
 
 # Note: Python checking is broken
 
-- 
cgit v1.2.3


From c11c3affd3b32cab7a19ee852824c98f085beb40 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:52 -0300
Subject: xfwm4-themes: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/xfwm4-themes.inc      | 18 ------------------
 packages/xfce/xfwm4-themes_4.4.1.bb | 15 ++++++++++++++-
 2 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 packages/xfce/xfwm4-themes.inc

diff --git a/packages/xfce/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc
deleted file mode 100644
index 63c5ab0296..0000000000
--- a/packages/xfce/xfwm4-themes.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# xfwm4-themes OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE4 Window Manager Themes"
-SECTION = "x11/wm"
-
-inherit xfce
-
-# No ${PN} for this one 
-PACKAGES=""
-
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
-
-python populate_packages_prepend () {
-	themedir = bb.data.expand('${datadir}/xfwm4/themes', d)
-	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb
index c7f45d2b09..63c5ab0296 100644
--- a/packages/xfce/xfwm4-themes_4.4.1.bb
+++ b/packages/xfce/xfwm4-themes_4.4.1.bb
@@ -2,4 +2,17 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-require ${PN}.inc
+DESCRIPTION="XFCE4 Window Manager Themes"
+SECTION = "x11/wm"
+
+inherit xfce
+
+# No ${PN} for this one 
+PACKAGES=""
+
+PACKAGES_DYNAMIC = "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/xfwm4/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
-- 
cgit v1.2.3


From b5ab8f17452e40dd66ea6315290af0387d2f4573 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:52 -0300
Subject: xfwm4: use a single recipe since we don't have multiple versions
 packaged

---
 packages/xfce/xfwm4.inc      | 27 ---------------------------
 packages/xfce/xfwm4_4.4.1.bb | 25 +++++++++++++++++++++++--
 2 files changed, 23 insertions(+), 29 deletions(-)
 delete mode 100644 packages/xfce/xfwm4.inc

diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc
deleted file mode 100644
index 211853aa18..0000000000
--- a/packages/xfce/xfwm4.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE4 Window Manager"
-SECTION = "x11/wm"
-inherit xfce
-
-FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
-
-DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
-RDEPENDS = "xfwm4-theme-default"
-
-
-EXTRA_OECONF += " --enable-startup-notification"
-
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
-
-python populate_packages_prepend () {
-	themedir = bb.data.expand('${datadir}/themes', d)
-	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
-
-PACKAGES += " ${PN}-mcs-plugins"
-
-FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
-
diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb
index 1d8a176d8a..211853aa18 100644
--- a/packages/xfce/xfwm4_4.4.1.bb
+++ b/packages/xfce/xfwm4_4.4.1.bb
@@ -2,5 +2,26 @@
 # 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 Window Manager"
+SECTION = "x11/wm"
+inherit xfce
+
+FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
+
+DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+RDEPENDS = "xfwm4-theme-default"
+
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+PACKAGES_DYNAMIC = "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
+
+PACKAGES += " ${PN}-mcs-plugins"
+
+FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
+
-- 
cgit v1.2.3


From 4f74fc1bb1ef0ce2e6778aae4c673f842d5fb4c8 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:51 -0300
Subject: xfdesktop: use a single recipe since we don't have multiple versions
 packaged

---
 packages/xfce/xfdesktop.inc      | 17 -----------------
 packages/xfce/xfdesktop_4.4.1.bb | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 packages/xfce/xfdesktop.inc

diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc
deleted file mode 100644
index 35c5ff5954..0000000000
--- 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 bc35acad2a..35c5ff5954 100644
--- 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"
-- 
cgit v1.2.3


From ec13acb5e718128bded039f6c70ac5d8950630ab Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:51 -0300
Subject: xfce-utils: use a single recipe since we don't have multiple versions
 packaged

---
 packages/xfce/xfce-utils.inc      | 29 -----------------------------
 packages/xfce/xfce-utils_4.4.1.bb | 27 +++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 31 deletions(-)
 delete mode 100644 packages/xfce/xfce-utils.inc

diff --git a/packages/xfce/xfce-utils.inc b/packages/xfce/xfce-utils.inc
deleted file mode 100644
index d681fd7adb..0000000000
--- 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 c48026b190..d681fd7adb 100644
--- 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
-- 
cgit v1.2.3


From 89955003513b97a0cdbd00ccdc1f26502ae1b54c Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:51 -0300
Subject: xfce-mcs-plugins: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/xfce-mcs-plugins.inc      | 12 ------------
 packages/xfce/xfce-mcs-plugins_4.4.1.bb |  9 ++++++++-
 2 files changed, 8 insertions(+), 13 deletions(-)
 delete mode 100644 packages/xfce/xfce-mcs-plugins.inc

diff --git a/packages/xfce/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc
deleted file mode 100644
index 80037841fa..0000000000
--- a/packages/xfce/xfce-mcs-plugins.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# xfce-mcs-plugins OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION = "Common XFCE4 configuration plugins."
-DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+"
-SECTION = "x11"
-
-inherit xfce
-
-PACKAGES += "${PN}-mcs-plugins"
-FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so"
diff --git a/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
index bd41458757..80037841fa 100644
--- a/packages/xfce/xfce-mcs-plugins_4.4.1.bb
+++ b/packages/xfce/xfce-mcs-plugins_4.4.1.bb
@@ -2,4 +2,11 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-require ${PN}.inc
+DESCRIPTION = "Common XFCE4 configuration plugins."
+DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+"
+SECTION = "x11"
+
+inherit xfce
+
+PACKAGES += "${PN}-mcs-plugins"
+FILES_${PN}-mcs-plugins = "${libdir}/xfce4/mcs-plugins/*.so"
-- 
cgit v1.2.3


From f61b447ce825235a3c0bd83f8321fb6646834d5b Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:50 -0300
Subject: xfce-mcs-manager: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/xfce-mcs-manager_4.4.1.bb | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/packages/xfce/xfce-mcs-manager_4.4.1.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb
index 76e0452ad8..0b9fc43f70 100644
--- a/packages/xfce/xfce-mcs-manager_4.4.1.bb
+++ b/packages/xfce/xfce-mcs-manager_4.4.1.bb
@@ -2,4 +2,24 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-require ${PN}.inc
+DESCRIPTION="XFCE4 Settings manager."
+DEPENDS="libxfcegui4 libxfce4mcs intltool-native"
+SECTION = "x11"
+PR = "r1"
+
+inherit xfce 
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xfce4
+	install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
+	install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager
+}
+
+# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live
+# the standard pkgconfig mangling was confusing us.  Mangling is not required
+# for this particular .pc, so the following will suffice:
+
+do_stage_append () {
+	install -d ${PKG_CONFIG_DIR}
+	sed -e 's:^includedir=.*:includedir="/usr/include":;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc
+}
-- 
cgit v1.2.3


From c23266091f149ab3cd38f84d9dff998d985a4b3a Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:50 -0300
Subject: xfce4-panel: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/xfce4-panel.inc      | 26 --------------------------
 packages/xfce/xfce4-panel_4.4.1.bb | 24 ++++++++++++++++++++++--
 2 files changed, 22 insertions(+), 28 deletions(-)
 delete mode 100644 packages/xfce/xfce4-panel.inc

diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc
deleted file mode 100644
index be7092ab9e..0000000000
--- a/packages/xfce/xfce4-panel.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-# xfce4-panel OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION = "XFCE4 Panel"
-SECTION = "x11"
-DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
-
-inherit  xfce
-
-EXTRA_OECONF += " --enable-startup-notification"
-
-
-do_stage() {
-autotools_stage_all
-}
-
-do_install() {
-    oe_runmake DESTDIR=${D} install
-}
-
-PACKAGES += "${PN}-plugins ${PN}-mcs-plugins"
-FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \
-                        ${datadir}/xfce4/panel-plugins/*.desktop"
-FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/"
-FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug"
diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb
index d855f35f49..dadc413cae 100644
--- a/packages/xfce/xfce4-panel_4.4.1.bb
+++ b/packages/xfce/xfce4-panel_4.4.1.bb
@@ -2,5 +2,25 @@
 # 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 Panel"
+SECTION = "x11"
+DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2"
+
+inherit pkgconfig xfce
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+
+do_stage() {
+autotools_stage_all
+}
+
+do_install() {
+    oe_runmake DESTDIR=${D} install
+}
+
+PACKAGES += "${PN}-plugins ${PN}-mcs-plugins"
+FILES_${PN}-plugins += "${libdir}/xfce4/panel-plugins/*.so* \
+                        ${datadir}/xfce4/panel-plugins/*.desktop"
+FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/"
+FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug"
-- 
cgit v1.2.3


From 70463fe4fb9efa432adf719d57eba2b5ef997ac2 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:50 -0300
Subject: xfce4-mixer: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/xfce4-mixer.inc      | 9 ---------
 packages/xfce/xfce4-mixer_4.4.1.bb | 6 +++++-
 2 files changed, 5 insertions(+), 10 deletions(-)
 delete mode 100644 packages/xfce/xfce4-mixer.inc

diff --git a/packages/xfce/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc
deleted file mode 100644
index 4d3faed14c..0000000000
--- a/packages/xfce/xfce4-mixer.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# xfce-mixer-plugin OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE panel mixer plugin"
-SECTION = "x11"
-
-DEPENDS="xfce4-panel"
-inherit xfce
diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb
index 13ba0f32e3..4d3faed14c 100644
--- a/packages/xfce/xfce4-mixer_4.4.1.bb
+++ b/packages/xfce/xfce4-mixer_4.4.1.bb
@@ -2,4 +2,8 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-require ${PN}.inc
+DESCRIPTION="XFCE panel mixer plugin"
+SECTION = "x11"
+
+DEPENDS="xfce4-panel"
+inherit xfce
-- 
cgit v1.2.3


From 8b559e8d48c4ff47ed5df7d387646c21a021ba37 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:49 -0300
Subject: xfce4-appfinder: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/xfce4-appfinder.inc      | 8 --------
 packages/xfce/xfce4-appfinder_4.4.1.bb | 5 ++++-
 2 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 packages/xfce/xfce4-appfinder.inc

diff --git a/packages/xfce/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc
deleted file mode 100644
index ddfa3e1e4e..0000000000
--- a/packages/xfce/xfce4-appfinder.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# xfce4-appfinder build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE Application Finder"
-SECTION = "x11"
-inherit xfce
-DEPENDS="libxfcegui4"
diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb
index 471122ea02..ddfa3e1e4e 100644
--- a/packages/xfce/xfce4-appfinder_4.4.1.bb
+++ b/packages/xfce/xfce4-appfinder_4.4.1.bb
@@ -2,4 +2,7 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-require ${PN}.inc
+DESCRIPTION="XFCE Application Finder"
+SECTION = "x11"
+inherit xfce
+DEPENDS="libxfcegui4"
-- 
cgit v1.2.3


From ebd50a0d84db286cfae154f206f07d47a48f319e Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:49 -0300
Subject: libxfcegui4: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/libxfcegui4.inc      | 16 ----------------
 packages/xfce/libxfcegui4_4.4.1.bb | 12 +++++++++++-
 2 files changed, 11 insertions(+), 17 deletions(-)
 delete mode 100644 packages/xfce/libxfcegui4.inc

diff --git a/packages/xfce/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc
deleted file mode 100644
index 1b7703abf9..0000000000
--- a/packages/xfce/libxfcegui4.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-# libxfcegui4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION = "XFCE Widget library and X Window System interaction"
-DEPENDS = "libxfce4util dbh libxml2 gtk+"
-SECTION = "x11/libs"
-
-inherit xfce 
-
-
-do_stage() {
-autotools_stage_all
-}
-
-FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb
index a36897f822..d38269d6f8 100644
--- a/packages/xfce/libxfcegui4_4.4.1.bb
+++ b/packages/xfce/libxfcegui4_4.4.1.bb
@@ -2,4 +2,14 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-require ${PN}.inc
+DESCRIPTION = "XFCE Widget library and X Window System interaction"
+DEPENDS = "libxfce4util dbh libxml2 gtk+"
+SECTION = "x11/libs"
+
+inherit xfce
+
+do_stage() {
+autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/xfce4/modules ${datadir}/xfce4/mime ${datadir}/icons/hicolor"
-- 
cgit v1.2.3


From 169bdf1e270ef880e04612d277887789665901d6 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:49 -0300
Subject: libxfce4util: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/libxfce4util.inc      | 26 --------------------------
 packages/xfce/libxfce4util_4.4.1.bb | 23 ++++++++++++++++++++++-
 2 files changed, 22 insertions(+), 27 deletions(-)
 delete mode 100644 packages/xfce/libxfce4util.inc

diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc
deleted file mode 100644
index ee7b886f20..0000000000
--- a/packages/xfce/libxfce4util.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-# libxfce4util OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION = "Basic utility library for Xfce4"
-SECTION = "x11/libs"
-LICENSE = "GPL"
-DEPENDS = "glib-2.0 xfce4-dev-tools"
-
-inherit xfce 
-
-MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
-
-do_stage() {
-	install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
-	# The line below expands to the list of headers that native makefile
-	# would install.  Complain and/or fix if it's not portable enough
-	for file in  $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do 
-		install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
-	done
-
-	oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
-
-}
-
-FILES_${PN}-dev += " ${datadir}/xfce4/m4"
diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb
index a53a83e861..3c33b2f929 100644
--- a/packages/xfce/libxfce4util_4.4.1.bb
+++ b/packages/xfce/libxfce4util_4.4.1.bb
@@ -2,4 +2,25 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-require ${PN}.inc
+DESCRIPTION = "Basic utility library for Xfce4"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 xfce4-dev-tools"
+
+inherit xfce
+
+MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
+
+do_stage() {
+	install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util
+	# The line below expands to the list of headers that native makefile
+	# would install.  Complain and/or fix if it's not portable enough
+	for file in  $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do 
+		install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util
+	done
+
+	oe_libinstall -C libxfce4util -so libxfce4util ${STAGING_LIBDIR}
+
+}
+
+FILES_${PN}-dev += " ${datadir}/xfce4/m4"
-- 
cgit v1.2.3


From 31c4bfb15242a81a4c290cb419ee56e0cf13cd27 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:50:48 -0300
Subject: libxfce4mcs: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/libxfce4mcs.inc      | 19 -------------------
 packages/xfce/libxfce4mcs_4.4.1.bb | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 packages/xfce/libxfce4mcs.inc

diff --git a/packages/xfce/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc
deleted file mode 100644
index 6ecbc8db58..0000000000
--- a/packages/xfce/libxfce4mcs.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# libxfce4mcs OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="Settings management library used by most XFce 4 modules"
-DEPENDS="libxfce4util"
-SECTION = "x11/libs"
-
-inherit xfce 
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs
-	    
-	install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
-	install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
-	install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs    
-	oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR}	
-	oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR}	
-}
diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb
index 8e2d522962..53f2e14fef 100644
--- a/packages/xfce/libxfce4mcs_4.4.1.bb
+++ b/packages/xfce/libxfce4mcs_4.4.1.bb
@@ -2,4 +2,18 @@
 # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see COPYING.MIT)
 
-require ${PN}.inc
+DESCRIPTION="Settings management library used by most XFce 4 modules"
+DEPENDS="libxfce4util"
+SECTION = "x11/libs"
+
+inherit xfce
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs
+	    
+	install -m 644 libxfce4mcs/mcs-common.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
+	install -m 644 libxfce4mcs/mcs-client.h ${STAGING_INCDIR}/xfce4/libxfce4mcs
+	install -m 644 libxfce4mcs/mcs-manager.h ${STAGING_INCDIR}/xfce4/libxfce4mcs    
+	oe_libinstall -C libxfce4mcs -so libxfce4mcs-manager ${STAGING_LIBDIR}	
+	oe_libinstall -C libxfce4mcs -so libxfce4mcs-client ${STAGING_LIBDIR}	
+}
-- 
cgit v1.2.3


From 53d17d307b8bac06e0b7c027d08f0ead93a7e942 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:36:27 -0300
Subject: xfce4-dev-tools: use a single recipe since we don't have multiple
 versions packaged

---
 packages/xfce/xfce4-dev-tools.inc      | 12 ------------
 packages/xfce/xfce4-dev-tools_4.4.0.bb | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 packages/xfce/xfce4-dev-tools.inc

diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc
deleted file mode 100644
index 2116b1d414..0000000000
--- a/packages/xfce/xfce4-dev-tools.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "Xfce4 development tools"
-SECTION = "x11/libs"
-LICENSE = "GPL"
-
-inherit xfce 
-
-do_stage() {
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb
index bd54419686..bac29a7c0b 100644
--- a/packages/xfce/xfce4-dev-tools_4.4.0.bb
+++ b/packages/xfce/xfce4-dev-tools_4.4.0.bb
@@ -1 +1,13 @@
-require ${PN}.inc
+DESCRIPTION = "Xfce4 development tools"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+
+inherit xfce
+XFCE_VERSION = 4.4.1
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
-- 
cgit v1.2.3


From 9f5ffb5475e3d6468e53fce0928b640ca9c14e00 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 27 Sep 2008 14:15:05 -0300
Subject: libxfce4util: readd pkgconfig class to fix stagging

---
 packages/xfce/libxfce4util_4.4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb
index 3c33b2f929..3386ad57e3 100644
--- a/packages/xfce/libxfce4util_4.4.1.bb
+++ b/packages/xfce/libxfce4util_4.4.1.bb
@@ -7,7 +7,7 @@ SECTION = "x11/libs"
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 xfce4-dev-tools"
 
-inherit xfce
+inherit xfce pkgconfig
 
 MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"
 
-- 
cgit v1.2.3


From e56c30f5625932b57bc2d358f74a4ee793594c4f Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sat, 27 Sep 2008 14:14:47 -0300
Subject: libxfce4mcs: readd pkgconfig class to fix stagging

---
 packages/xfce/libxfce4mcs_4.4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb
index 53f2e14fef..20448240e2 100644
--- a/packages/xfce/libxfce4mcs_4.4.1.bb
+++ b/packages/xfce/libxfce4mcs_4.4.1.bb
@@ -6,7 +6,7 @@ DESCRIPTION="Settings management library used by most XFce 4 modules"
 DEPENDS="libxfce4util"
 SECTION = "x11/libs"
 
-inherit xfce
+inherit xfce pkgconfig
 
 do_stage() {
 	install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs
-- 
cgit v1.2.3


From d7d4b1c80ffeed941356ff81db70182bd79c1356 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 29 Aug 2008 10:59:27 -0300
Subject: xfwm4: add alternative to x-window-manager

---
 packages/xfce/xfwm4_4.4.1.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb
index 211853aa18..12f216fbd6 100644
--- a/packages/xfce/xfwm4_4.4.1.bb
+++ b/packages/xfce/xfwm4_4.4.1.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION="XFCE4 Window Manager"
 SECTION = "x11/wm"
-inherit xfce
+inherit xfce update-alternatives
 
 FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
 
@@ -25,3 +25,7 @@ PACKAGES += " ${PN}-mcs-plugins"
 
 FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
 
+ALTERNATIVE_PATH = "${bindir}/xfce4-session"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "10"
-- 
cgit v1.2.3


From 22085ff8aa4e0190637e07e005f365561d5aa5e8 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 29 Aug 2008 10:58:39 -0300
Subject: xfwm4: append dynamic packages

---
 packages/xfce/xfwm4_4.4.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb
index 12f216fbd6..8d1a1835cf 100644
--- a/packages/xfce/xfwm4_4.4.1.bb
+++ b/packages/xfce/xfwm4_4.4.1.bb
@@ -14,7 +14,7 @@ RDEPENDS = "xfwm4-theme-default"
 
 EXTRA_OECONF += " --enable-startup-notification"
 
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
+PACKAGES_DYNAMIC += "xfwm4-theme-*"
 
 python populate_packages_prepend () {
 	themedir = bb.data.expand('${datadir}/themes', d)
-- 
cgit v1.2.3


From 90a583487d7783c30baaee0b60f228094df03086 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 20:48:18 -0300
Subject: xfce-terminal: update to 0.2.8

---
 packages/xfce/xfce-terminal_0.2.6.bb | 8 --------
 packages/xfce/xfce-terminal_0.2.8.bb | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 packages/xfce/xfce-terminal_0.2.6.bb
 create mode 100644 packages/xfce/xfce-terminal_0.2.8.bb

diff --git a/packages/xfce/xfce-terminal_0.2.6.bb b/packages/xfce/xfce-terminal_0.2.6.bb
deleted file mode 100644
index 07a8eb6eb5..0000000000
--- a/packages/xfce/xfce-terminal_0.2.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
-DEPENDS = "exo vte dbus-glib gtk+"
-
-inherit xfce
-
-SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/Terminal-${PV}.tar.bz2"
-
-S = "${WORKDIR}/Terminal-${PV}"
diff --git a/packages/xfce/xfce-terminal_0.2.8.bb b/packages/xfce/xfce-terminal_0.2.8.bb
new file mode 100644
index 0000000000..9a36c69237
--- /dev/null
+++ b/packages/xfce/xfce-terminal_0.2.8.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "Terminal emulator for the Xfce desktop environment"
+DEPENDS = "exo vte dbus-glib gtk+"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-${PV}.tar.bz2"
+
+S = "${WORKDIR}/Terminal-${PV}"
-- 
cgit v1.2.3


From 63fe642a20b0b4af871444c9df5f24f423aa4c34 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 20:47:25 -0300
Subject: xfce4-dev-tools: update to 4.4.0.1

---
 packages/xfce/xfce4-dev-tools_4.4.0.1.bb | 13 +++++++++++++
 packages/xfce/xfce4-dev-tools_4.4.0.bb   | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 packages/xfce/xfce4-dev-tools_4.4.0.1.bb
 delete mode 100644 packages/xfce/xfce4-dev-tools_4.4.0.bb

diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.1.bb b/packages/xfce/xfce4-dev-tools_4.4.0.1.bb
new file mode 100644
index 0000000000..67c2d341de
--- /dev/null
+++ b/packages/xfce/xfce4-dev-tools_4.4.0.1.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Xfce4 development tools"
+SECTION = "x11/libs"
+LICENSE = "GPL"
+
+inherit xfce
+XFCE_VERSION = 4.4.2
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb
deleted file mode 100644
index bac29a7c0b..0000000000
--- a/packages/xfce/xfce4-dev-tools_4.4.0.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Xfce4 development tools"
-SECTION = "x11/libs"
-LICENSE = "GPL"
-
-inherit xfce
-XFCE_VERSION = 4.4.1
-
-do_stage() {
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/
-}
-
-FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4"
-- 
cgit v1.2.3


From 053d9135c616991ef0340a17fb42b9e5d3e6e82d Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 20:44:43 -0300
Subject: thunar: update to 0.9.0

Besides the update, we've fixed the debug package and change the place
to grab the source from so it's easier to update next time.
---
 packages/xfce/thunar_0.8.0.bb | 15 ---------------
 packages/xfce/thunar_0.9.0.bb | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 packages/xfce/thunar_0.8.0.bb
 create mode 100644 packages/xfce/thunar_0.9.0.bb

diff --git a/packages/xfce/thunar_0.8.0.bb b/packages/xfce/thunar_0.8.0.bb
deleted file mode 100644
index ea739e4cde..0000000000
--- a/packages/xfce/thunar_0.8.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "File manager for the Xfce Desktop Environment"
-DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm"
-
-inherit xfce
-
-SRC_URI = "http://thunar.xfce.org/download/sources/Thunar/0.8.0/Thunar-0.8.0.tar.bz2"
-
-S = "${WORKDIR}/Thunar-${PV}/"
-
-FILES_${PN} += "${libdir}/thunarx-1/*.so \
-                ${datadir}/dbus-1 \
-                ${datadir}/thumbnailers \
-                ${datadir}/Thunar \
-                ${datadir}/xfce4"
-FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/"
diff --git a/packages/xfce/thunar_0.9.0.bb b/packages/xfce/thunar_0.9.0.bb
new file mode 100644
index 0000000000..4aebde8642
--- /dev/null
+++ b/packages/xfce/thunar_0.9.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "File manager for the Xfce Desktop Environment"
+DEPENDS = "libxfcegui4 exo dbus-glib libexif xfce4-panel libice libsm"
+
+inherit xfce
+
+SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Thunar-${PV}.tar.bz2"
+
+S = "${WORKDIR}/Thunar-${PV}/"
+
+FILES_${PN} += "${libdir}/thunarx-1/*.so \
+                ${datadir}/dbus-1 \
+                ${datadir}/thumbnailers \
+                ${datadir}/Thunar \
+                ${datadir}/xfce4"
+FILES_${PN}-dbg += "${libdir}/thunarx-1/.debug/ ${libexecdir}/xfce4/panel-plugins/.debug/"
-- 
cgit v1.2.3


From e9e8eefeeeec46c9fb3bfbd012ee3979d3dd7cd9 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 20:37:53 -0300
Subject: mousepad: update to 0.2.13

---
 packages/xfce/mousepad_0.2.12.bb | 5 -----
 packages/xfce/mousepad_0.2.13.bb | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 packages/xfce/mousepad_0.2.12.bb
 create mode 100644 packages/xfce/mousepad_0.2.13.bb

diff --git a/packages/xfce/mousepad_0.2.12.bb b/packages/xfce/mousepad_0.2.12.bb
deleted file mode 100644
index 0d32ba4ade..0000000000
--- a/packages/xfce/mousepad_0.2.12.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-DESCRIPTION = "Text editor for Xfce based on Leafpad"
-DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
-
-inherit xfce
-XFCE_VERSION = 4.4.1
diff --git a/packages/xfce/mousepad_0.2.13.bb b/packages/xfce/mousepad_0.2.13.bb
new file mode 100644
index 0000000000..c55ce5a047
--- /dev/null
+++ b/packages/xfce/mousepad_0.2.13.bb
@@ -0,0 +1,5 @@
+DESCRIPTION = "Text editor for Xfce based on Leafpad"
+DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+
+inherit xfce
+XFCE_VERSION = 4.4.2
-- 
cgit v1.2.3


From e99596398f037516b1c92c84aa97fd3c24334101 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 20:34:02 -0300
Subject: gtk-xfce-engine: update to 2.4.2

---
 packages/xfce/gtk-xfce-engine_2.4.1.bb | 8 --------
 packages/xfce/gtk-xfce-engine_2.4.2.bb | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 packages/xfce/gtk-xfce-engine_2.4.1.bb
 create mode 100644 packages/xfce/gtk-xfce-engine_2.4.2.bb

diff --git a/packages/xfce/gtk-xfce-engine_2.4.1.bb b/packages/xfce/gtk-xfce-engine_2.4.1.bb
deleted file mode 100644
index 655c0cbf1b..0000000000
--- a/packages/xfce/gtk-xfce-engine_2.4.1.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-DESCRIPTION = "XFCE theme for GTK"
-
-inherit xfce
-XFCE_VERSION = 4.4.1
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
-                ${datadir}/themes/"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
diff --git a/packages/xfce/gtk-xfce-engine_2.4.2.bb b/packages/xfce/gtk-xfce-engine_2.4.2.bb
new file mode 100644
index 0000000000..fda9b9d833
--- /dev/null
+++ b/packages/xfce/gtk-xfce-engine_2.4.2.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "XFCE theme for GTK"
+
+inherit xfce
+XFCE_VERSION = 4.4.2
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/engines/libxfce.so \
+                ${datadir}/themes/"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/engines/.debug"
-- 
cgit v1.2.3


From 759bcabde952faa269f4f9f357b8636d5ba04219 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 20:15:04 -0300
Subject: exo: update to 0.3.4

This release needs a configure patch to avoid testing for strftime
modifiers that can't be ran while cross compiling.
---
 packages/xfce/exo/configure.patch | 43 +++++++++++++++++++++++++++++++++++++++
 packages/xfce/exo_0.3.2.bb        | 15 --------------
 packages/xfce/exo_0.3.4.bb        | 17 ++++++++++++++++
 3 files changed, 60 insertions(+), 15 deletions(-)
 create mode 100644 packages/xfce/exo/configure.patch
 delete mode 100644 packages/xfce/exo_0.3.2.bb
 create mode 100644 packages/xfce/exo_0.3.4.bb

diff --git a/packages/xfce/exo/configure.patch b/packages/xfce/exo/configure.patch
new file mode 100644
index 0000000000..2ccfcfc994
--- /dev/null
+++ b/packages/xfce/exo/configure.patch
@@ -0,0 +1,43 @@
+--- exo-0.3.4/configure.in~	2007-12-02 10:37:06.000000000 -0200
++++ exo-0.3.4/configure.in	2008-06-05 17:21:42.000000000 -0300
+@@ -127,22 +127,24 @@
+ dnl ***************************************
+ dnl *** Check for strftime() extensions ***
+ dnl ***************************************
+-AC_TRY_RUN([
+-  #include <string.h>
+-  #include <time.h>
+-  int
+-  main (int argc, char **argv)
+-  {
+-    struct tm tm;
+-    char      buffer[16];
+-    tm.tm_year = 81;
+-    if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
+-      return 0;
+-    return 1;
+-  }
+-], [
+-  AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
+-])
++dnl grrrr...  this doesn't work for cross compiling, define it for OE
++AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
++dnl AC_TRY_RUN([
++dnl   #include <string.h>
++dnl   #include <time.h>
++dnl   int
++dnl   main (int argc, char **argv)
++dnl   {
++dnl     struct tm tm;
++dnl     char      buffer[16];
++dnl     tm.tm_year = 81;
++dnl     if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
++dnl       return 0;
++dnl     return 1;
++dnl   }
++dnl ], [
++dnl   AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
++dnl ])
+ 
+ dnl ******************************
+ dnl *** Check for i18n support ***
diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb
deleted file mode 100644
index b72ff52a91..0000000000
--- a/packages/xfce/exo_0.3.2.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
-
-inherit  xfce
-XFCE_VERSION = 4.4.1
-
-# Note: Python checking is broken
-
-do_stage() {
-    autotools_stage_all
-}
-
-FILES_${PN} += "${datadir}/xfce4/ \
-                ${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so"
-FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*"
-FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug/exo-preferred-applications-settings.*"
diff --git a/packages/xfce/exo_0.3.4.bb b/packages/xfce/exo_0.3.4.bb
new file mode 100644
index 0000000000..49ab44582c
--- /dev/null
+++ b/packages/xfce/exo_0.3.4.bb
@@ -0,0 +1,17 @@
+DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native"
+
+inherit xfce
+XFCE_VERSION = 4.4.2
+
+SRC_URI += " file://configure.patch;patch=1"
+
+# Note: Python checking is broken
+
+do_stage() {
+    autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/xfce4/ \
+                ${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.so"
+FILES_${PN}-dev += "${libdir}/xfce4/mcs-plugins/exo-preferred-applications-settings.*"
+FILES_${PN}-dbg += "${libdir}/xfce4/mcs-plugins/.debug/exo-preferred-applications-settings.*"
-- 
cgit v1.2.3


From f7f51b0f4490a746c9fe46806b774c7f5b02ea58 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:54:45 -0300
Subject: xfwm4-themes: update to 4.4.2

---
 packages/xfce/xfwm4-themes_4.4.1.bb | 18 ------------------
 packages/xfce/xfwm4-themes_4.4.2.bb | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 packages/xfce/xfwm4-themes_4.4.1.bb
 create mode 100644 packages/xfce/xfwm4-themes_4.4.2.bb

diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb
deleted file mode 100644
index 63c5ab0296..0000000000
--- a/packages/xfce/xfwm4-themes_4.4.1.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-# xfwm4-themes OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE4 Window Manager Themes"
-SECTION = "x11/wm"
-
-inherit xfce
-
-# No ${PN} for this one 
-PACKAGES=""
-
-PACKAGES_DYNAMIC = "xfwm4-theme-*"
-
-python populate_packages_prepend () {
-	themedir = bb.data.expand('${datadir}/xfwm4/themes', d)
-	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
diff --git a/packages/xfce/xfwm4-themes_4.4.2.bb b/packages/xfce/xfwm4-themes_4.4.2.bb
new file mode 100644
index 0000000000..63c5ab0296
--- /dev/null
+++ b/packages/xfce/xfwm4-themes_4.4.2.bb
@@ -0,0 +1,18 @@
+# xfwm4-themes OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE4 Window Manager Themes"
+SECTION = "x11/wm"
+
+inherit xfce
+
+# No ${PN} for this one 
+PACKAGES=""
+
+PACKAGES_DYNAMIC = "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/xfwm4/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
-- 
cgit v1.2.3


From 373a63e75a897e92aa49c8ef5cbefe8eb661cd7f Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:54:45 -0300
Subject: xfwm4: update to 4.4.2

---
 packages/xfce/xfwm4_4.4.1.bb | 31 -------------------------------
 packages/xfce/xfwm4_4.4.2.bb | 31 +++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 packages/xfce/xfwm4_4.4.1.bb
 create mode 100644 packages/xfce/xfwm4_4.4.2.bb

diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb
deleted file mode 100644
index 8d1a1835cf..0000000000
--- a/packages/xfce/xfwm4_4.4.1.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-# xfwm4 OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE4 Window Manager"
-SECTION = "x11/wm"
-inherit xfce update-alternatives
-
-FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
-
-DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
-RDEPENDS = "xfwm4-theme-default"
-
-
-EXTRA_OECONF += " --enable-startup-notification"
-
-PACKAGES_DYNAMIC += "xfwm4-theme-*"
-
-python populate_packages_prepend () {
-	themedir = bb.data.expand('${datadir}/themes', d)
-	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
-}
-
-PACKAGES += " ${PN}-mcs-plugins"
-
-FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
-
-ALTERNATIVE_PATH = "${bindir}/xfce4-session"
-ALTERNATIVE_NAME = "x-window-manager"
-ALTERNATIVE_LINK = "${bindir}/x-window-manager"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/xfce/xfwm4_4.4.2.bb b/packages/xfce/xfwm4_4.4.2.bb
new file mode 100644
index 0000000000..8d1a1835cf
--- /dev/null
+++ b/packages/xfce/xfwm4_4.4.2.bb
@@ -0,0 +1,31 @@
+# xfwm4 OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE4 Window Manager"
+SECTION = "x11/wm"
+inherit xfce update-alternatives
+
+FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*"
+
+DEPENDS = "startup-notification virtual/libx11 libxpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager"
+RDEPENDS = "xfwm4-theme-default"
+
+
+EXTRA_OECONF += " --enable-startup-notification"
+
+PACKAGES_DYNAMIC += "xfwm4-theme-*"
+
+python populate_packages_prepend () {
+	themedir = bb.data.expand('${datadir}/themes', d)
+	do_split_packages(d, themedir, '^(.*)', 'xfwm4-theme-%s', 'XFWM4 theme %s', allow_dirs=True)
+}
+
+PACKAGES += " ${PN}-mcs-plugins"
+
+FILES_${PN}-mcs-plugins += "${libdir}/xfce4/mcs-plugins/*.so"
+
+ALTERNATIVE_PATH = "${bindir}/xfce4-session"
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PRIORITY = "10"
-- 
cgit v1.2.3


From 47009dcdb6674902f6a3f0159017000af01ffddd Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:54:45 -0300
Subject: xfprint: update to 4.4.2

---
 packages/xfce/xfprint_4.4.1.bb | 9 ---------
 packages/xfce/xfprint_4.4.2.bb | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 packages/xfce/xfprint_4.4.1.bb
 create mode 100644 packages/xfce/xfprint_4.4.2.bb

diff --git a/packages/xfce/xfprint_4.4.1.bb b/packages/xfce/xfprint_4.4.1.bb
deleted file mode 100644
index 19bfa0dde3..0000000000
--- a/packages/xfce/xfprint_4.4.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-# xfprint OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see COPYING.MIT)
-
-DESCRIPTION="XFCE4 Print Manager"
-SECTION = "x11/base"
-
-DEPENDS="libxfcegui4"
-inherit xfce
diff --git a/packages/xfce/xfprint_4.4.2.bb b/packages/xfce/xfprint_4.4.2.bb
new file mode 100644
index 0000000000..19bfa0dde3
--- /dev/null
+++ b/packages/xfce/xfprint_4.4.2.bb
@@ -0,0 +1,9 @@
+# xfprint OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see COPYING.MIT)
+
+DESCRIPTION="XFCE4 Print Manager"
+SECTION = "x11/base"
+
+DEPENDS="libxfcegui4"
+inherit xfce
-- 
cgit v1.2.3


From d5da2343345cabd5c75350c38a3ea55f50ba8e59 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:54:44 -0300
Subject: xfdesktop: update to 4.4.2

---
 packages/xfce/xfdesktop_4.4.1.bb | 17 -----------------
 packages/xfce/xfdesktop_4.4.2.bb | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 packages/xfce/xfdesktop_4.4.1.bb
 create mode 100644 packages/xfce/xfdesktop_4.4.2.bb

diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb
deleted file mode 100644
index 35c5ff5954..0000000000
--- a/packages/xfce/xfdesktop_4.4.1.bb
+++ /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.2.bb b/packages/xfce/xfdesktop_4.4.2.bb
new file mode 100644
index 0000000000..35c5ff5954
--- /dev/null
+++ b/packages/xfce/xfdesktop_4.4.2.bb
@@ -0,0 +1,17 @@
+# 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"
-- 
cgit v1.2.3


From 500886ae9c953ac111f3068d767fedd4d8bbdf78 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:54:44 -0300
Subject: xfce-utils: update to 4.4.2

---
 packages/xfce/xfce-utils_4.4.1.bb | 29 -----------------------------
 packages/xfce/xfce-utils_4.4.2.bb | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 packages/xfce/xfce-utils_4.4.1.bb
 create mode 100644 packages/xfce/xfce-utils_4.4.2.bb

diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb
deleted file mode 100644
index d681fd7adb..0000000000
--- a/packages/xfce/xfce-utils_4.4.1.bb
+++ /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.2.bb b/packages/xfce/xfce-utils_4.4.2.bb
new file mode 100644
index 0000000000..d681fd7adb
--- /dev/null
+++ b/packages/xfce/xfce-utils_4.4.2.bb
@@ -0,0 +1,29 @@
+# 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
-- 
cgit v1.2.3


From 79f6a1fdd8f16ee286b3f176df8872b940b2a5c5 Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Fri, 13 Jun 2008 19:54:44 -0300
Subject: xfce-mcs-plugins: update to 4.4.2

---
 packages/xfce/xfce-mcs-plugins_4.4.1.bb | 12 ------------
 packages/xfce/xfce-mcs-plugins_4.4.2.bb | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 packages/xfce/xfce-mcs-plugins_4.4.1.bb
 cr