--- xfce4-mixer-4.4.2.orig/debian/xfce4-mixer.menu
+++ xfce4-mixer-4.4.2/debian/xfce4-mixer.menu
@@ -0,0 +1,6 @@
+?package(xfce4-mixer):\
+ needs="X11"\
+ section="Sound"\
+ title="Xfce Mixer"\
+ command="/usr/bin/xfce4-mixer"\
+ icon="/usr/share/pixmaps/xfce4-mixer.xpm"
--- xfce4-mixer-4.4.2.orig/debian/postinst
+++ xfce4-mixer-4.4.2/debian/postinst
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+
+if [ "$1" = "configure" ]; then
+	# Get xfce-mcs-manager to reinit
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true
+
+fi
+
+#DEBHELPER#
+
+exit 0
--- xfce4-mixer-4.4.2.orig/debian/compat
+++ xfce4-mixer-4.4.2/debian/compat
@@ -0,0 +1 @@
+4
--- xfce4-mixer-4.4.2.orig/debian/copyright
+++ xfce4-mixer-4.4.2/debian/copyright
@@ -0,0 +1,41 @@
+This package was debianized by Martin Loschwitz <madkiss@debian.org> on
+Sun, 20 Jul 2003 16:35:47 +0200.
+
+You can fetch xfce4-mixer from the official Xfce website, which is
+http://www.xfce.org/
+
+Upstream authors are:
+
+		Danny Milosavljevic <dannym@xfce.org>
+		Benedikt Meurer <benny@xfce.org>
+	
+Code for building alsa/oss packages is inspired by os-works debian packages
+(http://www.os-works.com) by Benedikt Meurer.
+
+xfce4-mixer is Copyright 2003-2006 The Xfce development team.
+include/vc.h, lib/vc.c, lib/vc_oss.c, (c) 2003 Benedikt Meurer, Danny 
+  Milosavljevic
+lib/vc_sun.c (c) 2004 Benedikt Meurer, Danny Milosavljevic
+lib/vc_sgi.c (c) 2005 Danny Milosavljevic
+lib/trans.c  (c) 2004-2005 Danny Milosavljevic
+lib/vc_alsa.c, lib/vc_alsa_fallback.c (c) 2003 Danny Milosavljevic
+src/disclosure-widget.c (c) 2002 Iain Holmes.
+
+Copyright:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   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 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 General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- xfce4-mixer-4.4.2.orig/debian/prerm
+++ xfce4-mixer-4.4.2/debian/prerm
@@ -0,0 +1,10 @@
+#!/bin/sh -e
+
+if [ "$1" = "remove" ]; then
+	# Get xfce-mcs-manager to reinit
+	kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true
+fi
+
+#DEBHELPER#
+
+exit 0
--- xfce4-mixer-4.4.2.orig/debian/rules
+++ xfce4-mixer-4.4.2/debian/rules
@@ -0,0 +1,145 @@
+#!/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)
+DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+VARIANTS=oss alsa
+else
+VARIANTS=oss
+endif
+
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
+
+unpatch:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc patch-stamp
+
+config.status: configure patch-stamp
+	
+	dh_testdir
+
+	#configure the two variants:
+	for variant in $(VARIANTS); do \
+	mkdir $(CURDIR)/debian/build-$$variant && \
+	cd $(CURDIR)/debian/build-$$variant && \
+	$(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-final --libexecdir=\$${prefix}/lib --with-sound=$$variant;\
+	done
+
+	touch config.status
+	
+build: build-stamp
+build-stamp: config.status
+	
+	dh_testdir
+	
+	#build the two variants:
+	for variant in $(VARIANTS);do \
+	cd $(CURDIR)/debian/build-$$variant/lib && $(MAKE);\
+	done
+
+	#make the mixer from oss variant
+	cd $(CURDIR)/debian/build-oss && $(MAKE)
+	
+	touch build-stamp
+
+clean: unpatch
+	
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp config.status
+	
+	for variant in $(VARIANTS);do \
+	rm -rf $(CURDIR)/debian/build-$$variant;\
+	done
+
+	[ ! -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 $(CURDIR)/patch-stamp
+
+install: build
+	
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	#install the two variants:
+	for variant in $(VARIANTS);do \
+	cd $(CURDIR)/debian/build-$$variant/lib && \
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer-$$variant;\
+	done
+
+	#install common mixer from oss variant
+	cd $(CURDIR)/debian/build-oss &&\
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer
+	#and remove libs presents in alsa/oss variants:
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/libxfce4mixer.*
+
+	# install menu pixmap
+	install -d $(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
+	install -c -m 644 $(CURDIR)/debian/xfce4-mixer.xpm \
+		$(CURDIR)/debian/xfce4-mixer/usr/share/pixmaps
+
+
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.la
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/mcs-plugins/*.a
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.la
+	rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/panel-plugins/*.a
+	rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.la
+	rm -f $(CURDIR)/debian/xfce4-mixer*/usr/lib/xfce4/modules/*.a
+
+	install -d $(CURDIR)/debian/xfce4-mixer/usr/share/lintian/overrides
+	install -c -m 644 $(CURDIR)/debian/lintian-override \
+		$(CURDIR)/debian/xfce4-mixer/usr/share/lintian/overrides/xfce4-mixer
+	chrpath -d -k `pwd`/debian/xfce4-mixer*/usr/lib/xfce4/modules/*
+	chrpath -r '/usr/lib/xfce4/modules' \
+		`pwd`/debian/xfce4-mixer/usr/lib/xfce4/*/* \
+		`pwd`/debian/xfce4-mixer/usr/bin/*
+
+binary-indep: build install
+binary-arch: build install
+	
+	dh_testdir
+	dh_testroot
+	
+	dh_installchangelogs ChangeLog
+	dh_installdocs README debian/NEWS.Debian
+	dh_installman debian/xfce4-mixer.1
+	
+	dh_strip
+	dh_compress
+	
+	dh_fixperms
+	dh_installdeb
+	
+	dh_shlibdeps -l$(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/
+	dh_gencontrol -s
+	
+	dh_md5sums -s
+	dh_builddeb -s
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- xfce4-mixer-4.4.2.orig/debian/changelog
+++ xfce4-mixer-4.4.2/debian/changelog
@@ -0,0 +1,236 @@
+xfce4-mixer (4.4.2-1~bpo40+1) etch-backports; urgency=low
+
+  * etch-backports.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 21 Dec 2007 00:19:39 +0100
+
+xfce4-mixer (4.4.2-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/xfce4-mixer.menu: switch to new menu policy.
+  * debian/postinst: use posix kill -s to avoid problems on hurd.
+  * debian/rules: don't ignore all make errors at clean time.
+
+  [ Simon Huggins ]
+  * debian/prerm: Use kill -s to keep Hurd and lintian happy at the same time.
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+  * Add fake shlibs to pacify newer dpkg-shlibs
+  * Add Vcs-* headers to debian/control
+
+ -- Simon Huggins <huggie@earth.li>  Tue, 27 Nov 2007 16:39:18 +0000
+
+xfce4-mixer (4.4.1-3) unstable; urgency=low
+
+  * Really build-dep on the fixed dpkg-dev for dpkg-architecture that works
+    again (0.14.4 != 1.14.4).
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 26 May 2007 09:19:48 +0100
+
+xfce4-mixer (4.4.1-2) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * Remove config.status from top src dir so that the clean target works
+    correctly.                                                  closes: #424119 
+
+  (Simon Huggins)
+  * Build-dep on the fixed dpkg-dev for dpkg-architecture that works again.
+  * Use ${binary:Version} so we are binNMU safe.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Fri, 25 May 2007 07:55:19 +0100
+
+xfce4-mixer (4.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: updated copyright holders.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+xfce4-mixer (4.4.0-1) experimental; urgency=low
+  
+  (Yves-Alexis Perez)
+  * New upstream release.
+  * debian/control: updated build-deps against Xfce 4.4.
+  * Build only oss variant on non linux archs. Thanks Petr Salinger for the
+    patch.							closes: #404122
+
+  (Emanuele Rocca)
+  * Bump up the libgtk2.0-dev build-dep to >= 2.10.1-1.
+  * binary-or-shlib-defines-rpath lintian override added.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 27 Jan 2007 18:00:22 +0100
+
+xfce4-mixer (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 16:00:41 +0100
+
+xfce4-mixer (4.3.99.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1).
+  * Add a patch to use correct panel width. 
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 23 Sep 2006 13:44:09 +0100
+
+xfce4-mixer (4.3.90.2-4) unstable; urgency=low
+
+  * Depend on xfce4-panel-dev with correct shlibs.
+
+ -- Simon Huggins <huggie@earth.li>  Wed, 26 Jul 2006 15:51:00 +0100
+
+xfce4-mixer (4.3.90.2-3) unstable; urgency=low
+
+  * Hmm, rabid rpath removal considered harmful.  This lets the libs and
+    binary find each other again.  *sigh*
+
+ -- Simon Huggins <huggie@earth.li>  Mon, 24 Jul 2006 10:16:56 +0100
+
+xfce4-mixer (4.3.90.2-2) unstable; urgency=low
+
+  * debian/control: updated versioned build dependency.	Closes: #379326 
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 22 Jul 2006 22:33:24 +0200
+
+xfce4-mixer (4.3.90.2-1) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+  * New upstrteam release.
+  * debian/postinst: fix install on hurd by not using pkill.
+  * debian/control: updated standards version to 3.7.2.
+  (Simon Huggins)
+  * Add rpath fixes.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Fri, 21 Jul 2006 15:46:33 +0200
+
+xfce4-mixer (4.3.90.1-2) unstable; urgency=low
+
+  (Yves-Alexis Perez)
+   * Removed circular dependency between xfce4-mixer and xfce4-mixer-(alsa|oss)
+   * Removed explicit dependency on xfce4-panel (handled by shlibs)
+  (Simon Huggins)
+   * Make libexedir be /usr/lib
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 13 May 2006 20:31:26 +0100
+
+xfce4-mixer (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
+  
+xfce4-mixer (4.2.3-2) unstable; urgency=low
+
+  * (Yves-Alexis Perez)
+    - Build the libs for alsa and oss in two different packages  closes: #316518
+    - Added a Build-Depend on libasound2
+  * (Emanuele Rocca)
+    - Added NEWS.Debian in order to explain the recent split in -alsa and -oss
+    - debian/control minor fixes
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Tue, 03 Jan 2006 14:39:00 +0100
+
+xfce4-mixer (4.2.3-1) unstable; urgency=low
+
+  * New Upstream Release
+  * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 06 Nov 2005 22:01:12 +0100
+
+xfce4-mixer (4.2.2-1) unstable; urgency=low
+
+  * Simon Huggins:
+   - New Upstream Release
+   - Remove Build-Depends on libstartup-notification0-dev as this should be
+     satisfied via libxfce4gui-dev now
+   - Remove usr/share/doc/xfce4-mixer/TODO, empty file
+   - Add lintian overrides for the rpath in private libs "bug"
+   - Change suite to unstable
+  * Rudy Godoy
+   - Added manpage
+  * Emanuele Rocca
+   - Remove empty TODO file
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 18 Jun 2005 09:47:07 +0100
+
+xfce4-mixer (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/fixed Maintainer/Uploaders fields
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 19 Mar 2005 13:02:00 +0100
+
+xfce4-mixer (4.2.0-2) experimental; urgency=low
+
+  * Add --enable-final to configure
+  * Add a Homepage: to the description
+  * Add menu and xpm
+  * Remove the mcs-pluins .a and .la files too
+
+ -- Simon Huggins <huggie@earth.li>  Sun, 16 Jan 2005 15:44:23 +0000
+
+xfce4-mixer (4.2.0-1) experimental; urgency=low
+
+  * New Upstream Release
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 15 Jan 2005 13:27:32 +0000
+
+xfce4-mixer (4.1.99.1-1) experimental; urgency=low
+
+  * ML: New Upstream Release (4.1.99.1 alias XFce4 4.2 RC1)
+  * ML: Integrated the mixer library properly (mad world!)
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 19 Nov 2004 17:47:00 +0100
+
+xfce4-mixer (4.0.6-1) unstable; urgency=low
+
+  * New upstream release
+  * Update description
+  * Remove Norbert Tretkowski from Uploaders as requested
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 24 Jul 2004 19:31:49 +0100
+
+xfce4-mixer (4.0.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Update upstream's libtool
+  * Build with libstartup-notification0
+
+ -- Simon Huggins <huggie@earth.li>  Thu, 29 Apr 2004 20:46:37 +0100
+
+xfce4-mixer (4.0.3-2) unstable; urgency=low
+
+  * Update libtool
+  * 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 13:42:52 +0000
+
+xfce4-mixer (4.0.3-1) unstable; urgency=low
+
+  * New upstream release
+  * Add Daniel Silverstone <dsilvers@debian.org> to Uploaders as approved by
+    madkiss
+  * Remove .la and .a files - this is not a -dev package
+  * Thanks to Daniel for checking and uploading these packages
+
+ -- Simon Huggins <huggie@earth.li>  Wed, 25 Feb 2004 10:43:18 +0000
+
+xfce4-mixer (4.0.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 26 Dec 2003 17:00:00 +0100
+
+xfce4-mixer (4.0.0.final-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 29 Sep 2003 17:39:49 +0200
--- xfce4-mixer-4.4.2.orig/debian/xfce4-mixer-oss.shlibs
+++ xfce4-mixer-4.4.2/debian/xfce4-mixer-oss.shlibs
@@ -0,0 +1 @@
+libxfce4mixer 0 xfce4-mixer
--- xfce4-mixer-4.4.2.orig/debian/NEWS.Debian
+++ xfce4-mixer-4.4.2/debian/NEWS.Debian
@@ -0,0 +1,11 @@
+xfce4-mixer (4.2.3-2) unstable; urgency=low
+
+  * Starting from this version, xfce4-mixer supplies the two following 
+    additional binary packages:
+    - xfce4-mixer-alsa
+    - xfce4-mixer-oss
+    
+    The default is to go with -alsa. If you use oss, install xfce4-mixer-oss 
+    instead.
+
+ -- Emanuele Rocca <ema@debian.org>  Tue, 03 Jan 2006 14:39:00 +0100
--- xfce4-mixer-4.4.2.orig/debian/xfce4-mixer.1
+++ xfce4-mixer-4.4.2/debian/xfce4-mixer.1
@@ -0,0 +1,18 @@
+.\" Copyright (c) 2005 Rudy Godoy
+.TH XFCE4-MIXER "1" "June 2005" "xfce4-mixer 0.1" "User Commands"
+.SH NAME
+xfce4-mixer \- a volume control application for Xfce
+.SH SYNOPSIS
+.B xfce4-mixer
+.SH DESCRIPTION
+.PP
+xfce4-mixer is a volume control application for the Xfce Desktop
+Environment. This software package contains both a volume control plugin
+for the Xfce Panel and a standalone mixer application. You should be able
+to run the latter from the menu system.
+.SH COPYRIGHT
+Copyright \(co 2005 Rudy Godoy
+.br
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
--- xfce4-mixer-4.4.2.orig/debian/xfce4-mixer.xpm
+++ xfce4-mixer-4.4.2/debian/xfce4-mixer.xpm
@@ -0,0 +1,368 @@
+/* XPM */
+static char * xfce4_mixer_xpm[] = {
+"32 32 333 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #08090A",
+"@ 	c #1D2329",
+"# 	c #293139",
+"$ 	c #444F5B",
+"% 	c #495662",
+"& 	c #3C4751",
+"* 	c #171B1F",
+"= 	c #181C20",
+"- 	c #283038",
+"; 	c #394450",
+"> 	c #394550",
+", 	c #2E3943",
+"' 	c #5A6A78",
+") 	c #778B9F",
+"! 	c #232A31",
+"~ 	c #010102",
+"{ 	c #040506",
+"] 	c #1B2127",
+"^ 	c #2C343D",
+"/ 	c #48596C",
+"( 	c #6E87A3",
+"_ 	c #6A829D",
+": 	c #69819C",
+"< 	c #68809B",
+"[ 	c #3E4B59",
+"} 	c #46525F",
+"| 	c #8DA4BA",
+"1 	c #323B44",
+"2 	c #191F25",
+"3 	c #252D36",
+"4 	c #5F758D",
+"5 	c #748FAD",
+"6 	c #6E88A5",
+"7 	c #647B95",
+"8 	c #36414D",
+"9 	c #758697",
+"0 	c #869AAF",
+"a 	c #090B0D",
+"b 	c #010101",
+"c 	c #1C2227",
+"d 	c #323B45",
+"e 	c #5E738B",
+"f 	c #7590AE",
+"g 	c #6B849F",
+"h 	c #647A94",
+"i 	c #38404A",
+"j 	c #9EB0C3",
+"k 	c #43505C",
+"l 	c #030304",
+"m 	c #0E1114",
+"n 	c #2F3841",
+"o 	c #475768",
+"p 	c #738EAB",
+"q 	c #728CA9",
+"r 	c #6A839E",
+"s 	c #3B4857",
+"t 	c #82919F",
+"u 	c #7A8D9E",
+"v 	c #0F1215",
+"w 	c #0A0D10",
+"x 	c #2B333A",
+"y 	c #333F4A",
+"z 	c #758FAD",
+"A 	c #4C5D70",
+"B 	c #5B6874",
+"C 	c #A6B8C9",
+"D 	c #282F35",
+"E 	c #19222C",
+"F 	c #11161B",
+"G 	c #0F1114",
+"H 	c #5E7289",
+"I 	c #728CAA",
+"J 	c #506276",
+"K 	c #46535E",
+"L 	c #BACCDC",
+"M 	c #424C55",
+"N 	c #1B242E",
+"O 	c #334758",
+"P 	c #020304",
+"Q 	c #040405",
+"R 	c #343D47",
+"S 	c #374452",
+"T 	c #748EAC",
+"U 	c #69829D",
+"V 	c #576C84",
+"W 	c #3A4752",
+"X 	c #BACCDF",
+"Y 	c #5C6976",
+"Z 	c #11181D",
+"` 	c #435D74",
+" .	c #273745",
+"..	c #050709",
+"+.	c #131619",
+"@.	c #2D353D",
+"#.	c #5B7188",
+"$.	c #6C86A2",
+"%.	c #6B839F",
+"&.	c #677F9A",
+"*.	c #5E748D",
+"=.	c #333E49",
+"-.	c #B8CADD",
+";.	c #6C7985",
+">.	c #0F151A",
+",.	c #415A71",
+"'.	c #445F77",
+").	c #19232B",
+"!.	c #21262D",
+"~.	c #2E373F",
+"{.	c #3B4856",
+"].	c #2A3A49",
+"^.	c #324253",
+"/.	c #5B718A",
+"(.	c #60778F",
+"_.	c #333D47",
+":.	c #B1C5D8",
+"<.	c #798998",
+"[.	c #0C1014",
+"}.	c #3D566B",
+"|.	c #4A6882",
+"1.	c #46637B",
+"2.	c #0E1419",
+"3.	c #2C343C",
+"4.	c #445363",
+"5.	c #657D97",
+"6.	c #384959",
+"7.	c #768798",
+"8.	c #3E5975",
+"9.	c #273D53",
+"0.	c #435467",
+"a.	c #5C7189",
+"b.	c #323D48",
+"c.	c #B7CADC",
+"d.	c #768594",
+"e.	c #0C1116",
+"f.	c #3E576D",
+"g.	c #35495C",
+"h.	c #0B0E12",
+"i.	c #3A4550",
+"j.	c #5A6F86",
+"k.	c #3F5060",
+"l.	c #738494",
+"m.	c #566F87",
+"n.	c #304D6B",
+"o.	c #2D4864",
+"p.	c #2B3A4B",
+"q.	c #566980",
+"r.	c #3E4A56",
+"s.	c #B9CBDE",
+"t.	c #697683",
+"u.	c #405A71",
+"v.	c #2F4151",
+"w.	c #111418",
+"x.	c #364250",
+"y.	c #637A94",
+"z.	c #6D87A3",
+"A.	c #424F5B",
+"B.	c #A1AEBB",
+"C.	c #35526F",
+"D.	c #304C6A",
+"E.	c #233445",
+"F.	c #4C5E72",
+"G.	c #4B5865",
+"H.	c #BECFE0",
+"I.	c #12191F",
+"J.	c #435E76",
+"K.	c #496680",
+"L.	c #12181F",
+"M.	c #010202",
+"N.	c #252C32",
+"O.	c #34404C",
+"P.	c #6D86A2",
+"Q.	c #5B7086",
+"R.	c #596977",
+"S.	c #ACB8C4",
+"T.	c #2B3D4F",
+"U.	c #5E6E7E",
+"V.	c #BECEDF",
+"W.	c #404A53",
+"X.	c #1C2731",
+"Y.	c #48657F",
+"Z.	c #314455",
+"`.	c #030405",
+" +	c #2F373F",
+".+	c #323D4A",
+"++	c #4B5D70",
+"@+	c #6F8092",
+"#+	c #A3B3C2",
+"$+	c #2A425B",
+"%+	c #39495A",
+"&+	c #414F60",
+"*+	c #748493",
+"=+	c #AFBFCF",
+"-+	c #293038",
+";+	c #253543",
+">+	c #3C5469",
+",+	c #0B0F13",
+"'+	c #35414E",
+")+	c #47586B",
+"!+	c #7E8E9C",
+"~+	c #ADB9C5",
+"{+	c #283D53",
+"]+	c #4C6075",
+"^+	c #313B46",
+"/+	c #9BABBB",
+"(+	c #91A2B0",
+"_+	c #15191D",
+":+	c #354A5C",
+"<+	c #3F586E",
+"[+	c #0D1317",
+"}+	c #2D343B",
+"|+	c #3B4959",
+"1+	c #566A81",
+"2+	c #5F6E7C",
+"3+	c #B2BDC7",
+"4+	c #324F6D",
+"5+	c #2C3946",
+"6+	c #4F6174",
+"7+	c #46515C",
+"8+	c #B9CADA",
+"9+	c #677685",
+"0+	c #0A0C0F",
+"a+	c #456079",
+"b+	c #394F63",
+"c+	c #070A0C",
+"d+	c #303840",
+"e+	c #35424F",
+"f+	c #334455",
+"g+	c #748495",
+"h+	c #2A435D",
+"i+	c #243342",
+"j+	c #5A6F87",
+"k+	c #303B47",
+"l+	c #8596A6",
+"m+	c #BBCDDE",
+"n+	c #19242D",
+"o+	c #020203",
+"p+	c #2C333B",
+"q+	c #313C49",
+"r+	c #5B7189",
+"s+	c #3E4F60",
+"t+	c #374658",
+"u+	c #50657B",
+"v+	c #5B7088",
+"w+	c #303A44",
+"x+	c #B1C3D5",
+"y+	c #9BADBF",
+"z+	c #0A0D0F",
+"A+	c #2F4252",
+"B+	c #1C2126",
+"C+	c #313D4A",
+"D+	c #7089A6",
+"E+	c #6F89A6",
+"F+	c #404F60",
+"G+	c #5F6D7B",
+"H+	c #B8C9D9",
+"I+	c #47525D",
+"J+	c #141B22",
+"K+	c #435D75",
+"L+	c #3C5267",
+"M+	c #131A20",
+"N+	c #0A0C0E",
+"O+	c #6B839D",
+"P+	c #6C84A0",
+"Q+	c #A0B0C1",
+"R+	c #8FA1B2",
+"S+	c #181C21",
+"T+	c #2B3D4D",
+"U+	c #496781",
+"V+	c #324759",
+"W+	c #0F1318",
+"X+	c #2A333B",
+"Y+	c #576B81",
+"Z+	c #6E87A4",
+"`+	c #617790",
+" @	c #2D3740",
+".@	c #8B9CAC",
+"+@	c #B4C7D9",
+"@@	c #2E363E",
+"#@	c #11171C",
+"$@	c #48657E",
+"%@	c #324658",
+"&@	c #0F151B",
+"*@	c #3F4D5D",
+"=@	c #425262",
+"-@	c #515F6C",
+";@	c #B7CADB",
+">@	c #6E7D8D",
+",@	c #334657",
+"'@	c #34495C",
+")@	c #141C23",
+"!@	c #040608",
+"~@	c #0C0E10",
+"{@	c #1F252A",
+"]@	c #5C7188",
+"^@	c #657C96",
+"/@	c #485767",
+"(@	c #ACBDCD",
+"_@	c #72808E",
+":@	c #101316",
+"<@	c #24313C",
+"[@	c #0D1218",
+"}@	c #1B1F24",
+"|@	c #2F3A46",
+"1@	c #5B6F87",
+"2@	c #657D96",
+"3@	c #34404D",
+"4@	c #404C57",
+"5@	c #899AAB",
+"6@	c #14181D",
+"7@	c #0C0F13",
+"8@	c #12181E",
+"9@	c #050708",
+"0@	c #272E34",
+"a@	c #2F3840",
+"b@	c #384350",
+"c@	c #414F5E",
+"d@	c #394653",
+"e@	c #333C46",
+"f@	c #778797",
+"g@	c #A4B4C5",
+"h@	c #0B0D0F",
+"i@	c #1E2329",
+"j@	c #44515C",
+"k@	c #647586",
+"l@	c #72879B",
+"m@	c #7B90A4",
+"n@	c #606E7D",
+"o@	c #30363D",
+"p@	c #050608",
+"q@	c #030404",
+"r@	c #090C0F",
+"                            .                                   ",
+"                    . . . . . . . . .                           ",
+"                  . . + @ # $ % & * . .                         ",
+"                . . = - # ; > , ' ) ! ~ .                       ",
+"              . { ] ^ / ( _ : < [ } | 1 . .                     ",
+"            . . 2 3 4 5 5 6 : : 7 8 9 0 a .                     ",
+"          . b c d e f f f f g : : h i j k l . .                 ",
+"          . m n o p f f f f q r : : s t u v w ~                 ",
+"        . . x y f f f f f f z ( : : A B C D E F .               ",
+"        . G 1 H f f f f f f z I : : J K L M N O P .             ",
+"      . Q R S T f f f f f f f f U < V W X Y Z `  ...            ",
+"      . +.@.#.f f f f f f f I $.%.&.*.=.-.;.>.,.'.)..           ",
+"      . !.~.f f f f f f 5 4 {.].^./.(._.:.<.[.}.|.1.2.b         ",
+"    . . 3.4.f f f f f f 5.6.7.8.9.0.a.b.c.d.e.f.|.|.g.h.        ",
+"    . P i.j.f f f f f f k.l.m.n.o.p.q.r.s.t.>.u.|.|.|.v.~       ",
+"    . w.x.y.f f f f f z.A.B.C.n.D.E.F.G.H.Y I.J.|.|.|.K.L.M.    ",
+"    . N.O.P.f f f f f Q.R.S.n.n.o.T./ U.V.W.X.Y.|.|.|.|.Z.`.    ",
+"    .  +.+p f f f f f ++@+#+n.n.$+%+&+*+=+-+;+|.|.|.|.|.>+,+.   ",
+"  . .  +'+f f f f f f )+!+~+n.n.{+]+^+/+(+_+:+|.|.|.|.|.<+[+.   ",
+"  . . }+|+f f f f f f 1+2+3+4+D.5+6+7+8+9+0+a+|.|.|.|.|.b+c+    ",
+"  . . d+e+f f f f f f 6 f+g+h+i+j+k+l+m+x n+|.|.|.|.|.|.].o+    ",
+"    . p+q+z f f f f f f r+s+t+u+v+w+x+y+z+A+|.|.|.|.|.1.[.~     ",
+"    . B+C+D+f f f f f f f E+: : F+G+H+I+J+K+|.|.|.|.L+M+.       ",
+"    . N+=.O+f f f f f f T P+: 4 R Q+R+S+T+U+|.|.K.V+W+b         ",
+"    . . X+Y+f f f f f f Z+: `+ @.@+@@@#@$@|.J.%@&@~ .           ",
+"    . . * *@f f f f f 5 _ : =@-@;@>@0+,@Y.'@)@!@M.              ",
+"      . ~@{@]@5 f f p g ^@/@7+(@_@:@<@Z.[@`..                   ",
+"      . b }@|@1@f f P.2@3@4@C 5@6@7@8@9@.                       ",
+"        . . 0@a@b@c@d@e@f@g@B h@. . .                           ",
+"        . . Q i@j@k@l@m@n@o@p@. .                               ",
+"            . . . q@r@P . . .                                   ",
+"                . . . . .                                       "};
--- xfce4-mixer-4.4.2.orig/debian/lintian-override
+++ xfce4-mixer-4.4.2/debian/lintian-override
@@ -0,0 +1,5 @@
+# These are private libs so this isn't really evil
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/libmixer.so /usr/lib/xfce4/modules
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/mcs-plugins/sound_settings.so /usr/lib/xfce4/modules
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/bin/xfce4-mixer /usr/lib/xfce4/modules
+xfce4-mixer binary: binary-or-shlib-defines-rpath ./usr/lib/xfce4/panel-plugins/xfce4-mixer-plugin /usr/lib/xfce4/modules
--- xfce4-mixer-4.4.2.orig/debian/xfce4-mixer-alsa.shlibs
+++ xfce4-mixer-4.4.2/debian/xfce4-mixer-alsa.shlibs
@@ -0,0 +1 @@
+libxfce4mixer 0 xfce4-mixer
--- xfce4-mixer-4.4.2.orig/debian/control
+++ xfce4-mixer-4.4.2/debian/control
@@ -0,0 +1,39 @@
+Source: xfce4-mixer
+Section: x11
+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.2.1-1), libgtk2.0-dev, libxft-dev, xfce4-panel-dev (>= 4.4.2), libasound2-dev (>= 0.9.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt
+Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-mixer/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-mixer/
+
+Package: xfce4-mixer
+Architecture: any
+Depends: ${shlibs:Depends}, xfce4-mixer-alsa (= ${binary:Version}) | xfce4-mixer-oss (= ${binary:Version})
+Description: Xfce4 Mixer frontend
+ This is the frontend for mixer settings delivered together
+ with the Xfce4 desktop environment. It does the same jobs
+ other mixer frontends do but is integrated into the Xfce4
+ desktop as a plugin for the Xfce4 main panel.
+
+Package: xfce4-mixer-alsa
+Architecture: linux-any
+Depends: ${shlibs:Depends}
+Recommends: xfce4-mixer (= ${binary:Version})
+Replaces: xfce4-mixer-oss
+Conflicts: xfce4-mixer-oss, xfce4-mixer (<= 4.2.3-1)
+Suggests: alsa-utils
+Description: Xfce4 Mixer ALSA backend
+ This is the ALSA backend for xfce4-mixer.
+
+Package: xfce4-mixer-oss
+Architecture: any
+Depends: ${shlibs:Depends}
+Recommends: xfce4-mixer (= ${binary:Version})
+Replaces: xfce4-mixer-alsa
+Conflicts: xfce4-mixer-alsa, xfce4-mixer (<= 4.2.3-1)
+Suggests: alsa-utils
+Description: Xfce4 Mixer OSS backend
+ This is the OSS backend for xfce4-mixer.
--- xfce4-mixer-4.4.2.orig/debian/patches/series
+++ xfce4-mixer-4.4.2/debian/patches/series
@@ -0,0 +1,2 @@
+01_xfce4-mixer-panel-plugin_border.patch
+02_mixer-block-menu.patch
--- xfce4-mixer-4.4.2.orig/debian/patches/02_mixer-block-menu.patch
+++ xfce4-mixer-4.4.2/debian/patches/02_mixer-block-menu.patch
@@ -0,0 +1,28 @@
+Index: panel-plugin/plugin.c
+===================================================================
+--- xfce4-mixer/panel-plugin/plugin.c	(révision 26127)
++++ xfce4-mixer/panel-plugin/plugin.c	(copie de travail)
+@@ -127,6 +127,8 @@
+ {
+     t_mixer *mixer = (t_mixer *) user_data;
+ 
++    xfce_panel_plugin_unblock_menu (mixer->temp_plugin);
++
+     xfce_mixer_prefbox_save_preferences (mixer->prefbox, mixer->prefs);
+  
+     mixer_write_config(mixer->temp_plugin, mixer);
+@@ -149,11 +151,13 @@
+ 
+     mixer = (t_mixer *) user_data;
+     
++    xfce_panel_plugin_block_menu (plugin);
++
+     /* TODO TRANSLATE TITLE OR SOMETHING */
+ 
+     dialog = GTK_DIALOG (
+              gtk_dialog_new_with_buttons (xfce_panel_plugin_get_name (plugin), 
+-                                          GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(plugin))), 
++                                          NULL, 
+                                           GTK_DIALOG_DESTROY_WITH_PARENT,
+                                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, 
+                                           NULL));
--- xfce4-mixer-4.4.2.orig/debian/patches/01_xfce4-mixer-panel-plugin_border.patch
+++ xfce4-mixer-4.4.2/debian/patches/01_xfce4-mixer-panel-plugin_border.patch
@@ -0,0 +1,57 @@
+Index: plugin.c
+===================================================================
+--- xfce4-mixer/panel-plugin/plugin.c	(révision 23116)
++++ xfce4-mixer/panel-plugin/plugin.c	(copie de travail)
+@@ -23,6 +23,7 @@
+ 
+ #define PLUGIN_NAME "xfce4-mixer-plugin"
+ #define MIXER_RC_GROUP "mixer-plugin"
++#define BORDER 8
+ 
+ /* Panel Plugin Interface */
+ static void mixer_construct (XfcePanelPlugin *plugin);
+@@ -65,11 +66,11 @@
+ 	if (orientation == GTK_ORIENTATION_VERTICAL) {
+ 		gtk_widget_set_size_request (GTK_WIDGET(plugin), size, size);
+ 		gtk_widget_set_size_request (GTK_WIDGET(mixer->ib), -1, -1);
+-		gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), slider_width, -1);
++		gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), BORDER, size - BORDER);
+ 	} else {
+ 		gtk_widget_set_size_request (GTK_WIDGET(plugin), -1, size);
+ 		gtk_widget_set_size_request (GTK_WIDGET(mixer->ib), size, -1);
+-		gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), slider_width, -1);
++		gtk_widget_set_size_request (GTK_WIDGET(mixer->slider), BORDER, size - BORDER);
+ 	}
+ }
+ 
+@@ -438,6 +439,7 @@
+ 	t_mixer *mixer;
+ 	GdkPixbuf *pb;
+ 	GtkWidget *align;
++    static GtkWidget *box;
+ 	
+ 	mixer = g_new0 (t_mixer, 1);
+ 
+@@ -463,6 +465,12 @@
+ 
+ 	gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (mixer->ib), TRUE, TRUE, 0);
+ 
++    if (GTK_IS_WIDGET (box))
++        gtk_widget_destroy (box);
++    box = gtk_hbox_new (FALSE, 0);
++    gtk_container_set_border_width (GTK_CONTAINER (box), BORDER / 2);
++    gtk_widget_show (box);
++
+ 	mixer->slider = XFCE_MIXER_CONTROL (xfce_mixer_slider_tiny_new ());
+ 	g_signal_connect (
+ 		G_OBJECT (mixer->slider), "notify::value", 
+@@ -470,7 +478,8 @@
+ 	);
+ 	
+ 	gtk_widget_show (GTK_WIDGET (mixer->slider));
+-	gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (mixer->slider), FALSE, TRUE, 0);
++	gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (mixer->slider), FALSE, FALSE, 0);
++	gtk_box_pack_start (GTK_BOX (mixer->box), GTK_WIDGET (box), FALSE, FALSE, 0);
+ 		
+ 	g_signal_connect_swapped (
+ 		G_OBJECT (mixer->ib), "scroll-event", 
--- xfce4-mixer-4.4.2.orig/debian/watch
+++ xfce4-mixer-4.4.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.xfce.org/archive/xfce-(.*)/src/ \
+	xfce4-mixer-(.*)\.tar\.bz2
--- xfce4-mixer-4.4.2.orig/config.guess
+++ xfce4-mixer-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
--- xfce4-mixer-4.4.2.orig/config.sub
+++ xfce4-mixer-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*)
