--- xfce-mcs-manager-4.4.2.orig/debian/compat +++ xfce-mcs-manager-4.4.2/debian/compat @@ -0,0 +1 @@ +4 --- xfce-mcs-manager-4.4.2.orig/debian/xfce-setting-show.1 +++ xfce-mcs-manager-4.4.2/debian/xfce-setting-show.1 @@ -0,0 +1,18 @@ +.\" Copyright (C) 2004 Simon Huggins +.TH XFCE-SETTING-SHOW "1" "February 2004" "xfce-setting-show 0.1" "User Commands" +.SH NAME +xfce-setting-show \- XFce 4 Settings Manager +.SH SYNOPSIS +.B xfce-setting-show +.SH DESCRIPTION +.PP +Starts the XFce 4 settings manager. +.SH SEE ALSO +Upstream documentation in /usr/share/xfce4/doc/C/xfce-mcs-manager.html +.SH "REPORTING BUGS" +Report bugs to http://bugs.debian.org +.SH COPYRIGHT +Copyright \(co 2004 Simon Huggins +.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. --- xfce-mcs-manager-4.4.2.orig/debian/copyright +++ xfce-mcs-manager-4.4.2/debian/copyright @@ -0,0 +1,44 @@ +This package was debianized by Martin Loschwitz on +Sun, 19 Jan 2003 12:30:54 +0100. + +You can fetch xfce-mcs-manager from CVS only right now. Instructions can +be found at http://xfce.sourceforge.net/ + +Upstream authors are: + Olivier Fourdan + Jasper Huijsmans + Benedikt Meurer + +Additionally, portions based on gnome capplets by Jonathan Blandford + and plugin icons from GNOME icons collection are +included. + +Copyright holders: +(c) 2002 Jasper Huijsmans +(c) 2003-2006 Benedikt Meurer +(c) 2002-2004 Olivier Fourdan + +translations are Copyright (C) 2003-2006 The Xfce development team +except dz.po & gl.po + +Manual is +(c) 2004 François Le Clainche +(c) 2004 Jasper Huijsmans +French translation is (c) 2005 Marie-Claude Collilieux + + + 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 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 GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- xfce-mcs-manager-4.4.2.orig/debian/xfce-mcs-manager.1 +++ xfce-mcs-manager-4.4.2/debian/xfce-mcs-manager.1 @@ -0,0 +1,18 @@ +.\" Copyright (C) 2004 Simon Huggins +.TH XFCE-MCS-MANAGER "1" "February 2004" "xfce-mcs-manager 0.1" "User Commands" +.SH NAME +xfce-mcs-manager \- XFce 4 Settings Manager backend +.SH SYNOPSIS +.B xfce-mcs-manager +.SH DESCRIPTION +.PP +Starts the XFce 4 settings manager backend. +.SH SEE ALSO +Upstream documentation in /usr/share/xfce4/doc/C/xfce-mcs-manager.html +.SH "REPORTING BUGS" +Report bugs to http://bugs.debian.org +.SH COPYRIGHT +Copyright \(co 2004 Simon Huggins +.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. --- xfce-mcs-manager-4.4.2.orig/debian/xfce4-mcs-manager.install +++ xfce-mcs-manager-4.4.2/debian/xfce4-mcs-manager.install @@ -0,0 +1,8 @@ +usr/bin/ +usr/lib/xfce-mcs-manager/plugins/*.so +usr/share/man/ +usr/share/locale/ +usr/share/xfce4/doc/ +usr/share/applications/* +usr/share/icons/* +usr/share/pixmaps/ \ No newline at end of file --- xfce-mcs-manager-4.4.2.orig/debian/xfce4-mcs-manager-dev.install +++ xfce-mcs-manager-4.4.2/debian/xfce4-mcs-manager-dev.install @@ -0,0 +1,2 @@ +usr/lib/pkgconfig/xfce-mcs-manager.pc +usr/include/xfce4/xfce-mcs-manager/* --- xfce-mcs-manager-4.4.2.orig/debian/rules +++ xfce-mcs-manager-4.4.2/debian/rules @@ -0,0 +1,93 @@ +#!/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 --disable-rpath --enable-final + touch config.status + +build: build-stamp +build-stamp: config.status + + dh_testdir + $(MAKE) + touch build-stamp + +clean: + + dh_testdir + dh_testroot + + [ ! -f Makefile ] || $(MAKE) distclean + + rm -rf build-stamp config.status debian/tmp-install + +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-install + + install -d `pwd`/debian/tmp-install/usr/share/man/man1 + install `pwd`/debian/xfce-mcs-manager.1 `pwd`/debian/tmp-install/usr/share/man/man1 + install `pwd`/debian/xfce-setting-show.1 `pwd`/debian/tmp-install/usr/share/man/man1 + + # install menu pixmap + install -d $(CURDIR)/debian/tmp-install/usr/share/pixmaps + install -c -m 644 $(CURDIR)/debian/xfce4-mcs-manager.xpm \ + $(CURDIR)/debian/tmp-install/usr/share/pixmaps/xfce4-mcs-manager.xpm + + chrpath -d -k $(CURDIR)/debian/tmp-install/usr/bin/* + + dh_install --list-missing --sourcedir=debian/tmp-install + +binary-indep: build install + +binary-arch: build install + + dh_testdir + dh_testroot + + dh_installdocs + dh_installmenu menu + + dh_installchangelogs + dh_strip + + dh_shlibdeps + dh_compress + + dh_fixperms + dh_makeshlibs + + dh_installdeb + dh_gencontrol + + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xfce-mcs-manager-4.4.2.orig/debian/changelog +++ xfce-mcs-manager-4.4.2/debian/changelog @@ -0,0 +1,244 @@ +xfce-mcs-manager (4.4.2-1~bpo40+1) etch-backports; urgency=low + + * rebuild for etch-backports. + * debian/rules: don't patch. + * debian/control: remove build-dep on dpatch. + + -- Yves-Alexis Perez Fri, 21 Dec 2007 00:19:56 +0100 + +xfce-mcs-manager (4.4.2-1) unstable; urgency=low + + [ Yves-Alexis Perez ] + * New upstream release. + * debian/xfce-mcs-manager.1, debian/xfce-setting-show.1: + Update bug reporting address in manpage. + * debian/xfce4-mcs-manager.menu: update to new menu policy. + * debian/rules: + - don't ignore all make errors at clean stage. + - fix parallel builds. + + [ Simon Huggins ] + * debian/control: Move fake Homepage field to a real one now dpkg + supports it. + * Add Vcs-* headers to debian/control + + -- Yves-Alexis Perez Sun, 02 Dec 2007 11:29:15 +0100 + +xfce-mcs-manager (4.4.1-1) unstable; urgency=low + + * New upstream release. + * debian/copyright: update copyright holders. + + -- Yves-Alexis Perez Sun, 15 Apr 2007 15:28:17 +0100 + +xfce-mcs-manager (4.4.0-3) experimental; urgency=low + + * debian/control: added versioned build-dep on libgtk to let the package + build correctly on experimental. + + -- Yves-Alexis Perez Wed, 7 Feb 2007 22:56:11 +0100 + +xfce-mcs-manager (4.4.0-2) experimental; urgency=low + + * debian/control: add versioned dependency on hicolor-icon-theme (>=0.10) + + -- Yves-Alexis Perez Fri, 26 Jan 2007 11:15:39 +0100 + +xfce-mcs-manager (4.4.0-1) experimental; urgency=low + + * New upstream release. + * debian/control: updated build-deps against Xfce 4.4. + + -- Yves-Alexis Perez Wed, 24 Jan 2007 23:40:38 +0100 + +xfce-mcs-manager (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 Thu, 16 Nov 2006 14:50:15 +0100 + +xfce-mcs-manager (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 Sat, 23 Sep 2006 13:43:10 +0100 + +xfce-mcs-manager (4.3.90.2-1) unstable; urgency=low + + (Yves-Alexis Perez) + * New upstream release. + * debian/control: updated standard versions to 3.7.2. + (Simon Huggins) + * Add rpath fixes. + + -- Yves-Alexis Perez Mon, 10 Jul 2006 18:01:56 +0200 + +xfce-mcs-manager (4.3.90.1-3) unstable; urgency=low + + * Depend on hicolor-icon-theme and recommends xfce4-icon-theme so fresh + installs have icons in the settings manager. Closes: #373934 + + -- Yves-Alexis Perez Sat, 17 Jun 2006 12:37:02 +0100 + +xfce-mcs-manager (4.3.90.1-2) unstable; urgency=low + + * Applied upstream patch so xfce-mcs-manager doesnt segfault on SIGUSR1 + + -- Yves-Alexis Perez Sun, 14 May 2006 15:40:47 +0200 + +xfce-mcs-manager (4.3.90.1-1) unstable; urgency=low + + * New Upstream Release + + -- Yves-Alexis Perez Wed, 03 May 2006 18:35:05 +0100 + +xfce-mcs-manager (4.2.3-2) unstable; urgency=low + + * Fix for X11R7; remove xlibs-static-*. + + -- Simon Huggins Mon, 17 Apr 2006 18:13:39 +0100 + +xfce-mcs-manager (4.2.3-1) unstable; urgency=low + + * New Upstream Release + * Don't use Source-Version for a dependency on a package we build elsewhere. + + -- Yves-Alexis Perez Sun, 06 Nov 2005 22:01:12 +0100 + +xfce-mcs-manager (4.2.2-1) unstable; urgency=low + + * New Upstream Release + * Ensure -dev deps are bound tightly + * Change suite to unstable + + -- Simon Huggins Sat, 18 Jun 2005 09:44:48 +0100 + +xfce-mcs-manager (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 Sat, 19 Mar 2005 13:02:00 +0100 + +xfce-mcs-manager (4.2.0-2) experimental; urgency=low + + * Add --enable-final to configure. + * Add a Homepage: to the description. + * Install a menu and xpm. + + -- Simon Huggins Sun, 16 Jan 2005 16:41:05 +0000 + +xfce-mcs-manager (4.2.0-1) experimental; urgency=low + + * New Upstream Release + + -- Simon Huggins Sat, 15 Jan 2005 11:28:25 +0000 + +xfce-mcs-manager (4.1.99.1-1) experimental; urgency=low + + * ML: New Upstream Release (4.1.99.1 alias XFce4 4.2 RC1) + * ML: xfce4-mcs-manager.install: Updates for new version + + -- Martin Loschwitz Fri, 19 Nov 2004 17:04:00 +0100 + +xfce-mcs-manager (4.0.6-1) unstable; urgency=high + + * urgency high to avoid previous buildd mess; there are 2 more upload stages + (see http://wiki.earth.li/XfceDebian) + * New upstream release + * Remove Norbert Tretkowski from Uploaders as requested + + -- Simon Huggins Thu, 15 Jul 2004 17:46:01 +0100 + +xfce-mcs-manager (4.0.5-1) unstable; urgency=high + + * urgency high to avoid previous buildd mess; there are 2 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 + * Fix manpages path to be /usr/share/xfce4 not /usr/share/doc/xfce4 + * Update xlibs-pic dependency to be xlibs-static-pic + * Remove odd dependency on xfwm4 + * Reorder clean target in debian/rules so it removes config.status after + distclean otherwise distclean won't. + + -- Simon Huggins Wed, 21 Apr 2004 20:28:26 +0100 + +xfce-mcs-manager (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 Tue, 09 Mar 2004 13:37:49 +0000 + +xfce-mcs-manager (4.0.3-1) unstable; urgency=low + + * New Upstream release + * Remove debian/tmp-install in the clean target of debian/rules + * Add Daniel Silverstone to Uploaders as approved by + madkiss + * Add manpages for xfce-setting-show and xfce-mcs-manager + * Remove .la and .a files from non-library packages + * Thanks to Daniel for checking and uploading these packages + + -- Simon Huggins Wed, 25 Feb 2004 09:38:49 +0000 + +xfce-mcs-manager (4.0.2-1) unstable; urgency=low + + * New Upstream release + + -- Martin Loschwitz Fri, 26 Dec 2003 15:59:00 +0100 + +xfce-mcs-manager (4.0.0.final-1) unstable; urgency=low + + * New Upstream release. + * New Co-Maintainer: Norbert Tretkowski. + * Various cleanups in debian/ subdirectory. + * Added xlibs-pics to Build-Depends. + * Bumped Standards-Version to 3.6.1 (no changes). + + -- Martin Loschwitz Tue, 29 Sep 2003 16:46:00 +0200 + +xfce-mcs-manager (4.0.0+cvs.20030421-1) unstable; urgency=low + + * New CVS checkout (2003-04-21) + + -- Martin Loschwitz Mon, 21 Apr 2003 19:20:00 +0200 + +xfce-mcs-manager (4.0.0+cvs.20030301-3) unstable; urgency=low + + * Fix Depends: for libxfce4mcs-0-dev + + -- Martin Loschwitz Tue, 06 Mar 2003 20:54:00 +0100 + +xfce-mcs-manager (4.0.0+cvs.20030301-2) unstable; urgency=low + + * Added Dependency for libxfce4mcs-0-dev (Closes: #183681) + + -- Martin Loschwitz Tue, 06 Mar 2003 19:57:00 +0100 + +xfce-mcs-manager (4.0.0+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 Sat, 01 Mar 2003 10:31:00 +0100 + +xfce-mcs-manager (4.0.0+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 Sun, 16 Jan 2003 09:43:00 +0100 + +xfce-mcs-manager (4.0.0+cvs.20030119-1) unstable; urgency=low + + * Initial Release. + + -- Martin Loschwitz Sun, 19 Jan 2003 12:30:54 +0100 --- xfce-mcs-manager-4.4.2.orig/debian/xfce4-mcs-manager.xpm +++ xfce-mcs-manager-4.4.2/debian/xfce4-mcs-manager.xpm @@ -0,0 +1,321 @@ +/* XPM */ +static char * xfce4_mcs_manager_xpm[] = { +"32 32 286 2", +" c None", +". c #010101", +"+ c #0D0D0D", +"@ c #565554", +"# c #646464", +"$ c #2C2B2B", +"% c #0A0909", +"& c #030303", +"* c #151414", +"= c #7E7E7E", +"- c #DFDEDE", +"; c #F2F2F2", +"> c #F7F6F6", +", c #F6F6F6", +"' c #AAAAAA", +") c #070603", +"! c #191818", +"~ c #8B8A8A", +"{ c #EAEAEA", +"] c #FBFAFA", +"^ c #E6E5E5", +"/ c #61605E", +"( c #151515", +"_ c #0A0805", +": c #8F8F8F", +"< c #EDECEC", +"[ c #F2F1F1", +"} c #F4F4F4", +"| c #FBFBFB", +"1 c #E5E5E5", +"2 c #4A4949", +"3 c #1B1A1A", +"4 c #3C3B3B", +"5 c #E9E8E8", +"6 c #F1F0F0", +"7 c #FAFAFA", +"8 c #605F5F", +"9 c #1E1D1D", +"0 c #050505", +"a c #9B9B9B", +"b c #FAF9F9", +"c c #FDFCFC", +"d c #BDBDBD", +"e c #282726", +"f c #131313", +"g c #B4B4B4", +"h c #F7F7F7", +"i c #CBCACA", +"j c #2D2C2B", +"k c #050502", +"l c #0C0B0B", +"m c #ADADAD", +"n c #F9F8F8", +"o c #F8F7F7", +"p c #DEDDDD", +"q c #413F3E", +"r c #595856", +"s c #979696", +"t c #080707", +"u c #040404", +"v c #868585", +"w c #F5F4F4", +"x c #E7E6E6", +"y c #494847", +"z c #414141", +"A c #C8C7C7", +"B c #2E2D2C", +"C c #242323", +"D c #F3F3F3", +"E c #F0EFEF", +"F c #EBEAEA", +"G c #999898", +"H c #4F4F4F", +"I c #444341", +"J c #343333", +"K c #202020", +"L c #5C5C5C", +"M c #BEBEBE", +"N c #C7C7C7", +"O c #C4C4C4", +"P c #565555", +"Q c #E8E7E7", +"R c #E2E1E1", +"S c #DDDCDC", +"T c #CECDCD", +"U c #BAB9B9", +"V c #A9A8A8", +"W c #BFBFBF", +"X c #CAC9C9", +"Y c #C0C0C0", +"Z c #494848", +"` c #070605", +" . c #141310", +".. c #D4D3D3", +"+. c #F1F1F1", +"@. c #ECEBEB", +"#. c #E2E2E2", +"$. c #DBDADA", +"%. c #D6D5D5", +"&. c #D2D1D1", +"*. c #CCCCCC", +"=. c #C9C8C8", +"-. c #C0BFBF", +";. c #AEADAD", +">. c #111111", +",. c #130D01", +"'. c #858484", +"). c #EFEFEF", +"!. c #EEEDED", +"~. c #E4E3E3", +"{. c #E0DFDF", +"]. c #DCDBDB", +"^. c #C6C6C6", +"/. c #B7B6B6", +"(. c #595858", +"_. c #101010", +":. c #362808", +"<. c #916D1A", +"[. c #69614C", +"}. c #D7D6D6", +"|. c #E5E4E4", +"1. c #E1E0E0", +"2. c #D3D2D2", +"3. c #CDCDCD", +"4. c #C9C9C9", +"5. c #C7C6C6", +"6. c #5E5E5E", +"7. c #212121", +"8. c #0E0E0E", +"9. c #271C03", +"0. c #B3871F", +"a. c #DBAB35", +"b. c #B39748", +"c. c #7A7563", +"d. c #A6A6A6", +"e. c #CFCFCF", +"f. c #C1C0C0", +"g. c #B1B0B0", +"h. c #5C5B5B", +"i. c #292929", +"j. c #3B2C09", +"k. c #B38721", +"l. c #DCAF3D", +"m. c #E3BF58", +"n. c #E8CB6E", +"o. c #D2AD49", +"p. c #746C57", +"q. c #B8B7B6", +"r. c #53524F", +"s. c #2F2E2D", +"t. c #2A2929", +"u. c #232323", +"v. c #595958", +"w. c #797978", +"x. c #80807F", +"y. c #656565", +"z. c #292828", +"A. c #121212", +"B. c #2D2004", +"C. c #B68A22", +"D. c #DBAC37", +"E. c #E3C059", +"F. c #E9CC6F", +"G. c #E3BE57", +"H. c #DDB03E", +"I. c #AB8323", +"J. c #4D422A", +"K. c #1C1C1C", +"L. c #141414", +"M. c #181818", +"N. c #313130", +"O. c #3B3938", +"P. c #323232", +"Q. c #262525", +"R. c #423109", +"S. c #B88B21", +"T. c #DCB03E", +"U. c #E4C15D", +"V. c #E8CA6D", +"W. c #E2BC54", +"X. c #D6A022", +"Y. c #C99011", +"Z. c #6F510D", +"`. c #342506", +" + c #B98D23", +".+ c #DCAE3B", +"++ c #E5C360", +"@+ c #E8CC70", +"#+ c #E1BB51", +"$+ c #DCAE3A", +"%+ c #D29713", +"&+ c #7F5E11", +"*+ c #181205", +"=+ c #4B380C", +"-+ c #BC9026", +";+ c #DEB445", +">+ c #E6C563", +",+ c #E9CB6F", +"'+ c #E1B94E", +")+ c #DAAA33", +"!+ c #D49E20", +"~+ c #C99112", +"{+ c #7E5D11", +"]+ c #0A0803", +"^+ c #362707", +"/+ c #BD9127", +"(+ c #DDB140", +"_+ c #E6C664", +":+ c #E1BA50", +"<+ c #DBAB36", +"[+ c #D29813", +"}+ c #7B5C13", +"|+ c #171206", +"1+ c #4E3A0C", +"2+ c #BF9329", +"3+ c #E0B74A", +"4+ c #E7C766", +"5+ c #E8C869", +"6+ c #E0B74B", +"7+ c #D9A830", +"8+ c #D49C1B", +"9+ c #C89011", +"0+ c #7A5B13", +"a+ c #0A0905", +"b+ c #060401", +"c+ c #382908", +"d+ c #C19429", +"e+ c #DEB343", +"f+ c #E7C869", +"g+ c #E8CA6B", +"h+ c #E0B649", +"i+ c #DAA932", +"j+ c #D29712", +"k+ c #785A13", +"l+ c #181307", +"m+ c #533E0E", +"n+ c #C2972C", +"o+ c #E7C868", +"p+ c #DFB648", +"q+ c #D8A52B", +"r+ c #C89013", +"s+ c #755813", +"t+ c #3C2D09", +"u+ c #C4992E", +"v+ c #DFB649", +"w+ c #E8C96A", +"x+ c #DEB344", +"y+ c #D9A72F", +"z+ c #D39A17", +"A+ c #D39815", +"B+ c #725614", +"C+ c #161107", +"D+ c #785E1F", +"E+ c #E1BC52", +"F+ c #E5C461", +"G+ c #DDB242", +"H+ c #D7A328", +"I+ c #C79014", +"J+ c #725715", +"K+ c #42330E", +"L+ c #E9CB6E", +"M+ c #E6C462", +"N+ c #DEB241", +"O+ c #D8A62C", +"P+ c #D29916", +"Q+ c #D29A18", +"R+ c #6F5515", +"S+ c #161207", +"T+ c #110F09", +"U+ c #CBAC52", +"V+ c #DDB13F", +"W+ c #D7A327", +"X+ c #D39916", +"Y+ c #C69118", +"Z+ c #6E5415", +"`+ c #151413", +" @ c #483A17", +".@ c #96731E", +"+@ c #CA9214", +"@@ c #6A5217", +"#@ c #151107", +"$@ c #282623", +"%@ c #232118", +"&@ c #241E10", +"*@ c #0B0B0B", +"=@ c #070707", +" ", +" . + @ # $ % ", +" & * = - ; > , ' ) & ", +" ! ~ { ; > ] ^ / ( & ", +" _ : < [ } | 1 2 3 ", +" 4 5 6 } 7 1 8 9 % ", +" 0 a [ } b c d e ", +" f g } h c b i j . k ", +" l m n c ] o p q . r s t ", +" u v b | > w x y . . z d A B ", +" C c n D E F G H I J K L M N O P ", +" . Q } E < 5 R S T U V W X O Y Z ` ", +" & ...+.@.Q #.S $.%.&.*.=.O -.;.>. ", +" ,. .'.).!.Q ~.{.].%...*.=.^.Y /.(._. ", +" :.<.[.}.< 5 |.1.$.%.2.3.4.5.-./.6.7.8. ", +" 9.0.a.b.c.~.^ 2.a d.=.e.X 5.f.g.h.i.( ", +" j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.$ z.A. ", +" B.C.D.E.F.G.H.I.J.s.K.L.M.s.N.O.P.Q.8. ", +" R.S.T.U.V.W.D.X.Y.Z.k . . . ", +" `. +.+++@+#+$+X.%+&+*+. ", +" =+-+;+>+,+'+)+!+~+{+]+. ", +" ^+/+(+_+F.:+<+!+[+}+|+. . ", +" 1+2+3+4+5+6+7+8+9+0+a+. ", +" b+c+d+e+f+g+h+i+8+j+k+l+. . ", +" b+m+n+'+o+4+p+q+8+r+s+a+. ", +" t+u+v+w+o+x+y+z+A+B+C+. . ", +" D+E+g+F+G+H+z+I+J+a+. ", +" K+L+M+N+O+P+Q+R+S+. ", +" T+U+V+W+X+Y+Z+a+. ", +" `+ @.@+@Q+@@#@. ", +" 7.$@%@&@a+. ", +" *@L._.=@. "}; --- xfce-mcs-manager-4.4.2.orig/debian/xfce4-mcs-manager.menu +++ xfce-mcs-manager-4.4.2/debian/xfce4-mcs-manager.menu @@ -0,0 +1,7 @@ +?package(xfce4-mcs-manager): needs="X11"\ + section="Applications/System/Administration"\ + command="xfce-setting-show"\ + title="Xfce-setting-show"\ + longtitle="Configure The Xfce Desktop"\ + hints="Desktop settings"\ + icon="/usr/share/pixmaps/xfce4-mcs-manager.xpm" --- xfce-mcs-manager-4.4.2.orig/debian/control +++ xfce-mcs-manager-4.4.2/debian/control @@ -0,0 +1,32 @@ +Source: xfce-mcs-manager +Section: x11 +Priority: optional +Maintainer: Debian Xfce Maintainers +Uploaders: Martin Loschwitz , Emanuele Rocca , Simon Huggins , Yves-Alexis Perez +Build-Depends: debhelper (>= 4.1.25), libgtk2.0-dev, libxfce4mcs-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2), libxft-dev, chrpath +Standards-Version: 3.7.2 +Homepage: http://www.xfce.org/ +Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce-mcs-manager/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce-mcs-manager/ + +Package: xfce4-mcs-manager +Architecture: any +Depends: ${shlibs:Depends}, hicolor-icon-theme (>= 0.8) +Recommends: xfce4-mcs-plugins, xfce4-icon-theme +Description: Settings manager for Xfce4 + This package contains xfce-mcs-manager, a tool that can be + used to configure your Xfce4 desktop to meet your needs. + Additionally, it contains xfce-setting-show which can give + you a short and quick overview over your settings. If you + intend to install Xfce4, you most probably want this package. + +Package: xfce4-mcs-manager-dev +Architecture: any +Section: devel +Depends: libxfce4mcs-dev (>= 4.4.2), libxfcegui4-dev (>= 4.4.2) +Description: Development files and static plugins + This package contains the header-files and the static versions + of the plugins for xfce-mcs-manager which is a configuration + GUI for Xfce4 desktop environment. If you intend to develop + applications which use the xfce-mcs-manager, you will have to + install this package. --- xfce-mcs-manager-4.4.2.orig/debian/patches/01_xfce-mcs-manager_reload.dpatch +++ xfce-mcs-manager-4.4.2/debian/patches/01_xfce-mcs-manager_reload.dpatch @@ -0,0 +1,513 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_xfce-mcs-manager_reload.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to fix refreshing in xfce-mcs-manager + +@DPATCH@ +diff -urNad xfce-mcs-manager-4.3.90.1~/xfce-mcs-manager/xfce-mcs-manager.c xfce-mcs-manager-4.3.90.1/xfce-mcs-manager/xfce-mcs-manager.c +--- xfce-mcs-manager-4.3.90.1~/xfce-mcs-manager/xfce-mcs-manager.c 2006-04-16 16:52:26.000000000 +0200 ++++ xfce-mcs-manager-4.3.90.1/xfce-mcs-manager/xfce-mcs-manager.c 2006-05-14 15:31:39.000000000 +0200 +@@ -75,6 +75,7 @@ + #define SOEXT ("." G_MODULE_SUFFIX) + #define SOEXT_LEN (strlen (SOEXT)) + ++static gchar **rargv = NULL; + static GSList *plugin_list = NULL; + static GSList *module_list = NULL; + +@@ -332,11 +333,9 @@ + { + if (sigstate == RESTART) + { +- sigstate = NOSIGNAL; +- +- unload_plugins (); +- +- plugin_load_all (); ++ /* just run the MCS manager from scratch */ ++ execvp (rargv[0], rargv); ++ _exit (EXIT_SUCCESS); + } + else if (sigstate == QUIT) + { +@@ -358,6 +357,9 @@ + gboolean std_mgr; + int i; + ++ /* save argv for restart */ ++ rargv = g_strdupv (argv); ++ + daemon_mode = TRUE; + std_mgr = TRUE; + +diff -urNad xfce-mcs-manager-4.3.90.1~/xfce-mcs-manager/xfce-mcs-manager.c.orig xfce-mcs-manager-4.3.90.1/xfce-mcs-manager/xfce-mcs-manager.c.orig +--- xfce-mcs-manager-4.3.90.1~/xfce-mcs-manager/xfce-mcs-manager.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ xfce-mcs-manager-4.3.90.1/xfce-mcs-manager/xfce-mcs-manager.c.orig 2006-04-16 16:52:26.000000000 +0200 +@@ -0,0 +1,466 @@ ++/* $Id: xfce-mcs-manager.c 20981 2006-04-16 09:00:43Z benny $ */ ++/*- ++ * Copyright (c) 2002-2004 Olivier Fourdan ++ * Copyright (c) 2003-2004 Benedikt Meurer ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library 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 ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, ++ * Boston, MA 02111-1307, USA. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#ifdef HAVE_SYS_TIME_H ++#include ++#endif ++#ifdef HAVE_SYS_TYPES_H ++#include ++#endif ++#ifdef HAVE_SYS_WAIT_H ++#include ++#endif ++ ++#ifdef HAVE_ERRNO_H ++#include ++#endif ++#ifdef HAVE_FCNTL_H ++#include ++#endif ++#ifdef HAVE_MEMORY_H ++#include ++#endif ++#ifdef HAVE_SIGNAL_H ++#include ++#endif ++#include ++#ifdef HAVE_STDLIB_H ++#include ++#endif ++#ifdef HAVE_STRING_H ++#include ++#endif ++#ifdef HAVE_UNISTD_H ++#include ++#endif ++ ++#ifdef ENABLE_LOADPROF ++#include ++#endif ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++#define SOEXT ("." G_MODULE_SUFFIX) ++#define SOEXT_LEN (strlen (SOEXT)) ++ ++static GSList *plugin_list = NULL; ++static GSList *module_list = NULL; ++ ++static McsManager *manager; ++ ++static enum ++{ ++ NOSIGNAL, ++ RESTART, ++ QUIT, ++ NUM_SIGNALS ++} sigstate = NOSIGNAL; ++ ++G_MODULE_EXPORT gchar * mcs_plugin_check_version (gint version) ++{ ++ if (XFCE_MCS_PLUGIN_VERSION == version) ++ return NULL; ++ ++ return _("Incorrect module version"); ++} ++ ++static gint ++compare_plugins (gconstpointer plugin_a, gconstpointer plugin_b) ++{ ++ return strcmp (((const McsPlugin *) plugin_a)->plugin_name, ((const McsPlugin *) plugin_b)->plugin_name); ++} ++ ++static gint ++lookup_plugins (gconstpointer plugin, gconstpointer name) ++{ ++ return strcmp (((const McsPlugin *) plugin)->plugin_name, name); ++} ++ ++static void ++load_plugin (gchar * path) ++{ ++ McsPluginInitResult (*init) (McsPlugin *); ++ McsPlugin *plugin; ++ GModule *module; ++ ++#ifdef DEBUG ++ g_message ("- attempting to load module %s", path); ++#endif ++ ++ if ((module = g_module_open (path, 0)) == NULL) ++ { ++ g_warning ("Module %s cannot be opened (%s)", path, g_module_error ()); ++ return; ++ } ++ ++ if (g_module_symbol (module, "mcs_plugin_init", (gpointer) & init)) ++ { ++ plugin = g_new0 (McsPlugin, 1); ++ plugin->manager = manager; ++ ++ if (init (plugin) != MCS_PLUGIN_INIT_OK) ++ { ++ if (plugin->plugin_name != NULL) ++ g_free (plugin->plugin_name); ++ if (plugin->icon != NULL) ++ g_object_unref (plugin->icon); ++ if (plugin->caption != NULL) ++ g_free (plugin->caption); ++ g_free (plugin); ++ g_module_close (module); ++ return; ++ } ++ ++ if (g_slist_find_custom (plugin_list, plugin, compare_plugins)) ++ { ++ g_warning (" module %s (\"%s\") has already been loaded before", path, plugin->plugin_name); ++ ++ if (plugin->plugin_name != NULL) ++ g_free (plugin->plugin_name); ++ if (plugin->icon != NULL) ++ g_object_unref (plugin->icon); ++ if (plugin->caption != NULL) ++ g_free (plugin->caption); ++ g_module_close (module); ++ g_free (plugin); ++ } ++ else ++ { ++#ifdef DEBUG ++ g_message (" module %s (\"%s\") successfully loaded", path, plugin->plugin_name); ++#endif ++ plugin_list = g_slist_append (plugin_list, plugin); ++ module_list = g_slist_append (module_list, module); ++ } ++ } ++ else ++ { ++ g_warning (" incompatible module %s", path); ++ g_module_close (module); ++ } ++} ++ ++#ifdef ENABLE_LOADPROF ++static void ++compute_delta_t (struct timeval *start, struct timeval *stop, struct timeval *delta) ++{ ++ delta->tv_sec = stop->tv_sec - start->tv_sec; ++ delta->tv_usec = stop->tv_usec - start->tv_usec; ++ ++ if (delta->tv_usec >= 1000000) ++ { ++ delta->tv_sec += 1; ++ delta->tv_usec -= 1000000; ++ } ++ ++ if (delta->tv_usec < 0) ++ { ++ delta->tv_sec -= 1; ++ delta->tv_usec += 1000000; ++ } ++} ++#endif ++ ++static void ++plugins_load_dir (const gchar * dir) ++{ ++ const gchar *f; ++ gchar *plugin; ++ GDir *d; ++ ++ d = g_dir_open (dir, 0, NULL); ++ if (d != NULL) ++ { ++#ifdef ENABLE_LOADPROF ++ struct timeval t0; ++ ++ gettimeofday (&t0, NULL); ++#endif ++ while ((f = g_dir_read_name (d)) != NULL) ++ { ++ if (g_str_has_suffix (f, SOEXT)) ++ { ++#ifdef ENABLE_LOADPROF ++ struct timeval t1; ++ struct timeval delta_t; ++#endif ++ ++ plugin = g_build_filename (dir, f, NULL); ++ load_plugin (plugin); ++#ifdef ENABLE_LOADPROF ++ gettimeofday (&t1, NULL); ++ ++ compute_delta_t (&t0, &t1, &delta_t); ++ g_print ("Started %s in %u.%06u sec.\n", plugin, delta_t.tv_sec, delta_t.tv_usec); ++ ++ t0.tv_sec = t1.tv_sec; ++ t0.tv_usec = t1.tv_usec; ++#endif ++ g_free (plugin); ++ } ++ } ++ ++ g_dir_close (d); ++ } ++} ++ ++static void ++plugin_load_all (void) ++{ ++#ifdef DEBUG ++ g_message ("Loading mcs plugins"); ++#endif ++ ++ /* load system plugins */ ++ plugins_load_dir (PLUGINSDIR); ++} ++ ++static void ++unload_plugins (void) ++{ ++#ifdef DEBUG ++ g_message ("Unloading mcs plugins"); ++#endif ++ ++ /* ++ * NOTE: Grabbing the X-Server while reloading the ++ * plugins will not work (Don't know why) ++ */ ++ g_slist_foreach (module_list, (GFunc) g_module_close, NULL); ++ g_slist_free (module_list); ++ module_list = NULL; ++ ++ g_slist_foreach (plugin_list, (GFunc) g_free, NULL); ++ g_slist_free (plugin_list); ++ plugin_list = NULL; ++} ++ ++static void ++terminate_cb (void *data) ++{ ++#ifdef DEBUG ++ g_print ("Releasing the selection and exitingn"); ++#endif ++ ++ *(gboolean *) data = TRUE; ++ gtk_main_quit (); ++} ++ ++static void ++show_cb (char *name, void *cb_data) ++{ ++ GSList *plugin_search; ++ McsPlugin *plugin; ++ ++ if (strcmp ("", name) == 0 || g_ascii_strcasecmp ("all", name) == 0) ++ { ++ run_manager_dialog (plugin_list); ++ return; ++ } ++ ++ plugin_search = g_slist_find_custom (plugin_list, name, lookup_plugins); ++ ++ if (plugin_search != NULL) ++ { ++ plugin = (McsPlugin *) plugin_search->data; ++ plugin->run_dialog (plugin); ++ } ++ else ++ { ++ xfce_err (_("Xfce Settings Manager error:\nNo such plugin \"%s\""), name); ++ run_manager_dialog (plugin_list); ++ } ++} ++ ++static GdkFilterReturn ++manager_event_filter (GdkXEvent * xevent, GdkEvent * event, gpointer data) ++{ ++ if (mcs_manager_process_event (manager, (XEvent *) xevent)) ++ return GDK_FILTER_REMOVE; ++ else ++ return GDK_FILTER_CONTINUE; ++} ++ ++static void ++sighandler (int signo) ++{ ++ switch (signo) ++ { ++ case SIGUSR1: ++ sigstate = RESTART; ++ break; ++ ++ default: ++ sigstate = QUIT; ++ } ++} ++ ++static gboolean ++check_signal_state (void) ++{ ++ if (sigstate == RESTART) ++ { ++ sigstate = NOSIGNAL; ++ ++ unload_plugins (); ++ ++ plugin_load_all (); ++ } ++ else if (sigstate == QUIT) ++ { ++ gtk_main_quit (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++int ++main (int argc, char **argv) ++{ ++#ifdef HAVE_SIGACTION ++ struct sigaction act; ++#endif ++ McsManagerCheck status; ++ gboolean daemon_mode; ++ gboolean std_mgr; ++ int i; ++ ++ daemon_mode = TRUE; ++ std_mgr = TRUE; ++ ++ xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); ++ ++ gtk_init (&argc, &argv); ++ ++ /* Fake a SM client ID, so smproxy does not catch us */ ++ gdk_set_sm_client_id ("FAKED CLIENTID"); ++ ++ for (i = 1; i < argc; i++) ++ if (strcmp (argv[i], "--no-daemon-debug") == 0) ++ daemon_mode = FALSE; ++ ++ status = mcs_manager_check_running (gdk_display, DefaultScreen (gdk_display)); ++ ++ switch (status) ++ { ++ case MCS_MANAGER_MULTI_CHANNEL: ++ case MCS_MANAGER_BOTH: ++ g_warning ("Multi channel MCS manager already detected for screen %i", DefaultScreen (gdk_display)); ++ return EXIT_FAILURE; ++ ++ case MCS_MANAGER_STD: ++ g_message ("Standard XSETTINGS manager already detected for screen %i", DefaultScreen (gdk_display)); ++ std_mgr = FALSE; ++ ++ default: ++ break; ++ } ++ ++ manager = mcs_manager_new (std_mgr, gdk_display, DefaultScreen (gdk_display), terminate_cb, show_cb, NULL); ++ if (manager == NULL) ++ { ++ g_warning ("Could not create manager!"); ++ return EXIT_FAILURE; ++ } ++ ++ gdk_window_add_filter (NULL, manager_event_filter, NULL); ++ ++ plugin_load_all (); ++ gdk_flush (); ++ ++#ifdef HAVE_SIGACTION ++ act.sa_handler = sighandler; ++#ifdef SA_RESTART ++ act.sa_flags = SA_RESTART; ++#else ++ act.sa_flags = 0; ++#endif ++ sigaction (SIGTERM, &act, NULL); ++ sigaction (SIGHUP, &act, NULL); ++ sigaction (SIGINT, &act, NULL); ++ sigaction (SIGUSR1, &act, NULL); ++#else /* !HAVE_SIGACTION */ ++ signal (SIGTERM, sighandler); ++ signal (SIGHUP, sighandler); ++ signal (SIGINT, sighandler); ++ signal (SIGUSR1, sighandler); ++#endif ++ ++ if (daemon_mode) ++ { ++#ifdef HAVE_DAEMON ++ if (daemon (TRUE, TRUE) < 0) ++ { ++ g_warning ("Failed to switch to daemon mode: %s", g_strerror (errno)); ++ return (EXIT_FAILURE); ++ } ++#else /* !HAVE_DAEMON */ ++ switch (fork ()) ++ { ++ case -1: ++ g_warning ("fork() failed"); ++ return (EXIT_FAILURE); ++ ++ case 0: ++#ifdef HAVE_SETSID ++ /* detach from session */ ++ if (setsid () < 0) ++ { ++ g_warning ("Failed to detach from terminal " "session: %s", g_strerror (errno)); ++ } ++#endif /* !HAVE_SETSID */ ++ break; ++ ++ default: ++ /* parent */ ++ _exit (EXIT_SUCCESS); ++ } ++#endif /* !HAVE_DAEMON */ ++ } ++ else ++ g_message ("Daemon mode disabled (for debug purpose only!)"); ++ ++ /* Establish signal-check timer */ ++ g_timeout_add (500, (GSourceFunc) check_signal_state, NULL); ++ ++ gtk_main (); ++ ++ unload_plugins (); ++ ++ mcs_manager_destroy (manager); ++ ++ return EXIT_SUCCESS; ++} --- xfce-mcs-manager-4.4.2.orig/debian/watch +++ xfce-mcs-manager-4.4.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.xfce.org/archive/xfce-(.*)/src/ \ + xfce-mcs-manager-(.*)\.tar\.bz2 --- xfce-mcs-manager-4.4.2.orig/config.guess +++ xfce-mcs-manager-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 - #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 --- xfce-mcs-manager-4.4.2.orig/config.sub +++ xfce-mcs-manager-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*)