--- xfce4-panel-4.4.2.orig/debian/xfce4-panel.install +++ xfce4-panel-4.4.2/debian/xfce4-panel.install @@ -0,0 +1,10 @@ +usr/bin/ +usr/lib/lib*.so.* +usr/lib/xfce4/ +etc/ +usr/share/applications/ +usr/share/icons/hicolor/ +usr/share/lintian +usr/share/locale/ +usr/share/xfce4/ +usr/share/man/ --- xfce4-panel-4.4.2.orig/debian/compat +++ xfce4-panel-4.4.2/debian/compat @@ -0,0 +1 @@ +4 --- xfce4-panel-4.4.2.orig/debian/xfce4-panel.shlibs +++ xfce4-panel-4.4.2/debian/xfce4-panel.shlibs @@ -0,0 +1 @@ +libxfce4panel 1 xfce4-panel (>= 4.4.2) --- xfce4-panel-4.4.2.orig/debian/copyright +++ xfce4-panel-4.4.2/debian/copyright @@ -0,0 +1,43 @@ +This package was debianized by Martin Loschwitz on +Sat, 19 Jul 2003 20:52:09 +0200. + +You can fetch xfce4-panel from the official Xfce4 website which is +http://www.xfce.org/ + +Upstream author are: +Jasper Huijsmans +Nick Schermer +clock plugin is written by Jasper Huijsmans and Jannis Pohlmann + +Copyrights: +xfce4-panel is (c) 2002-2007 The Xfce development team +dz and gl traduction are (c) 2006 Canonical Ltd, and Rosetta Contributors +windowlist plugin is: + Copyright (c) 2003 Andre Lerche + Copyright (c) 2003 Benedikt Meurer + Copyright (c) 2006 Jani Monoses + Copyright (c) 2006 Jasper Huijsmans + Copyright (c) 2006 Nick Schermer +action buttons,iconbox, launcher, pager, separator, systray, tasklist plugins + are Copyright (c) 2005 Jasper Huijsmans +showdesktop plugin is: + Copyright (c) 2005 Jasper Huijsmans + Copyright (c) 2006 Jani Monoses + +License: + + 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 systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. --- xfce4-panel-4.4.2.orig/debian/xfce4-panel.prerm +++ xfce4-panel-4.4.2/debian/xfce4-panel.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-panel-4.4.2.orig/debian/xfce4-panel.1 +++ xfce4-panel-4.4.2/debian/xfce4-panel.1 @@ -0,0 +1,18 @@ +.\" Copyright (C) 2004 Simon Huggins +.TH XFCE4-PANEL "1" "February 2004" "xfce4-panel 0.1" "User Commands" +.SH NAME +xfce4-panel \- XFce 4 Panel +.SH SYNOPSIS +.B xfce4-panel +.SH DESCRIPTION +.PP +Starts the XFce 4 panel. +.SH SEE ALSO +Upstream documentation in /usr/share/xfce4/doc/C/xfce4-panel.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. --- xfce4-panel-4.4.2.orig/debian/xfce4-panel.postinst +++ xfce4-panel-4.4.2/debian/xfce4-panel.postinst @@ -0,0 +1,14 @@ +#!/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 + + + # Run ldconfig to update shared library system + ldconfig +fi + +#DEBHELPER# + +exit 0 --- xfce4-panel-4.4.2.orig/debian/lintian +++ xfce4-panel-4.4.2/debian/lintian @@ -0,0 +1,2 @@ +#Panel includes its library +xfce4-panel: package-name-doesnt-match-sonames libxfce4panel1 --- xfce4-panel-4.4.2.orig/debian/rules +++ xfce4-panel-4.4.2/debian/rules @@ -0,0 +1,111 @@ +#!/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 + +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 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-final --libexecdir=\$${prefix}/lib + +build: build-stamp +build-stamp: config.status + + dh_testdir + $(MAKE) + touch build-stamp + +clean: unpatch + + dh_testdir + dh_testroot + rm -f build-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + dh_clean + +install: build + + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=`pwd`/debian/tmp + + install -d `pwd`/debian/tmp/usr/share/man/man1 + install `pwd`/debian/xfce4-panel.1 `pwd`/debian/tmp/usr/share/man/man1 + + perl -i -pe 's/Exec=Terminal/Exec=exo-open --launch TerminalEmulator/; s/Exec=mousepad/Exec=sensible-editor/' `pwd`/debian/tmp/etc/xdg/xfce4/panel/launcher* + + rm -f `pwd`/debian/tmp/usr/lib/xfce4/panel-plugins/*.la + rm -f `pwd`/debian/tmp/usr/lib/xfce4/panel-plugins/*.a + rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la + rm -f `pwd`/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a + rm -f `pwd`/debian/tmp/usr/lib/libxfce4panel.la + + install -D -p -o root -g root -m 644 `pwd`/debian/lintian \ + $(CURDIR)/debian/tmp/usr/share/lintian/overrides/xfce4-panel + + #we don't need no empty files in our packages ! + rm -f $(CURDIR)/debian/tmp/usr/bin/xftaskbar4 + rm -f $(CURDIR)/debian/tmp/usr/bin/xfce4-iconbox + + chrpath -d -k `pwd`/debian/tmp/usr/bin/xfce4-panel \ + `pwd`/debian/tmp/usr/bin/xfce4-popup-windowlist \ + `pwd`/debian/tmp/usr/lib/xfce4/*/* \ + `pwd`/debian/tmp/usr/lib/libxfce4panel.so.*1 + +binary-indep: build install +binary-arch: build install + + dh_testdir + dh_testroot + + dh_install --list-missing --sourcedir=debian/tmp + + dh_installchangelogs ChangeLog + dh_installdocs NEWS README README.Kiosk README.Plugins + + dh_strip + dh_compress + + dh_fixperms + dh_installdeb + + dh_shlibdeps + dh_gencontrol + + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- xfce4-panel-4.4.2.orig/debian/xfce4-panel-dev.install +++ xfce4-panel-4.4.2/debian/xfce4-panel-dev.install @@ -0,0 +1,4 @@ +usr/include/ +usr/lib/pkgconfig/ +usr/lib/lib*.so +usr/share/gtk-doc/ --- xfce4-panel-4.4.2.orig/debian/changelog +++ xfce4-panel-4.4.2/debian/changelog @@ -0,0 +1,286 @@ +xfce4-panel (4.4.2-1~bpo40+1) etch-backports; urgency=low + + * rebuild for etch-backports. + + -- Yves-Alexis Perez Fri, 21 Dec 2007 00:19:40 +0100 + +xfce4-panel (4.4.2-1) unstable; urgency=low + + [ Simon Huggins ] + * debian/control: Move fake Homepage field to a real one now dpkg + supports it. + + [ Yves-Alexis Perez ] + * New upstream release. + * debian/patches: + - removed 02_fix-segfault-gtk2.11.patch, included upstream. + + [ Simon Huggins ] + * Add Vcs-* headers to debian/control + + -- Simon Huggins Tue, 27 Nov 2007 16:39:19 +0000 + +xfce4-panel (4.4.1-2) unstable; urgency=low + + [ Simon Huggins ] + * Use ${binary:Version} so we are binNMU safe. + * debian/xfce4-panel.prerm: Use kill -s to keep Hurd and lintian happy at + the same time. + + [ Yves-Alexis Perez ] + * debian/xfce4-panel.1: update bug reporting in manpage. + * debian/xfce4-panel.postinst: use posix kill -s closes: #374618 + * debian/patches: added 02_fix-segfault-gtk2.11.patch, fix segfault when + removing a panel. closes: #446536 + + [ Emanuele Rocca ] + * debian/rules: do not ignore make errors in the clean target. + + -- Yves-Alexis Perez Mon, 15 Oct 2007 22:54:48 +0200 + +xfce4-panel (4.4.1-1) unstable; urgency=low + + * New upstream release. + * debian/patch: added patch to reduce margin size of launchers. + * debian/control: added versionned build-dep against gtk 2.10. + * debian/copyright: updated copyright holders. + + -- Yves-Alexis Perez Sun, 15 Apr 2007 15:28:17 +0100 + +xfce4-panel (4.4.0-2) experimental; urgency=low + + * debian/rules: remove /usr/lib/libxfce4panel.la from the package. + * debian/xfce4-panel.install: ship xfce4-panel-manager.desktop in + /usr/share/applications. + + -- Yves-Alexis Perez Thu, 25 Jan 2007 00:50:58 +0100 + +xfce4-panel (4.4.0-1) experimental; urgency=low + + * New upstream release. + * debian/control: updated build-deps against Xfce 4.4. + + -- Yves-Alexis Perez Thu, 25 Jan 2007 00:06:03 +0100 + +xfce4-panel (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 15:18:46 +0100 + +xfce4-panel (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:40:01 +0100 + +xfce4-panel (4.3.90.2-3) unstable; urgency=low + + * Bump shlibs file too. + + -- Simon Huggins Wed, 26 Jul 2006 15:47:42 +0100 + +xfce4-panel (4.3.90.2-2) unstable; urgency=low + + * xfce4-panel should continue shipping xfce-filemanager.png as it has done + since the beginning. + * Add Replaces: on the bogus xfce4-mcs-plugins version. + + -- Yves-Alexis Perez Tue, 25 Jul 2006 07:49:17 +0200 + +xfce4-panel (4.3.90.2-1) unstable; urgency=low + + (Yves-Alexis Perez) + * New upstream release. + * debian/NEWS: fixed typo. + * debian/postinst: fixed install on hurd by not using pkill. Closes: #374618 + * debian/control: updated standard versions to 3.7.2. + (Simon Huggins) + * Add rpath fixes. + + -- Yves-Alexis Perez Fri, 21 Jul 2006 15:45:54 +0200 + +xfce4-panel (4.3.90.1-3) unstable; urgency=low + + * (Simon Huggins) + * Conflict/Replace -trigger-launcher too. + + * (Yves-Alexis Perez) + * debian/NEWS: warn users they will lose their 4.2 panel config. + + -- Yves-Alexis Perez Sat, 17 Jun 2006 12:37:27 +0100 + +xfce4-panel (4.3.90.1-2) unstable; urgency=low + + * (Simon Huggins) + * Add dependency on libexo-0.3-0 for exo-open which we use in our default + panel config. + * Ship the README.Plugins + * (Yves-Alexis Perez) + * Use the correct libexec dir + + -- Simon Huggins Sat, 13 May 2006 22:19:56 +0200 + +xfce4-panel (4.3.90.1-1) unstable; urgency=low + + * New Upstream Release + + -- Yves-Alexis Perez Wed, 03 May 2006 18:35:05 +0100 + +xfce4-panel (4.2.3-1) unstable; urgency=low + + * New Upstream Release + * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin. + + -- Yves-Alexis Perez Sun, 06 Nov 2005 22:01:12 +0100 + +xfce4-panel (4.2.2-1) unstable; urgency=low + + * New Upstream Release + * Remove Build-Depends on libstartup-notification0-dev as this should be + satisfied via libxfce4gui-dev now + * Remove Depends on debianutils, it is Essential + * Change suite to unstable + + -- Simon Huggins Sat, 18 Jun 2005 09:46:08 +0100 + +xfce4-panel (4.2.1.1-1) experimental; urgency=low + + * ML: New Upstream Release (Xfce 4.2.1.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 + +xfce4-panel (4.2.0-2) experimental; urgency=low + + * Add --enable-final to configure + * Add a Homepage: to the description + * Ship the README.Kiosk as well + + -- Simon Huggins Sun, 16 Jan 2005 15:49:21 +0000 + +xfce4-panel (4.2.0-1) experimental; urgency=low + + * New Upstream Release + * Conflict against all versions of xfce4-themes since upstream no longer + ship this. + + -- Simon Huggins Sat, 15 Jan 2005 12:55:32 +0000 + +xfce4-panel (4.1.99.1-1) experimental; urgency=low + + * ML: New Upstream Release (4.1.99.1 alias XFce4 4.2 RC1) + + -- Martin Loschwitz Fri, 19 Nov 2004 18:04:00 +0100 + +xfce4-panel (4.0.6-1) unstable; urgency=high + + * urgency high to avoid previous buildd mess; last upload stage building dev + packages required before we can upload the rest (see + http://wiki.earth.li/XfceDebian) + * New upstream release + - includes fix for non existant xfce-settings.xml closes: #254467 + * Update .no translation still not picked up upstream yet + * Change mozilla to sensible-browser (and depend on debianutils which + provides this) closes: #221835 + + -- Simon Huggins Mon, 19 Jul 2004 17:40:59 +0100 + +xfce4-panel (4.0.5-4) unstable; urgency=low + + * And extracting po/no.gmo so it builds, I also overwrote my lovingly + updated libtool stuff. + Update libtool once again. closes: #252927 + + -- Simon Huggins Tue, 08 Jun 2004 10:44:21 +0100 + +xfce4-panel (4.0.5-3) unstable; urgency=low + + * Except obviously whilst I don't mind installing the -dev package with the + old one around I do want to build against the new libxfce4gui *sigh* + Update the Build-Depends libxfce4gui dependency to the new version. + + -- Simon Huggins Fri, 28 May 2004 12:59:57 +0100 + +xfce4-panel (4.0.5-2) unstable; urgency=low + + * Change the depends in the -dev pacage to be less strict >= instead of = so + the new libxfcegui4-dev doesn't cause problems. + + -- Simon Huggins Wed, 26 May 2004 09:29:27 +0100 + +xfce4-panel (4.0.5-1) unstable; urgency=high + + * urgency high to avoid previous buildd mess; last upload stage building dev + packages required before we can upload the rest (see + http://wiki.earth.li/XfceDebian) + * New upstream release + * Update upstream's libtool + * Fix path to docs in manpage + * Add libstartup-notification support to the panel + * Typo in debian/control "wort" -> "worth" + * Update .no translation not picked up upstream yet closes: #240275 + + -- Simon Huggins Sun, 25 Apr 2004 13:13:55 +0100 + +xfce4-panel (4.0.3-3) unstable; urgency=low + + * Fix the section in the control file closes: #236669 + * 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 09:55:04 +0000 + +xfce4-panel (4.0.3-2) unstable; urgency=low + * Add libxfcegui4-dev to the Depends closes: #232803 + + -- Simon Huggins Sun, 07 Mar 2004 11:49:24 +0000 + +xfce4-panel (4.0.3-1) unstable; urgency=low + + * New upstream release + * Add Daniel Silverstone to Uploaders as approved by + madkiss + * Add xfce4-panel manpage to point at upstream documentation + * Remove .la and .a files as these are only for the plugins + * Thanks to Daniel for checking and uploading these packages + + -- Simon Huggins Wed, 25 Feb 2004 10:31:08 +0000 + +xfce4-panel (4.0.2-2.1) unstable; urgency=low + + * NMU + * Fix aclocal, add Depends: libxml2-dev to xfce4-panel-dev. Closes: #227606 + + -- LaMont Jones Tue, 17 Feb 2004 11:33:56 -0700 + +xfce4-panel (4.0.2-2) unstable; urgency=low + + * Adding Build-Dependency for libxfce4gui-dev + + -- Martin Loschwitz Tue, 06 Jan 2003 12:01:00 +0100 + +xfce4-panel (4.0.2-1) unstable; urgency=low + + * Acknowledging NMU (Closes: #215589) + * New upstream release + + -- Martin Loschwitz Fri, 26 Dec 2003 16:19:00 +0100 + +xfce4-panel (4.0.0.final-1.1) unstable; urgency=low + + * NMU + * Add xfce4-mcs-manager-dev to Build-Depends (Closes: #215589) + * libxft-dev now Provides: libxft2-dev, so Build-Depend on that + + -- Guido Guenther Thu, 20 Nov 2003 11:18:00 +0100 + +xfce4-panel (4.0.0.final-1) unstable; urgency=low + + * Initial Release. + + -- Martin Loschwitz Tue, 29 Sep 2003 17:09:09 +0200 --- xfce4-panel-4.4.2.orig/debian/control +++ xfce4-panel-4.4.2/debian/control @@ -0,0 +1,34 @@ +Source: xfce4-panel +Section: x11 +Priority: optional +Maintainer: Debian Xfce Maintainers +Uploaders: Martin Loschwitz , Emanuele Rocca , Simon Huggins , Yves-Alexis Perez +Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev, bison, libxft-dev, libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.1), chrpath, quilt +Standards-Version: 3.7.2 +Homepage: http://www.xfce.org/ +Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-panel/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-panel/ + +Package: xfce4-panel +Architecture: any +Depends: ${shlibs:Depends}, libexo-0.3-0 (>= 0.3.2) +Replaces: xfce4 (<< 4.0.0.final-1), xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-utils (<< 4.3.90.1-1), xfce4-trigger-launcher, xfce4-mcs-plugins (= 4.3.90.2-1) +Conflicts: xfce4 (<< 4.0.0.final-1), xfce4-themes, xfce4-iconbox, xfce4-showdesktop-plugin, xfce4-systray, xfce4-windowlist-plugin, xfce4-trigger-launcher +Description: The Xfce4 desktop environment panel + This is the panel provided by the Xfce4 desktop project. + If you want a multi-functional panel that can even handle + plugins and the like, xfce4-panel might be worth a try. + +Package: xfce4-panel-dev +Section: devel +Architecture: any +Depends: xfce4-panel (= ${binary:Version}), libxml2-dev, xfce4-mcs-manager-dev (>= 4.4.1) +Replaces: xfce4-dev (<= 4.0.0.final-1) +Conflicts: xfce4-dev (<= 4.0.0.final-1) +Description: The Xfce4 panel development files + In this package, you can find the development files + distributed with the Xfce4 panel, the main panel of + Xfce4 desktop environment. The files in this package + are mainly going to be of interest for you if you + intend to code applications which use some of the + Xfce4 C panel functions. --- xfce4-panel-4.4.2.orig/debian/NEWS +++ xfce4-panel-4.4.2/debian/NEWS @@ -0,0 +1,12 @@ +xfce4-panel (4.3.90.1-3) unstable; urgency=low + + This is the 4.4beta1 release of xfce panel. + + This is a major upgrade and as such you will lose your 4.2 panel config + There is no sane way for us to avoid this. Also as this is a beta please + consider reporting any bugs to upstream first or to both the BTS and + upstream's bugzilla at http://bugzilla.xfce.org/ + + Also #xfce and #debian-xfce on irc.freenode.net can be useful resources. + + -- Yves-Alexis Perez Mon, 05 Jun 2006 19:51:37 +0200 --- xfce4-panel-4.4.2.orig/debian/watch +++ xfce4-panel-4.4.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.xfce.org/archive/xfce-(.*)/src/ \ + xfce4-panel-(.*)\.tar\.bz2 --- xfce4-panel-4.4.2.orig/config.guess +++ xfce4-panel-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 --- xfce4-panel-4.4.2.orig/config.sub +++ xfce4-panel-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*)