--- libxfcegui4-4.4.2.orig/debian/compat
+++ libxfcegui4-4.4.2/debian/compat
@@ -0,0 +1 @@
+4
--- libxfcegui4-4.4.2.orig/debian/copyright
+++ libxfcegui4-4.4.2/debian/copyright
@@ -0,0 +1,37 @@
+This package was debianized by Martin Loschwitz <madkiss@debian.org> on
+Thu, 26 Jun 2003 16:02:35 +0200.
+
+This library can be fetched from http://www.xfce4.org/
+
+Upstream Authors and copyright holders: 
+Olivier Fourdan <fourdan@xfce.org>
+Jasper Huijsmans <huysmans@users.sourceforge.net>
+Benedikt Meurer <benny@xfce.org>
+Brian Tarricone <bjt23@cornell.edu>
+
+Portions of code were taken from the following projects:
+
+  libwnck by Havoc Pennington <hp@redhat.com>
+  preview_file_selector widget from gnome by 
+    Rachel Hestilow <hestilow@ximian.com>
+  default icon from FreeIcons theme set by tmielnik75
+  urgency notification based on Matthew Eaton's patch for libwnck
+
+License:
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
--- libxfcegui4-4.4.2.orig/debian/libxfcegui4-4.install
+++ libxfcegui4-4.4.2/debian/libxfcegui4-4.install
@@ -0,0 +1,6 @@
+usr/lib/lib*.so.*
+usr/share/locale/*
+usr/lib/xfce4/modules/*
+usr/share/xfce4/mime/*
+usr/share/icons/hicolor/*
+usr/share/xfce4/*
--- libxfcegui4-4.4.2.orig/debian/rules
+++ libxfcegui4-4.4.2/debian/rules
@@ -0,0 +1,81 @@
+#!/usr/bin/make -f
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+config.status: configure
+	
+	dh_testdir
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --enable-xinerama --enable-final
+
+build: patch build-stamp
+build-stamp: config.status
+	
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean: unpatch
+	
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+
+	dh_clean
+
+install: build
+	
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp
+
+	rm -f `pwd`/debian/tmp/usr/lib/libxfcegui4.la
+
+	chrpath -d -k `pwd`/debian/tmp/usr/lib/*.so.*
+
+binary-indep: build install
+binary-arch: build install
+	
+	dh_testdir
+	dh_testroot
+	
+	dh_installchangelogs ChangeLog
+	dh_installdocs README
+	
+	dh_install --list-missing --sourcedir=debian/tmp
+	dh_strip
+	
+	dh_compress
+	dh_fixperms
+	
+	dh_makeshlibs
+	dh_installdeb
+	
+	dh_shlibdeps
+	dh_gencontrol
+	
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install patch unpatch
--- libxfcegui4-4.4.2.orig/debian/changelog
+++ libxfcegui4-4.4.2/debian/changelog
@@ -0,0 +1,269 @@
+libxfcegui4 (4.4.2-1~bpo40+1) etch-backports; urgency=low
+
+  * rebuild for etch-backports
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 21 Dec 2007 00:19:25 +0100
+
+libxfcegui4 (4.4.2-1) unstable; urgency=low
+
+  [ Simon Huggins ]
+  * Use ${binary:Version} so we are binNMU safe.
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+    - fix window opening on wrong screen.                       closes: #443690
+  * debian/rules: don't ignore all make errors at clean stage.
+
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Thu, 29 Nov 2007 08:00:36 +0100
+
+libxfcegui4 (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/control: version build-dep against gtk 2.10.
+  * debian/copyright: updated copyright holders.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+libxfcegui4 (4.4.0-2) experimental; urgency=low
+
+  * debian/rules: don't ship /usr/lib/libxfcegui4.la in package. 
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Thu, 25 Jan 2007 01:23:00 +0100
+
+libxfcegui4 (4.4.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control:
+    - updated build-deps against Xfce 4.4.
+    - conflicts against xfce4-panel (<< 4.4.0) because xfce-man.png switched
+      from panel to lib.
+    - conflicts against xfce4-mcs-plugins (<< 4.4.0) because
+      xfce4-filemanager.svg switched from mcs-plugins to lib.
+    - dropped totally dbh deps as it's not used anymore.
+
+  (Emanuele Rocca)
+  * debian/control:
+    - Added Suggests: devhelp.
+    - Reference manual mentioned in the long description.
+    - s/libxfcegui4-3/libxfcegui4-4/
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 24 Jan 2007 23:05:42 +0100
+
+libxfcegui4 (4.3.99.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2).
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Thu, 16 Nov 2006 13:57:22 +0100
+
+libxfcegui4 (4.3.99.1-2) unstable; urgency=low
+
+  * Ship a shlibs file so dependencies know that they need libxfcegui4
+    4.3.99.1.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Fri, 13 Oct 2006 09:11:36 +0100
+
+libxfcegui4 (4.3.99.1-1) unstable; urgency=low
+
+  * New upstream release 
+  * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 23 Sep 2006 13:46:16 +0100
+
+libxfcegui4 (4.3.90.2-1) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: updated standards versions to 3.7.2.
+  (Simon Huggins)
+  * Add rpath fixes.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Mon, 10 Jul 2006 17:59:53 +0200
+
+libxfcegui4 (4.3.90.1-1) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+   * New Upstream Release
+  (Simon Huggins)
+   * Remove pointless .la files.
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 03 May 2006 18:35:05 +0100
+
+libxfcegui4 (4.2.3-2) unstable; urgency=low
+
+  * Fix for the X11R7 transition; remove the build-dep on xlibs-static-pic and
+    the equivalent depends from the -dev package.
+
+ -- Simon Huggins <huggie@earth.li>  Mon, 17 Apr 2006 17:17:17 +0100
+
+libxfcegui4 (4.2.3-1) unstable; urgency=low
+
+  * New Upstream Release
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 06 Nov 2005 22:01:12 +0100
+
+libxfcegui4 (4.2.2-1) unstable; urgency=low
+
+  * New Upstream Release
+  * Add versioned dependency on libxfce4util to the -dev package
+                                                               closes: #309180
+  * Add dependency on libstartup-notification0-dev to the -dev package
+                                                               closes: #309145
+  * Depend on the version of util that has a versioned shlibs so that we can
+    fix upgrade issues (thanks to Kurt Koeckx)
+  * Change suite to unstable
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 18 Jun 2005 09:49:49 +0100
+
+libxfcegui4 (4.2.1-1) experimental; urgency=low
+
+  * ML: New Upstream Release (Xfce 4.2.1)
+  * ML: Upload to experimental to prevents problems with NEW packages
+  * ML: debian/control: Added Maintainer/Uploaders fields
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 19 Mar 2005 13:02:00 +0100
+
+libxfcegui4 (4.2.0-2) experimental; urgency=low
+
+  * Add --enable-final to the configure
+  * Add a Homepage: to the description
+
+ -- Simon Huggins <huggie@earth.li>  Sun, 16 Jan 2005 15:19:29 +0000
+
+libxfcegui4 (4.2.0-1) experimental; urgency=low
+
+  * New Upstream Release
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 15 Jan 2005 10:50:14 +0000
+
+libxfcegui4 (4.1.99.1-1) experimental; urgency=low
+
+  * ML: New Upstream Release (4.1.99.1 alias XFce4 4.2 RC1)
+  * ML: control: Added Build-Depends for dbh amd libxml2-dev
+  * ML: libxfcegui4-1.install and libxfcegui4-dev.install updated
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 19 Nov 2004 15:43:00 +0100
+
+libxfcegui4 (4.0.6-1) unstable; urgency=high
+
+  * urgency high to avoid previous buildd mess; there are 3 more upload stages
+    each requiring the dev packages from the previous stage to be installed on
+    all archs before we can upload (see http://wiki.earth.li/XfceDebian)
+  * New upstream release
+  * Update depends in -dev package from xlibs-pic to xlibs-static-pic which
+                                                               closes: #253331
+ 
+ -- Simon Huggins <huggie@earth.li>  Mon, 12 Jul 2004 21:48:41 +0100
+ 
+libxfcegui4 (4.0.5-2) unstable; urgency=low
+
+  * Add libxt-dev and libxpm-dev to the depends for the -dev package due to
+    the split out xlibs and libgtk2.0-dev no longer depending on xlibs-dev.
+                                                               closes: #250057
+  * Remove Norbert Tretkowski from Uploaders as requested
+ 
+ -- Simon Huggins <huggie@earth.li>  Tue, 25 May 2004 21:45:26 +0100
+ 
+libxfcegui4 (4.0.5-1) unstable; urgency=high
+
+  * urgency high to avoid previous buildd mess; there are 3 more upload stages
+    each requiring the dev packages from the previous stage to be installed on
+    all archs before we can upload (see http://wiki.earth.li/XfceDebian)
+  * New upstream release
+  * Update upstream's libtool
+  * Update build-depends to xlibs-static-pic (new name for xlibs-pic)
+ 
+ -- Simon Huggins <huggie@earth.li>  Sun, 18 Apr 2004 22:00:00 +0100
+ 
+libxfcegui4 (4.0.3-2) unstable; urgency=low
+
+  * Update libtool closes: #236929
+  * Remove dpatch (it's only used for the Xinerama stuff which got screwed by
+    the libtool update anyway so easier just to patch in by hand)
+  * Just adding Daniel wasn't enough.  Add self to Uploaders so katie doesn't
+    think this is an NMU again.
+ 
+ -- Simon Huggins <huggie@earth.li>  Tue, 09 Mar 2004 10:14:23 +0000
+ 
+libxfcegui4 (4.0.3-1) unstable; urgency=low
+
+  * New Upstream release
+  * Add Daniel Silverstone <dsilvers@debian.org> to Uploaders as approved by
+    madkiss
+  * 02_kde_tray_icons.dpatch has been taken on (in part) upstream
+    but enough to satisfy the test case given closes: #215305
+  * Thanks to Daniel for checking and uploading these packages
+ 
+ -- Simon Huggins <huggie@earth.li>  Tue, 02 Mar 2004 23:22:52 +0000
+ 
+libxfcegui4 (4.0.2-1) unstable; urgency=low
+
+  * New Upstream release
+ 
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 26 Dec 2003 15:45:00 +0200
+ 
+libxfcegui4 (4.0.0.final-2) unstable; urgency=low
+
+  * Added Dependency for xlibs-pic to libxfcegui4-dev
+  * Added patch by Chung-chieh Shan to support KDE tray icons
+
+ -- Martin Loschwitz <madkiss@debian.org>  Mon, 13 Oct 2003 19:49:00 +0200
+
+libxfcegui4 (4.0.0.final-1) unstable; urgency=low
+
+  * New Upstream release
+  * New Co-Maintainer: Norbert Tretkowski.
+  * Various cleanups in debian/
+  * Renamed libxfcegui4-0-dev to libxfcegui4-dev
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 29 Sep 2003 15:56:00 +0200
+ 
+libxfcegui4 (0.0.19+cvs.20030421-1) unstable; urgency=low
+
+  * New CVS checkout (2003-04-21)
+  * Drop dpatch - problems fixed by upstream
+  * Added libxfce4util ad Build-Depends
+
+ -- Martin Loschwitz <madkiss@debian.org>  Mon, 21 Apr 2003 19:04:00 +0200
+ 
+libxfcegui4 (0.0.16+cvs.20030301-1) unstable; urgency=low
+
+  * New CVS checkout (Using Xfce CVS, 2003-03-01)
+  * Official release (really this time!) (last release was never made public)
+  * debian/control: Changed Maintainer e-mail address
+  * debian/rules: Use dpatch to remove rpath references 
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 01 Mar 2003 08:40:00 +0100
+ 
+libxfcegui4 (0.0.16+cvs.20030216-1) unstable; urgency=low
+
+  * New CVS checkout (Using Xfce CVS, 2003-02-16)
+  * Official release (last release was never made public)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sun, 16 Feb 2003 09:24:00 +0100
+ 
+libxfcegui4 (0.0.12+cvs.20030119-1) unstable; urgency=low
+
+  * New CVS Checkout (Using Xfce CVS, 2003-01-19)
+  * debian/control: Added build-dependency for libxft2-dev
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sun, 19 Jan 2003 10:04:00 +0100
+ 
+libxfcegui4 (0.0.9+cvs.20021222-1) unstable; urgency=low
+
+  * New CVS Checkout (Using xfce CVS, 2002-12-22)
+  * debian/rules: Made Xinerama i386 specific (Closes: #173083)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sun, 22 Dec 2002 13:38:00 +0100
+
+libxfcegui4 (0.0.8+cvs.20021127-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #166631)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Wed, 27 Nov 2002 14:29:00 +0100
--- libxfcegui4-4.4.2.orig/debian/libxfcegui4-dev.install
+++ libxfcegui4-4.4.2/debian/libxfcegui4-dev.install
@@ -0,0 +1,5 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
+usr/share/gtk-doc/html/libxfcegui4/*
--- libxfcegui4-4.4.2.orig/debian/control
+++ libxfcegui4-4.4.2/debian/control
@@ -0,0 +1,38 @@
+Source: libxfcegui4
+Section: libs
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
+Uploaders: Martin Loschwitz <madkiss@debian.org>, Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>, Yves-Alexis Perez <corsac@debian.org>
+Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, bison, libxft-dev, libxfce4util-dev (>= 4.4.2), libxt-dev, libxml2-dev, libstartup-notification0-dev, chrpath
+Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfcegui4/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfcegui4/
+
+Package: libxfcegui4-dev
+Section: libdevel
+Architecture: any
+Depends: libxfcegui4-4 (= ${binary:Version}), libxfce4util-dev (>= 4.4.2), libxft-dev, libxt-dev, libxpm-dev, libxml2-dev, libstartup-notification0-dev
+Replaces: libxfcegui4-1-dev
+Conflicts: libxfcegui4-1-dev
+Suggests: devhelp
+Description: Development files for libxfcegui4-4
+ This package contains the headers and the static library
+ for libxfcegui4-4. If you intend to code applications 
+ which use some of these functions (probably Xfce4-based
+ applications), then you have to install this package.
+ .
+ The libxfcegui4 Reference Manual is also included and it can be 
+ consulted with Devhelp or a web browser.
+
+Package: libxfcegui4-4
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libxfcegui4-1, libxfcegui4-3
+Conflicts: libxfcegui4-1, libxfcegui4-3, xfce4-panel (<< 4.4.0), xfce4-mcs-plugins (<< 4.4.0)
+Description: Basic GUI C functions for Xfce4
+ This package contains a library which provides the very
+ basic GUI functions used by the Xfce4 desktop suite. If
+ you intend to run Xfce4, then you need to install this 
+ package.
--- libxfcegui4-4.4.2.orig/debian/libxfcegui4-4.shlibs
+++ libxfcegui4-4.4.2/debian/libxfcegui4-4.shlibs
@@ -0,0 +1 @@
+libxfcegui4 4 libxfcegui4-4 (>= 4.4.2)
--- libxfcegui4-4.4.2.orig/debian/watch
+++ libxfcegui4-4.4.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.xfce.org/archive/xfce-(.*)/src/ \
+	libxfcegui4-(.*)\.tar\.bz2
--- libxfcegui4-4.4.2.orig/config.guess
+++ libxfcegui4-4.4.2/config.guess
@@ -139,23 +139,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-	eval $set_cc_for_build
-	cat << EOF > $dummy.c
-	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
-	LIBC=uclibc
-	# endif
-	#else
-	LIBC=gnu
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -850,28 +833,28 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-${LIBC}
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-${LIBC}
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-${LIBC}
+    	echo frv-unknown-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -894,7 +877,7 @@
 		s: ::g
 		p
 	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -917,16 +900,16 @@
 		s: ::g
 		p
 	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-${LIBC}
+	echo or32-unknown-linux-gnu
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -939,40 +922,40 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-${LIBC}
+    	echo xtensa-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -987,22 +970,20 @@
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 		exit ;;
 	esac
-	# This should get integrated into the C code below, but now we hack
-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
--- libxfcegui4-4.4.2.orig/config.sub
+++ libxfcegui4-4.4.2/config.sub
@@ -244,7 +244,7 @@
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx | dvp \
+	| d10v | d30v | dlx | dsp16xx \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
@@ -277,7 +277,7 @@
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -358,7 +358,7 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
@@ -694,24 +694,6 @@
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsEE* | ee | ps2)
-		basic_machine=mips64r5900el-scei
-		case $os in
-		    -linux*)
-			;;
-		    *)
-			os=-elf
-			;;
-		esac
-		;;
-	iop)
-		basic_machine=mipsel-scei
-		os=-irx
-		;;
-	dvp)
-		basic_machine=dvp-scei
-		os=-elf
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -1244,7 +1226,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
