--- libxfce4mcs-4.4.2.orig/debian/compat
+++ libxfce4mcs-4.4.2/debian/compat
@@ -0,0 +1 @@
+4
--- libxfce4mcs-4.4.2.orig/debian/copyright
+++ libxfce4mcs-4.4.2/debian/copyright
@@ -0,0 +1,32 @@
+This package was debianized by Martin Loschwitz <madkiss@madkiss.org> on
+Sun, 19 Jan 2003 10:33:14 +0100.
+
+You can fetch libxfce4mcs from the Xfce website which can be found at
+http://www.xfce.org/
+
+Upstream authors are:
+			Olivier Fourdan <fourdan@xfce.org>
+			Jasper Huijsmans <jasper@moongroup.com>
+			Benedikt Meurer <benny@xfce.org>
+
+Additionally, portions based on xsettings sample implementation by Owen 
+Taylor are included.
+
+Copyright:
+
+    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'.
--- libxfce4mcs-4.4.2.orig/debian/libxfce4mcs-dev.install
+++ libxfce4mcs-4.4.2/debian/libxfce4mcs-dev.install
@@ -0,0 +1,6 @@
+usr/lib/lib*.so
+usr/lib/lib*.a
+usr/include/xfce4/libxfce4mcs/*
+usr/lib/pkgconfig/libxfce4mcs-client-1.0.pc
+usr/lib/pkgconfig/libxfce4mcs-manager-1.0.pc
+usr/share/gtk-doc/html/libxfce4mcs/*
--- libxfce4mcs-4.4.2.orig/debian/libxfce4mcs-client3.shlibs
+++ libxfce4mcs-4.4.2/debian/libxfce4mcs-client3.shlibs
@@ -0,0 +1 @@
+libxfce4mcs-client 3 libxfce4mcs-client3 (>= 4.4.2)
--- libxfce4mcs-4.4.2.orig/debian/rules
+++ libxfce4mcs-4.4.2/debian/rules
@@ -0,0 +1,85 @@
+#!/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 --mandir=\$${prefix}/share/man --disable-rpath --enable-static=yes --enable-final
+	
+build: build-stamp
+build-stamp: config.status
+
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean:
+	
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-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
+	
+	rm -rf `pwd`/debian/tmp-install
+	dh_clean
+
+install: build
+	
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=`pwd`/debian/tmp-install
+
+	rm -f debian/tmp-install/usr/lib/libxfce4mcs-manager.la
+	rm -f debian/tmp-install/usr/lib/libxfce4mcs-client.la
+
+	chrpath -d -k `pwd`/debian/tmp-install/usr/lib/*.so.*
+
+	dh_install --list-missing --sourcedir=debian/tmp-install
+
+binary-indep: build install
+
+binary-arch: build install
+	
+	dh_testdir
+	dh_testroot
+
+	dh_installdocs
+	dh_installchangelogs ChangeLog
+	
+	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 configure
--- libxfce4mcs-4.4.2.orig/debian/changelog
+++ libxfce4mcs-4.4.2/debian/changelog
@@ -0,0 +1,234 @@
+libxfce4mcs (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:22 +0100
+
+libxfce4mcs (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.
+  * Add Vcs-* headers to debian/control
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/rules: 
+    - don't ignore all make errors at clean stage.
+    - fix parallel builds.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 02 Dec 2007 11:25:57 +0100
+
+libxfce4mcs (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: added Benedikt Meurer in copyright holders.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+libxfce4mcs (4.4.0-2) experimental; urgency=low
+
+  * debian/rules: don't ship unused .la files. 
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Thu, 25 Jan 2007 01:29:42 +0100
+
+libxfce4mcs (4.4.0-1) experimental; urgency=low
+
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: 
+    - updated build-deps against Xfce 4.4.
+    - removed Jani from uploaders. 
+  (Emanuele Rocca)
+  * Added Suggests: devhelp.
+  * Reference manual mentioned in the long description.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 24 Jan 2007 22:50:32 +0100
+
+libxfce4mcs (4.3.99.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Ship shlibs files so dependencies are correctly versionned.
+  * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2).
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Thu, 16 Nov 2006 14:28:07 +0100
+
+libxfce4mcs (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:36 +0100
+
+libxfce4mcs (4.3.90.2-1) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: updated standards version to 3.7.2.
+  (Simon Huggins)
+  * Add rpath fixes.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Mon, 10 Jul 2006 18:00:56 +0200
+
+libxfce4mcs (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:34:42 +0100
+
+libxfce4mcs (4.2.3-2) unstable; urgency=low
+
+  (Jani Monoses)
+    * Make .so library version matching more generic to catch soname bumps
+      and to be consistent with libxfce4util and libxfcegui4
+    * Add myself to uploaders field
+  (Simon Huggins)
+    * Stop build depending on xlibs-static-pic for X11R7 transition.
+
+ -- Simon Huggins <huggie@earth.li>  Mon, 17 Apr 2006 17:56:33 +0100
+
+libxfce4mcs (4.2.3-1) unstable; urgency=low
+  
+  * (Yves-Alexis Perez)
+    - New Upstream Release
+  * (Emanuele Rocca)
+    - Standards-Version bumped
+    - Corsac added to the 'Uploaders' field
+    - Address of the FSF updated in debian/copyright
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 06 Nov 2005 22:01:12 +0100
+
+libxfce4mcs (4.2.2-1) unstable; urgency=low
+
+  * New Upstream Release
+  * Change suite to unstable
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 18 Jun 2005 09:50:18 +0100
+
+libxfce4mcs (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
+
+libxfce4mcs (4.2.0-2) experimental; urgency=low
+
+  * --enable-final in configure now it exists.
+  * Add a Homepage: to the description
+
+ -- Simon Huggins <huggie@earth.li>  Sun, 16 Jan 2005 14:30:05 +0000
+
+libxfce4mcs (4.2.0-1) experimental; urgency=low
+
+  * New Upstream Release
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 15 Jan 2005 10:51:16 +0000
+
+libxfce4mcs (4.1.99.1-1) experimental; urgency=low
+
+  * ML: New Upstream Release
+  * ML: debian/control: Updated Build-Depends
+  * ML: Added libxfce4mcs-client-2 and libxfce4mcs-manager-2, thus removed
+        libxfce4mcs-client-1 and libxfce4mcs-manager-1
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 19 Nov 2004 16:35:00 +0100
+
+libxfce4mcs (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
+
+ -- Simon Huggins <huggie@earth.li>  Mon, 12 Jul 2004 22:59:44 +0100
+
+libxfce4mcs (4.0.5-2) unstable; urgency=low
+ 
+  * Add libxt-dev to Build-Depends given split out of xlibs.
+  * Remove Norbert Tretkowski from Uploaders as requested
+
+ -- Simon Huggins <huggie@earth.li>  Wed, 26 May 2004 09:46:05 +0100
+
+libxfce4mcs (4.0.5-1) unstable; urgency=high
+ 
+  * urgency high to avoid previous buildd mess; there are 4 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 xlibs-dev build-depends to xlibs-static-dev
+
+ -- Simon Huggins <huggie@earth.li>  Mon, 08 Mar 2004 23:53:25 +0000
+
+libxfce4mcs (4.0.3-2) unstable; urgency=low
+ 
+  * Update libtool closes: #236930
+  * 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>  Mon, 08 Mar 2004 23:53:25 +0000
+
+libxfce4mcs (4.0.3-1) unstable; urgency=low
+ 
+  * New upstream release
+  * Remove tmp-install in the clean target of debian/rules
+  * Add Daniel Silverstone <dsilvers@debian.org> to Uploaders as approved by
+    madkiss
+  * Thanks to Daniel for checking and uploading these packages
+
+ -- Simon Huggins <huggie@earth.li>  Tue, 24 Feb 2004 22:53:40 +0000
+
+libxfce4mcs (4.0.2-1) unstable; urgency=low
+ 
+  * New upstream release
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 26 Dec 2003 15:56:00 +0100
+
+libxfce4mcs (4.0.0.final-1) unstable; urgency=low
+
+  * New upstream release
+  * New Co-Maintainer: Norbert Tretkowski.
+  * Many cleanups in debian/-subdir
+  * Renamed libxfce4mcs-0-dev to libxfce4mcs-dev
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 29 Sep 2003 16:31:00 +0200
+
+libxfce4mcs (0.0.5+cvs.20030421-1) unstable; urgency=low
+
+  * New CVS checkout (2003-04-21)
+  * Drop out dpatch - problems fixed by upstream
+
+ -- Martin Loschwitz <madkiss@debian.org>  Mon, 21 Apr 2003 19:09:00 +0200
+ 
+libxfce4mcs (0.0.4+cvs.20030301-2) unstable; urgency=low
+
+  * debian/control: Made libxfce4mcs-0-dev depend on libxfcegui4-0-dev (Closes: #184701)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 15 Mar 2003 10:41:00 +0100
+ 
+libxfce4mcs (0.0.4+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
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 01 Mar 2003 09:03:00 +0100
+
+libxfce4mcs (0.0.4+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, 06 Feb 2003 09:32:00 +0100
+
+libxfce4mcs (0.0.3+cvs.20030119-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sun, 19 Jan 2003 10:33:14 +0100
--- libxfce4mcs-4.4.2.orig/debian/libxfce4mcs-manager3.shlibs
+++ libxfce4mcs-4.4.2/debian/libxfce4mcs-manager3.shlibs
@@ -0,0 +1 @@
+libxfce4mcs-manager 3 libxfce4mcs-manager3 (>= 4.4.2)
--- libxfce4mcs-4.4.2.orig/debian/libxfce4mcs-manager3.install
+++ libxfce4mcs-4.4.2/debian/libxfce4mcs-manager3.install
@@ -0,0 +1 @@
+usr/lib/libxfce4mcs-manager.so.*
--- libxfce4mcs-4.4.2.orig/debian/control
+++ libxfce4mcs-4.4.2/debian/control
@@ -0,0 +1,52 @@
+Source: libxfce4mcs
+Priority: optional
+Section: x11
+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), libglib2.0-dev, libxfce4util-dev (>= 4.4.2), libxt-dev, chrpath
+Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/libxfce4mcs/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/libxfce4mcs/
+
+Package: libxfce4mcs-manager3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libxfce4mcs-manager-0, libxfce4mcs-manager-1, libxfce4mcs-manager-2
+Conflicts: libxfce4mcs-manager-0, libxfce4mcs-manager-1, libxfce4mcs-manager-2
+Description: Manager library for Xfce4 configure interface
+ This package contains a library which provides basic functions
+ for the Xfce4 configuration tool.
+ .
+ If you intend to use Xfce4, you definitely want to install
+ this package.
+
+Package: libxfce4mcs-client3
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libxfce4mcs-client-0, libxfce4mcs-client-1, libxfce4mcs-client-2
+Conflicts: libxfce4mcs-client-0, libxfce4mcs-client-1, libxfce4mcs-client-2
+Description: Client library for Xfce4 configure interface
+ This package contains a library which can be used by every
+ program that aims to be a configuration-manager for Xfce4.
+ .
+ If you intend to use Xfce4, you definitely want to install
+ this package.
+
+Package: libxfce4mcs-dev
+Section: libdevel
+Architecture: any
+Depends: libxfce4mcs-manager3 (= ${binary:Version}), libxfce4mcs-client3 (= ${binary:Version}), libxfce4util-dev (>= 4.4.2)
+Replaces: libxfce4mcs-0-dev
+Conflicts: libxfce4mcs-0-dev
+Suggests: devhelp
+Description: Development files for libxfce4mcs-client and -manager
+ This package contains the development files libxfce4mcs-client
+ and libxfce4mcs-manager which are the main parts of the Xfce4
+ configuration system. If you want to develop applications that
+ use one of these two libraries, you want to install this package.
+ .
+ The libxfce4mcs Reference Manual is also included and it can be 
+ consulted with Devhelp or a web browser.
--- libxfce4mcs-4.4.2.orig/debian/libxfce4mcs-client3.install
+++ libxfce4mcs-4.4.2/debian/libxfce4mcs-client3.install
@@ -0,0 +1 @@
+usr/lib/libxfce4mcs-client.so.*
--- libxfce4mcs-4.4.2.orig/debian/watch
+++ libxfce4mcs-4.4.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.xfce.org/archive/xfce-(.*)/src/ \
+	libxfce4mcs-(.*)\.tar\.bz2
--- libxfce4mcs-4.4.2.orig/config.guess
+++ libxfce4mcs-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
--- libxfce4mcs-4.4.2.orig/config.sub
+++ libxfce4mcs-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*)
