--- xfdesktop4-4.4.2.orig/config.sub +++ xfdesktop4-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*) --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.menu-method +++ xfdesktop4-4.4.2/debian/xfdesktop4.menu-method @@ -0,0 +1,39 @@ +#!/usr/bin/install-menu +# +# Generates Xfce menus for all registered applications. +# +compat="menu-1" + +!include menu.h + +outputencoding="UTF-8" + +genmenu="menudefs.hook" +rootprefix="/etc/xdg/xfce4/desktop" +userprefix=".config/xfce4/desktop/" +preoutput="\n" +postoutput="" +treewalk="M)" +postrun="if [ \"/etc/xdg/xfce4/desktop/menu.xml\" != \"" prefix() \ + "/menu.xml\" ]; then cp /etc/xdg/xfce4/desktop/menu.xml " prefix() \ + "/menu.xml; fi" + +function charreplace($str,$toreplace,$with,$lastchar)=replacewith(escwith($str,$toreplace,$with),$toreplace,$lastchar) + +function xmlesc($str)= replace(replace(replace(replace($str, \ + "&","&"), \ + "\"","""), \ + "<","<"), \ + ">",">") + +function xmltitle()= replace(xmlesc(title()), "/", "-") + +supported + x11= nstring(level(), " ") "\n" + text= nstring(level(), " ") "\n" + xfce4= nstring(level(), " ") "\n" +endsupported + +startmenu= "" +submenutitle= nstring(level(), " ") "\n" +endmenu= ifneq( level(), "0", nstring(level(), " ") "\n" ) --- xfdesktop4-4.4.2.orig/debian/xfce4-menueditor.1 +++ xfdesktop4-4.4.2/debian/xfce4-menueditor.1 @@ -0,0 +1,21 @@ +.\" Copyright (C) 2004 Simon Huggins +.TH XFCE4-MENUEDITOR "1" "Juen 2005" "xfce4-menueditor 0.1" "User Commands" +.SH NAME +xfce4-menueditor \- Xfce 4 Menu Editor +.SH SYNOPSIS +.B xfce4-menueditor [FILE] +.SH DESCRIPTION +.PP +Edits the Xfce menu or an optional other FILE instead. + +You may prefer in Debian to use the Debian menu system which you should install +and is detailed in /usr/share/doc/menu +.SH SEE ALSO +Upstream documentation in /usr/share/xfce4/doc/C/xfdesktop.html +.SH "REPORTING BUGS" +Report bugs to http://bugs.debian.org/ +.SH COPYRIGHT +Copyright \(co 2005 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. --- xfdesktop4-4.4.2.orig/debian/control +++ xfdesktop4-4.4.2/debian/control @@ -0,0 +1,37 @@ +Source: xfdesktop4 +Section: x11 +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers +Uploaders: Martin Loschwitz , Emanuele Rocca , Simon Huggins , Yves-Alexis Perez +Build-Depends: debhelper (>= 5.0.0), libgtk2.0-dev (>= 2.10.1), libxft-dev, libxml2-dev, xfce4-panel-dev (>= 4.4.2), libexo-0.3-dev (>= 0.3.2), libthunar-vfs-1-dev (>= 0.8.0), chrpath, libdbus-glib-1-dev, quilt +Standards-Version: 3.7.3 +Homepage: http://www.xfce.org/ +Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfdesktop4/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfdesktop4/ + +Package: xfdesktop4-data +Architecture: all +Replaces: xfdesktop4 (<= 4.4.1-2ubuntu1) +Description: Provides xfdesktop4 desktop background and root menu (common files) + This package contains architecture-independent files for xfdesktop4. + +Package: xfdesktop4 +Architecture: any +Depends: ${shlibs:Depends}, xfce4-mcs-manager, xfce4-utils, xfdesktop4-data (= ${source:Version}) +Recommends: librsvg2-common +Suggests: menu, xubuntu-default-settings (>= 0.10) +Conflicts: menu (<<2.1.12) +Description: Provides desktop background and root menu + This package contains a tool that allows you to switch the background image + and a root menu. Additionally, it contains dialogs to change the number + of available desktop workspaces and their names. It also contains a panel + plugin to display the menu on the panel + +Package: xfdesktop4-dbg +Architecture: any +Priority: extra +Depends: ${shlibs:Depends}, xfdesktop4 (= ${binary:Version}) +Description: debugging informations for xfdesktop4 + This package contains debugging symbols for xfdesktop4, the desktop manager + for Xfce 4 Desktop Environment. --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.menu +++ xfdesktop4-4.4.2/debian/xfdesktop4.menu @@ -0,0 +1,3 @@ +?package(xfdesktop4): needs="X11" section="Applications/File Management" \ + command="xfdesktop" title="Xfdesktop" longtitle="Xfce desktop manager" \ + hints="Xfce Desktop" --- xfdesktop4-4.4.2.orig/debian/copyright +++ xfdesktop4-4.4.2/debian/copyright @@ -0,0 +1,47 @@ +This package was debianized by Martin Loschwitz on +Sun, 19 Jan 2003 16:29:34 +0100. + +Upstream release is available from http://www.xfce.org + +Upstream author are: +Benedikt Meurer +Jasper Huijsmans +Brian Tarricone + +Copyright holders are: + +© 2004-2006 Brian Tarricone +© 2003 Benedikt Meurer +© 2002-2003 Jasper Huijsmans + +src/xfdesktop-icon-view.c contains code from Nautilus: © 2000 Eazel, Inc +settings/appearance-settings.c has code from gnome theme-switcher applet + © Jonathan Blandford + +Translations are © 2003-2006 The Xfce development team except: +gl.po: © 2006 Canonical Ltd, and Rosetta Contributors 2006 + +Manual is: +© 2004-2007 Brian Tarricone +© 2004 Jasper Huijsmans +© 2004 François Le Clainche + +French translation is © 2007 Maximilian Schleiss + +Licensing: + + 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'. --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.lintian +++ xfdesktop4-4.4.2/debian/xfdesktop4.lintian @@ -0,0 +1,2 @@ +# xfdesktop4 depends on xfce4-ms-manager where is xfce-setting-show +xfdesktop4: desktop-command-not-in-package /usr/share/applications/xfce-backdrop-settings.desktop xfce-setting-show --- xfdesktop4-4.4.2.orig/debian/xfdesktop4-data.install +++ xfdesktop4-4.4.2/debian/xfdesktop4-data.install @@ -0,0 +1,6 @@ +debian/tmp/usr/share/icons +debian/tmp/usr/share/locale +debian/tmp/usr/share/man +debian/tmp/usr/share/pixmaps +debian/tmp/usr/share/xfce4-menueditor +debian/tmp/usr/share/xfce4 --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.manpages +++ xfdesktop4-4.4.2/debian/xfdesktop4.manpages @@ -0,0 +1,2 @@ +debian/*.1 +xfdesktop.1 --- xfdesktop4-4.4.2.orig/debian/rules +++ xfdesktop4-4.4.2/debian/rules @@ -0,0 +1,117 @@ +#!/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_BUILD_OPTIONS=nostrip + +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=/usr/share/man --disable-rpath --libexecdir=\$${prefix}/lib --enable-final + +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=$(CURDIR)/debian/tmp + + rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.la + rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/mcs-plugins/*.a + rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.la + rm -f $(CURDIR)/debian/tmp/usr/lib/xfce4/modules/*.a + + chrpath -d -k $(CURDIR)/debian/tmp/usr/bin/* \ + $(CURDIR)/debian/tmp/usr/lib/xfce4/*/* + +binary-indep: build install + +binary-arch: build install + + dh_testdir + dh_testroot + + # remove first 14 lines of upstream menu entry (title, browser, thunar,terminal, separators) and help entry + for i in $(CURDIR)/debian/tmp/etc/xdg/xfce4/desktop/menu.xml*; do sed -i -n '/\t Thu, 17 Apr 2008 16:57:27 -0700 + +xfdesktop4 (4.4.2-5ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + - debian/patches/*.patch: keep 00_activate_menu_item.patch, + 02_show_context_menu.patch, 03_special_icons_config.patch, + 05_fix-build-with-Bsymbolic-functions.patch, 10_backdrop_zoom.patch + - debian/patches/series: refreshed (add the above patches, drop + 01_show-backdrop-by-default.patch) + - debian/rules: + + drop the 14 first lines of upstream menu.xml* + + make the 'help' menu item open the xubuntu documentation (LP #86244) + + don't use debian defaults for exo-open + + don't fix the italian menu (already fixed in xfce 4.4.2) + + do not install the lintian override, not needed + + fix the last missing menu icon (replace 'gnome-info' with 'info') + - debian/control: + + adhere to DebianMaintainerField + + don't introduce the new exo-utils package for hardy + + xfdesktop-data: bump the replaces to the ubuntu version + + xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10) + - debian/xfdesktop4.install: do not ship mcs .desktop files which only + create dups of the settings manager items + - debian/xfdesktop4.preinst: correctly handle the replacement of the old + doc dir by a symlink. + * debian/patches/04_fix-criticals-on-startup.patch renamed to + 04_fix-CRITICAL-register-message-startup.patch to reduce uneeded delta with + Debian. + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Wed, 05 Mar 2008 15:22:45 +0100 + +xfdesktop4 (4.4.2-5) unstable; urgency=low + + * debian/patches: + - 03_fix-memory-leak refreshed, more memory leaks (xfce r26652 and r26635 + xfce #3812) + - 04_fix-CRITICAL-register-message-startup added, fixes CRITICAL message + on startup (xfce r26632, #3863) + * debian/compat: bump debhelper compatibility to 5. + * debian/control: + - bump build-dep on debhelper accordingly. + - add a -dbg package containing debugging symbols. + * debian/rules: ship the symbols in -dbg package. + + -- Yves-Alexis Perez <corsac@debian.org> Sun, 02 Mar 2008 01:22:07 +0100 + +xfdesktop4 (4.4.2-4ubuntu2) hardy; urgency=low + + * 03_special_icons_config.patch: make the changes apply without restarting + xfdesktop. LP: #113933 + * 10_backdrop_zoom.patch: updated for above change + + -- Gauvain Pocentek <gauvainpocentek@ubuntu.com> Sun, 2 Mar 2008 17:19:53 +0100 + +xfdesktop4 (4.4.2-4ubuntu1) hardy; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + - debian/patches: + + keep 02_show_context_menu.patch, 03_special_icons_config.patch, + 10_backdrop_zoom.patch + + 00_activate_menu_item.patch: upstream patch to fix an issue + with submenus not reacting on click. (LP #121032) + + 01_show-backdrop-by-default.patch: dropped + - debian/rules: + + drop the 14 first lines of upstream menu.xml* + + make the 'help' menu item open the xubuntu documentation (LP #86244) + + don't use debian defaults for exo-open + + don't fix the italian menu (already fixed in xfce 4.4.2) + - debian/control: + + adhere to DebianMaintainerField + + xfdesktop-data: bump the replaces to the ubuntu version + + xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10). + * debian/rules: + - fix the last (\o/) missing menu icon (replace 'gnome-info' + with 'info') + - do not install the lintian override, not needed.. + * debian/xfdesktop4.install: do not ship mcs .desktop files which only + create dups of the settings manager items. + * debian/patches: + - 04_fix-criticals-on-startup.patch: fix failed assertions on startup + (Xfce #3863) + - 05_fix-build-with-Bsymbolic-functions.patch: fix the build when + -Bsymbolic-functions is passed to ld + - series: updated. + * debian/control: don't introduce the new exo-utils package for hardy. + * debian/xfdesktop4.preinst: correctly handle the replacement of the old + doc dir by a symlink. + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Thu, 28 Feb 2008 00:05:25 +0100 + +xfdesktop4 (4.4.2-4) unstable; urgency=low + + * debian/patches: 03_fix-memory-leak added, patch backported from + upstream SVN which fixes a memory leak in menu code. + * debian/control: + - update my email address. + - bump standards version to 3.7.3. + - loose build-dep on libgtk to ease backports. + * debian/copyright: use © sign. + * debian/xfdesktop4.lintian: add override for calling xfce-setting-show. + * debian/xfdesktop4.install: install lintian override file in xfdesktop4. + * debian/rules: + - install lintian override file. + - use $(CURDIR) instead of `pwd`. + + -- Yves-Alexis Perez <corsac@debian.org> Wed, 27 Feb 2008 08:53:32 +0100 + +xfdesktop4 (4.4.2-3) unstable; urgency=low + + * Add dependency on new exo-utils for exo-open + + -- Simon Huggins <huggie@earth.li> Mon, 28 Jan 2008 11:36:04 +0000 + +xfdesktop4 (4.4.2-2ubuntu2) hardy; urgency=low + + * debian/patches/00_activate_menu_item.patch: upstream patch to fix an issue + with submenus not reacting on click. (LP: #121032) + * debian/control: bump Standards-Version to 3.7.3. + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Sun, 20 Jan 2008 23:28:01 +0100 + +xfdesktop4 (4.4.2-2ubuntu1) hardy; urgency=low + + * Merge with Debian Unstable, remaining Ubuntu changes: + - use our xfce.mk cdbs class + - keep 02_show_context_menu.patch, 03_special_icons_config.patch, + 10_backdrop_zoom.patch + - drop debian/patches/01_show-backdrop-by-default.patch + - Make the 'help' menu item open the xubuntu documentation (LP: #86244) + - debian/patches/series: dropped, we don't use quilt + - debian/control: + + adhere to DebianMaintainerField + + bump debhelper b-d to (>= 5), add cdbs & autotools-dev and drop + chrpath and quilt + + xfdesktop-data: bump the replaces to the ubuntu version + + xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10), drop dbus + since thunar already depends on dbus-x11 for its trash applet. + - debian/xfdesktop4-data.install: do not install xfdesktop.1 in both packages, + only ship it into xfdesktop4. + - debian/rules: add DEB_CONFIGURE_EXTRA_FLAGS := --enable-final. + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Fri, 11 Jan 2008 16:43:50 +0100 + +xfdesktop4 (4.4.2-2) unstable; urgency=low + + * Add 02_use_eject_where_needed.patch to replace Unmount Volume with + Eject Volume when this is required closes: #455866 + + -- Simon Huggins <huggie@earth.li> Wed, 09 Jan 2008 12:57:35 +0000 + +xfdesktop4 (4.4.2-1ubuntu1) hardy; urgency=low + + * Merge with Debian Unstable, remaining Ubuntu changes: + - use our xfce.mk cdbs class + - keep 02_show_context_menu.patch, 03_special_icons_config.patch, + 10_backdrop_zoom.patch + - drop debian/patches/01_show-backdrop-by-default.patch + - Make the 'help' menu item open the xubuntu documentation (LP: #86244) + - debian/patches/series: dropped, we don't use quilt + - debian/control: + + adhere to DebianMaintainerField + + bump debhelper b-d to (>= 5), add cdbs & autotools-dev and drop + chrpath and quilt + + xfdesktop-data: bump the replaces to the ubuntu version + + xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10), drop dbus + since thunar already depends on dbus-x11 for its trash applet. + - debian/xfdesktop4-data.install: do not install xfdesktop.1 in both packages, + only ship it into xfdesktop4. + * debian/patches/00_use-button-zero-for-menu.patch, + debian/patches/11_fix-catalan-menu-translation.patch, + debian/patches/12_fix-italian-applications-menu.patch: dropped, included + upstream. + * debian/rules: + - add DEB_CONFIGURE_EXTRA_FLAGS := --enable-final + - do not delete manually the docs for xfdesktop4, cdbs takes + care of this now. + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Fri, 07 Dec 2007 21:46:59 +0100 + +xfdesktop4 (4.4.2-1) unstable; urgency=low + + [ Yves-Alexis Perez ] + * New upstream release. + * debian/xfdesktop4.menu: switch to new debian policy. + * use exo-open to run terminal from menu so we respect user choice. + * debian/xfdesktop4.postinst: use posix kill -s to avoid problems on hurd. + * debian/rules: don't ignore all make errors at clean stage. + + [ 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 Vcs-* headers to debian/control + + -- Yves-Alexis Perez <corsac@corsac.net> Wed, 28 Nov 2007 07:56:19 +0100 + +xfdesktop4 (4.4.1-5ubuntu4) hardy; urgency=low + + * debian/rules: fix the link to the documentation. (LP: #157845) + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Sun, 28 Oct 2007 18:45:55 +0100 + +xfdesktop4 (4.4.1-5ubuntu3) gutsy; urgency=low + + * debian/patches/12_fix-italian-applications-menu.patch: remove duplicate + entries in italian menu files. (LP: #133960) + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Fri, 24 Aug 2007 19:52:40 +0200 + +xfdesktop4 (4.4.1-5ubuntu2) gutsy; urgency=low + + * Rebuild against latest libthunar-vfs (should fix FTBFS). + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Sat, 18 Aug 2007 12:53:05 +0200 + +xfdesktop4 (4.4.1-5ubuntu1) gutsy; urgency=low + + * Fake-merge with Debian Unstable (the manpage fix was already applied in + the previous revision). + * debian/patches/00_use-button-zero-for-menu.patch: fixes a bug with desktop + menu when linked with gtk2 2.11.x (see Xfce #3359). + * debian/patches/11_fix-catalan-menu-translation.patch: fixes an error that + breaks up the catalan menu translation. (LP: #105315) + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Wed, 01 Aug 2007 19:13:23 +0200 + +xfdesktop4 (4.4.1-5) unstable; urgency=low + + * Don't ship the manpage in the -data deb as planned closes: #431122 + + -- Simon Huggins <huggie@earth.li> Sat, 30 Jun 2007 01:36:49 +0100 + +xfdesktop4 (4.4.1-4ubuntu1) gutsy; urgency=low + + * Merge with Debian Unstable, remaining Ubuntu changes: + - use our xfce.mk cdbs class + - keep 02_show_context_menu.patch, 03_special_icons_config.patch, + 10_backdrop_zoom.patch. + - drop debian/patches/01_show-backdrop-by-default.patch. + - Make the 'help' menu item open the xubuntu documentation (LP: #86244) + - debian/control: + + adhere to DebianMaintainerField + + xfdesktop4 recommends: add xubuntu-default-settings (>= 0.10), drop dbus + since thunar already depends on dbus-x11 for its trash applet. + - debian/README.Debian: remove the additional paragraph which recommends to + install dbus for the trash applet to work. + * Use debian/xfdesktop4.manpages instead of cdbs DEB_INSTALL_MANPAGES to + reduce diff with debian. + * debian/xfdesktop4-data.install: do not install xfdesktop.1 in both packages, + only ship it into xfdesktop4. + + -- Lionel Le Folgoc <mrpouit@ubuntu.com> Wed, 27 Jun 2007 22:59:34 +0200 + +xfdesktop4 (4.4.1-4) unstable; urgency=low + + * Upload to unstable now it's through NEW. + + -- Simon Huggins <huggie@earth.li> Wed, 27 Jun 2007 12:41:39 +0100 + +xfdesktop4 (4.4.1-3) experimental; urgency=low + + * Split out architecture independent files to xfdesktop4-data based on a + patch by Darren Salt closes: #379814 + + -- Simon Huggins <huggie@earth.li> Fri, 25 May 2007 16:08:15 +0100 + +xfdesktop4 (4.4.1-2ubuntu1) gutsy; urgency=low + + * Merge with debian unstable: + - keep using cdbs + - 02_show_context_menu.patch, 03_special_icons_config.patch, + 10_backdrop_zoom.patch: updated + * Make the 'help' menu item open the xubuntu documentation (LP: #86244) + + -- Gauvain Pocentek <gauvainpocentek@ubuntu.com> Sat, 5 May 2007 14:34:09 +0200 + +xfdesktop4 (4.4.1-2) unstable; urgency=high + + * Remove duplicated copies of content in menu.xml.it and + xfce-registered-categories.xml.it closes: #420872 + + -- Simon Huggins <huggie@earth.li> Thu, 26 Apr 2007 10:29:41 +0100 + +xfdesktop4 (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 + +xfdesktop4 (4.4.0-1) experimental; urgency=low + + (Yves-Alexis Perez) + * New upstream release. + * debian/control: + - updated build-deps against Xfce 4.4. + - added recommendation on librsvg2-common so people can use svg backgrounds. + + (Emanuele Rocca) + * Added versioned build-dependencies on libgtk2.0-dev and libexo-0.3-dev. + + -- Yves-Alexis Perez <corsac@corsac.net> Sun, 04 Feb 2007 14:37:47 +0100 + +xfdesktop4 (4.4.0-0ubuntu3) feisty; urgency=low + + * debian/patches/10_backdrop_zoom.patch: Implement "Zoomed" mode. It + scales the backdrop image just enough that it fills the whole screen, + while retaining the aspect ratio. (LP: #99097) + + -- Johan Kiviniemi <debian@johan.kiviniemi.name> Fri, 30 Mar 2007 18:57:46 +0300 + +xfdesktop4 (4.4.0-0ubuntu2) feisty; urgency=low + + * 03_special_icons_config.patch: add checkboxes in the settings + dialog to show/hide special desktop icons + * debian/control: update Maintainer field and create Original-Maintainer + field + * Drop libjpeg62-dev from Build-Depends, it's now a libthunar-vfs-1-dev + dependency + + -- Gauvain Pocentek <gauvainpocentek@ubuntu.com> Sat, 24 Feb 2007 14:37:16 +0100 + +xfdesktop4 (4.4.0-0ubuntu1) feisty; urgency=low + + * New upstream release + * Tighten build dependencies versions + * Build depend on libjpeg62-dev + + -- Gauvain Pocentek <gauvainpocentek@ubuntu.com> Tue, 23 Jan 2007 10:57:58 +0100 + +xfdesktop4 (4.3.99.2-1) unstable; urgency=low + + * New upstream release. + * debian/control: updated build-deps against Xfce 4.4RC2 (4.3.99.2). + * debian/control: recommends dbus. closes: #402420 + * Use Xfce menu as root menu and Debian menu as a submenu, if menu package + is installed. + * Added xfce4-popup-menu manpage, thanks François Wendling. closes: #399198 + * 01_show-backdrop-by-default.patch: enable backdrop even if none is + configured in config file (a default image is taken). + + -- Yves-Alexis Perez <corsac@corsac.net> Wed, 20 Dec 2006 21:59:15 +0100 + +xfdesktop4 (4.3.99.2svn+r24156-0ubuntu1) feisty; urgency=low + + * New upstream svn snapshot: + - bug fixes + - updated translations + - desktop icons can be shown/hidden by editing a + configuration file + * debian/patches/01_no_special_icons.patch: dropped, the + desktop icons removal is set in xubuntu-default-settings now + + -- Gauvain Pocentek <gauvainpocentek@ubuntu.com> Fri, 22 Dec 2006 19:01:46 +0100 + +xfdesktop4 (4.3.99.2svn+r23785-0ubuntu1) feisty; urgency=low + + * New upstream svn snapshot: + - fix icon disappearing when using huge size (LP #48924) + - better handling of the ~/Desktop folder + - updated translations + + -- Gauvain Pocentek <gauvainpocentek@ubuntu.com> Thu, 9 Nov 2006 16:53:38 +0100 + +xfdesktop4 (4.3.99.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1). + + -- Yves-Alexis Perez <corsac@corsac.net> Sat, 23 Sep 2006 13:43:28 +0100 + +xfdesktop4 (4.3.99.1svn+r23492-0ubuntu1) edgy; urgency=low + + * Upstream svn snapshot: + - fix icon label being cut off sometimes + - make delete key move to trash by default + * debian/patches/00_mount_removable_media.patch: + - drop, fixed upstream + * debian/patches/01_no_special_icons.patch: + - do not show trash, filesystem and home folder on the desktop + * debian/patches/02_show_context_menu.patch + - show right click context menu even if not over an icon + * debian/rules: Remove Help button from menu, it contains outdated Xfce 4.2 + information + + -- Jani Monoses <jani@ubuntu.com> Mon, 23 Oct 2006 13:00:01 +0300 + +xfdesktop4 (4.3.99.1svn+r23428-0ubuntu2) edgy; urgency=low + + * debian/patches/00_mount_removable_media.patch: Make double clicking + on unmounted removable media icons mount and open them. + + -- Jani Monoses <jani@ubuntu.com> Tue, 17 Oct 2006 17:46:14 +0300 + +xfdesktop4 (4.3.99.1svn+r23428-0ubuntu1) edgy; urgency=low + + * Upstream svn snapshot: fix many crashes, fix xinerama mode, fix trash notification + * debian/rules: sed over the menu config files and remove some application + shortcuts. + + -- Jani Monoses <jani@ubuntu.com> Mon, 16 Oct 2006 12:59:51 +0300 + +xfdesktop4 (4.3.90.2-2) unstable; urgency=low + + * Depend on xfce4-panel-dev with correct shlibs. + + -- Simon Huggins <huggie@earth.li> Wed, 26 Jul 2006 15:51:00 +0100 + +xfdesktop4 (4.3.90.2-1) unstable; urgency=low + + (Yves-Alexis Perez) + * New upstream release. Closes: #379650 + * debian/postinst: fixed 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> Mon, 10 Jul 2006 19:31:00 +0200 + +xfdesktop4 (4.3.90.2svn+r22852-0ubuntu1) edgy; urgency=low + + * Upstream svn snapshot, adds trash icon on desktop and fixes + bugs including LP #46623 and #42885 + + -- Jani Monoses <jani@ubuntu.com> Tue, 22 Aug 2006 13:50:04 +0300 + +xfdesktop4 (4.3.90.2svn+r22571-0ubuntu1) edgy; urgency=low + + * Upstream svn snapshot + + -- Jani Monoses <jani@ubuntu.com> Sun, 30 Jul 2006 22:08:23 +0300 + +xfdesktop4 (4.3.90.2-0ubuntu2) edgy; urgency=low + + * Bump library depends to 4.3.90.2 + * Bump standards version to 3.7.2 + + -- Jani Monoses <jani@ubuntu.com> Wed, 12 Jul 2006 15:03:23 +0300 + +xfdesktop4 (4.3.90.2-0ubuntu1) edgy; urgency=low + + * New upstream release, part of Xfce 4.4 beta 2 + + -- Jani Monoses <jani@ubuntu.com> Tue, 11 Jul 2006 17:35:05 +0300 + +xfdesktop4 (4.3.90.1-3) unstable; urgency=low + + * Use Thunar instead of xffm in menu files. Closes: #372847 + + -- Yves-Alexis Perez <corsac@corsac.net> Mon, 12 Jun 2006 08:17:21 +0200 + +xfdesktop4 (4.3.90.1-2) unstable; urgency=low + + * Use the correct libexec dir. + + -- Simon Huggins <huggie@earth.li> Sat, 13 May 2006 18:47:19 +0100 + +xfdesktop4 (4.3.90.1-1) unstable; urgency=low + + * New upstream release + * Build-depend on libthunar-vfs-1-dev to add desktop icons files support + * Use x-terminal-emulator instead of xfterm4 in menu file + * Use correct interpreter in xfdesktop4 menu method + * Correct a syntax error in changelog + + -- Yves-Alexis Perez <corsac@corsac.net> Wed, 03 May 2006 18:35:05 +0100 + +xfdesktop4 (4.3.90.1svn+r21874-0ubuntu2) dapper-updates; urgency=low + + * Fix crash when menu editor is run for the first time and leaves + an empty per user menu which overrides the system-wide one. + Closes LP bug #47776 and its dups. + + -- Jani Monoses <jani@ubuntu.com> Sat, 10 Jun 2006 20:33:25 +0300 + +xfdesktop4 (4.3.90.1svn+r21874-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot having the following changes + -Daniele Favara's patch to use OFFICE instead of PRODUCTIVITY + for better conformance to the icon naming spec in the menu + -Fix a memleak on refresh via F5 if there is a removable media icon + present + -Fix moving icons on the desktop not taking effect if desktop + is immediately refreshed via F5 + + -- Jani Monoses <jani@ubuntu.com> Sun, 28 May 2006 15:50:38 +0300 + +xfdesktop4 (4.3.90.1svn+r21789-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot with bugfixes. No more local changes, all are + upstream now, notably: + - Fix crasher on clicking media icon when removable media was mounted + by another process first (LP #43254) + - Make right click menu work consistently for removable media icons + + -- Jani Monoses <jani@ubuntu.com> Tue, 23 May 2006 16:15:07 +0300 + +xfdesktop4 (4.3.90.1svn+r21728-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (fix icon drawing glitches, integrate our + fix for crashes on removable icons, make settings plugin use the + icon theme not hardcoded icons, enable semi-transparent icon labels) + * Fix right-click menu to not show unusable entries for icons + which no longer have an associated directory (removed by pumount) + + -- Jani Monoses <jani@ubuntu.com> Sat, 20 May 2006 15:43:58 +0300 + +xfdesktop4 (4.3.90.1svn+r21473-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot, better handling of removable media icons on the + desktop + + -- Jani Monoses <jani@ubuntu.com> Thu, 4 May 2006 12:52:19 +0300 + +xfdesktop4 (4.3.90.1svn+r21146-0ubuntu4) dapper; urgency=low + + * Instead of a debian patch modify the default file manager entry + in the desktop menu file using sed in debian/rules. Do so for all + languages not just the English menu.xml. + + -- Jani Monoses <jani@ubuntu.com> Sun, 30 Apr 2006 20:28:49 +0300 + +xfdesktop4 (4.3.90.1svn+r21146-0ubuntu3) dapper; urgency=low + + * Recommend instead of Depend on xubuntu-default-settings for + those using vanilla Xfce. + + -- Jani Monoses <jani@ubuntu.com> Tue, 25 Apr 2006 22:49:15 +0300 + +xfdesktop4 (4.3.90.1svn+r21146-0ubuntu2) dapper; urgency=low + + * Use CDBS xfce class (for dh_iconcache, POT file generation) + * Add patch to use default xubuntu wallpaper + * Depend on xubuntu-default-settings (>=0.10) for above + + -- Jani Monoses <jani@ubuntu.com> Mon, 24 Apr 2006 15:55:39 +0300 + +xfdesktop4 (4.3.90.1svn+r21146-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (4.4 beta1) + + -- Jani Monoses <jani@ubuntu.com> Sat, 22 Apr 2006 10:44:16 +0300 + +xfdesktop4 (4.3.7svn+r20838-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (create files/folders on desktop) + + -- Jani Monoses <jani@ubuntu.com> Tue, 11 Apr 2006 13:03:02 +0300 + +xfdesktop4 (4.3.7svn+r20782-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (fixes LP #34010) + + -- Jani Monoses <jani@ubuntu.com> Fri, 7 Apr 2006 09:09:22 +0300 + +xfdesktop4 (4.3.7svn+r20500-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + + -- Jani Monoses <jani@ubuntu.com> Mon, 20 Mar 2006 09:50:35 +0200 + +xfdesktop4 (4.3.7svn+r20258-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Drop build depends which are already brought by libthunar-vfs + + -- Jani Monoses <jani@ubuntu.com> Tue, 7 Mar 2006 19:04:32 +0200 + +xfdesktop4 (4.3.7svn+r20220-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot with icons-on-desktop improvements + * Switch to CDBS + * Bump dependency version on libxfcegui4 and libthunar-vfs + * Add gettext domain to .desktop files + * Default firefox and thunar items in menu entries + * Temporarily build depend on gamin, dbus-glib, hal and hal-storage libs + until those come in via libthunar-vfs-dev + + -- Jani Monoses <jani@ubuntu.com> Sun, 5 Mar 2006 00:19:05 +0200 + +xfdesktop4 (4.3.7svn+r19979-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Bump version number to be greater than the xfdesktop4 package's + we had from a source other than Debian until now. + * Depend on thunar-vfs for file icons on desktop functionality + + -- Jani Monoses <jani@ubuntu.com> Tue, 21 Feb 2006 12:36:00 +0200 + +xfdesktop4 (4.3.0svn+r19908-0ubuntu1) dapper; urgency=low + + * New svn snapshot + * Explicitely depend on libxfcegui4 (>= 4.3.8) + + -- Jani Monoses <jani@ubuntu.com> Thu, 16 Feb 2006 20:01:11 +0200 + +xfdesktop4 (4.3.0svn+r19871-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Bump all depends to 4.3 + + -- Jani Monoses <jani@ubuntu.com> Wed, 15 Feb 2006 16:30:14 +0200 + +xfdesktop4 (4.3.0svn+r19850-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * UVF exception granted + + -- Jani Monoses <jani@ubuntu.com> Wed, 15 Feb 2006 12:54:15 +0200 + +xfdesktop4 (4.2.3-1) unstable; urgency=low + + * Yves-Alexis Perez + * New Upstream Release + * Send xfce-mcs-manager a SIGUSR1 so it notices the plugin. + * Simon Huggins + * Rejig the menu system yet again so hopefully this time it really will + work in all cases of locales/no locale and user/root setups. + closes: #320601 + + -- Yves-Alexis Perez <corsac@corsac.net> Sun, 27 Nov 2005 13:21:38 +0000 + +xfdesktop4 (4.2.2-1) unstable; urgency=low + + * New Upstream Release + * Use correct --mandir closes: #303041 + * debianutils is Essential so no need to depend on it closes: #266157 + * Add a manpage for xfce4-menueditor + * Change suite to unstable + + -- Simon Huggins <huggie@earth.li> Sat, 18 Jun 2005 09:43:15 +0100 + +xfdesktop4 (4.2.1-1) experimental; urgency=low + + * ML: New Upstream Release (Xfce 4.2.1) + * ML: Upload to experimental to prevents problems with NEW packages + * ML: debian/control: Added Maintainer/Uploaders fields + + -- Martin Loschwitz <madkiss@debian.org> Sat, 19 Mar 2005 13:02:00 +0100 + +xfdesktop4 (4.2.0-2) experimental; urgency=low + + * Add --enable-final to configure. + * Add a Homepage: to the description + + -- Simon Huggins <huggie@earth.li> Sun, 16 Jan 2005 16:53:17 +0000 + +xfdesktop4 (4.2.0-1) experimental; urgency=low + + * New Upstream Release + * Patch for 547 no longer needed as it's been fixed upstream + * Build-Depend on xfce4-panel-dev for the panel plugin + * Instead of patching upstream's menu.xml, ship our own system.menu.xml + + -- Simon Huggins <huggie@earth.li> Sat, 15 Jan 2005 12:21:41 +0000 + +xfdesktop4 (4.1.99.1-2) experimental; urgency=low + + * SJH: Patched with patch from bugzilla.xfce.org bug 547 to fix location of + included files. + * SJH: Tweak the menu-method so it works as it used to with system.menu.xml + and including menudefs.hook so it will work in all cases of user/system + and standard locale/customised locale. + * SJH: Install menu.xml as system.menu.xml + + -- Simon Huggins <huggie@earth.li> Sat, 27 Nov 2004 15:06:04 +0000 + +xfdesktop4 (4.1.99.1-1) experimental; urgency=low + + * ML: New Upstream Release (4.1.99.1 alias XFce4 4.2 RC1) + * ML: Adopted work from Benedikt Meurer to make menus work + * ML: Also adopted changes to the copyright from Benedikt + * ML: Corrected spelling mistake in README.Debian + + -- Martin Loschwitz <madkiss@debian.org> Fri, 19 Nov 2004 13:52:00 +0100 + +xfdesktop4 (4.0.6-1) unstable; urgency=low + + * New Upstream Release + * Update description + + -- Simon Huggins <huggie@earth.li> Sat, 24 Jul 2004 18:42:59 +0100 + +xfdesktop4 (4.0.5-4) unstable; urgency=low + + * Make depend on debianutils for sensible-browser and use this instead of + mozilla in all the menu.xml files. closes: #254970 + * Also depend on xfce4-utils which provides xfterm4 which the menu mentions + which was brought up by the above bug too. + + -- Simon Huggins <huggie@earth.li> Mon, 05 Jul 2004 00:05:03 +0100 + +xfdesktop4 (4.0.5-3) unstable; urgency=low + + * Suggest menu closes: #248476 + * Remove Norbert Tretkowski from uploaders as he asked. + + -- Simon Huggins <huggie@earth.li> Tue, 18 May 2004 19:16:50 +0100 + +xfdesktop4 (4.0.5-2) unstable; urgency=low + + * Take on Bill Allombert's improved menu-method slightly modified to use + postrun too to remove the harmless warning mentioned below closes: #246769 + * Due to a bug in xfdesktop4 replace / in titles with - as otherwise it + creates submenus. + * Add conflicts on versioned menu given we need replace now + + -- Simon Huggins <huggie@earth.li> Thu, 06 May 2004 21:17:22 +0100 + +xfdesktop4 (4.0.5-1) unstable; urgency=low + + * New upstream release + * Update upstream's libtool + * Fix manpage path + * Add dependency on xfce4-mcs-manager for xfce-settings-show + * Attack menuing bugs + - add &debian; and debian entity to all localised Debian menu.xml.* + closes: #218537 + - create menudefs.hook as a blank file if it doesn't exist in postinst + closes: #233637 + - slight abuse in our menu-method to create the user's menu.xml which + we really just want copied in with a menudefs.hook - this leads to + a harmless error message because we don't include include-menu-defs + in system.menu.xml but means user customised menus work. + closes: #216668 + + -- Simon Huggins <huggie@earth.li> Sun, 25 Apr 2004 13:15:02 +0100 + +xfdesktop4 (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:50:32 +0000 + +xfdesktop4 (4.0.3-1) unstable; urgency=low + + * New upstream release + * Add Daniel Silverstone <dsilvers@debian.org> to Uploaders as approved by + madkiss + * Add xfdesktop manpage pointing to upstream docs + * Remove .la and .a files from package - this isn't a -dev package + * Quote needs in menu for lintian + * Thanks to Daniel for checking and uploading these packages + + -- Simon Huggins <huggie@earth.li> Wed, 25 Feb 2004 11:36:42 +0000 + +xfdesktop4 (4.0.2-1) unstable; urgency=low + + * New upstream release + * Added Build-Dependency for xlibs-pic (Closes: #215593) + + -- Martin Loschwitz <madkiss@debian.org> Fri, 26 Dec 2003 16:27:00 +0100 + +xfdesktop4 (4.0.0.final-1) unstable; urgency=low + + * New upstream release + * New Co-Maintainer: Norbert Tretkowski. + * Many cleanups in debian/-subdir + + -- Martin Loschwitz <madkiss@debian.org> Tue, 29 Sep 2003 18:07:00 +0200 + +xfdesktop4 (4.0.0+cvs.20030421-1) unstable; urgency=low + + * New CVS checkout (2003-04-21) + * Added support for the Debian Menu (thanks goes to Ferdinand O. Tempel for + the initial idea and big thanks goes to Bernhard R. Link for his work on + this.) + + -- Martin Loschwitz <madkiss@debian.org> Tue, 22 Apr 2003 16:29:00 +0200 + +xfdesktop4 (4.0.0+cvs.20030301-2) unstable; urgency=low + + * Added Build-Depends: for libxml2-dev to fix FTBFS (Closes: #185257) + + -- Martin Loschwitz <madkiss@debian.org> Fri, 21 Mar 2003 17:05:00 +0100 + +xfdesktop4 (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 <madkiss@debian.org> Sat, 01 Mar 2003 14:41:00 +0100 + +xfdesktop4 (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 <madkiss@madkiss.org> Sun, 16 Feb 2003 13:40:00 +0100 + +xfdesktop4 (4.0.0+cvs.20030119-1) unstable; urgency=low + + * Initial Release. + + -- Martin Loschwitz <madkiss@madkiss.org> Sun, 19 Jan 2003 16:29:34 +0100 --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.install +++ xfdesktop4-4.4.2/debian/xfdesktop4.install @@ -0,0 +1,3 @@ +debian/tmp/etc +debian/tmp/usr/bin +debian/tmp/usr/lib --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.postrm +++ xfdesktop4-4.4.2/debian/xfdesktop4.postrm @@ -0,0 +1,8 @@ +#!/bin/sh + +if [ "$1" = "purge" ]; then + rm -rf /etc/xdg/xfce4/desktop/menudefs.hook + rm -rf /etc/xdg/xfce4/desktop/notforuse.xml +fi + +#DEBHELPER# --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.preinst +++ xfdesktop4-4.4.2/debian/xfdesktop4.preinst @@ -0,0 +1,12 @@ +#!/bin/sh -e + +# Handle removal of the old doc dir (replaced by a symlink) +case $1 in upgrade) + if [ -d /usr/share/doc/xfdesktop4 ]; then + if ! [ -h /usr/share/doc/xfdesktop4 ]; then + rm -rf /usr/share/doc/xfdesktop4; + fi + fi +esac + +#DEBHELPER# --- xfdesktop4-4.4.2.orig/debian/xfce4-popup-menu.1 +++ xfdesktop4-4.4.2/debian/xfce4-popup-menu.1 @@ -0,0 +1,32 @@ +.\" http://svn.xfce.org/svn/Xfce/xfdesktop/trunk/panel-plugin/Xfce4-popup-menu.c +.\" sets Olivier Fourdan as author + +.TH "XFCE4-POPUP-MENU" "1" "2006-11-18" "4.3.99.1" +.SH "NAME" +xfce4-popup-menu \- shows the Xfce Menu + +.SH "SYNOPSIS" +.B xfce4-popup-menu + +.SH "DESCRIPTION" +.B xfce4-popup-menu +shows the Xfce Menu on a panel if at least one Xfce Menu button is present on +one of your panel(s). The behaviour of +.B xfce4-popup-menu +is to show only one menu, so if you have several Xfce Menu buttons, only the +first you have defined will pop up the menu. + +If you want to show the Xfce Menu under your current mouse position see the +manual page for +.IR xfdesktop (1). + + +.SH "SEE ALSO" +.IR xfdesktop (1) + +.SH "AUTHOR" +.B xfce4-popup-menu +was written by Olivier Fourdan <fourdan@xfce.org>. +.PP +This manual page was written by Francois Wendling <frwendling@free.fr> for the +Debian project (but may be used by others). --- xfdesktop4-4.4.2.orig/debian/compat +++ xfdesktop4-4.4.2/debian/compat @@ -0,0 +1 @@ +5 --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.postinst +++ xfdesktop4-4.4.2/debian/xfdesktop4.postinst @@ -0,0 +1,18 @@ +#!/bin/sh + +if [ "$1" = "configure" ]; then + if [ ! -f /etc/xdg/xfce4/desktop/menudefs.hook ]; then + cat >/etc/xdg/xfce4/desktop/menudefs.hook <<EOF +<!-- + This file is deliberately empty. Run update-menus to populate it + with the debian menu +--> +EOF + fi + + # Get xfce-mcs-manager to reinit + kill -s USR1 `pidof xfce-mcs-manager` > /dev/null 2>&1|| true + +fi + +#DEBHELPER# --- xfdesktop4-4.4.2.orig/debian/README.Debian +++ xfdesktop4-4.4.2/debian/README.Debian @@ -0,0 +1,20 @@ +Trash applet panel plugin +========================= + +If you want to use trash applet plugin in Xfce panel, you need to install +dbus package. Otherwise, it'll spam your .xsession-errors with messages +about this. + +-- Yves-Alexis Perez <corsac@corsac.net> Sun, 10 Dec 2006 15:04:18 +0100 + +User changes +============ + +The menus in /etc/X11/xfce4/menu.xml* are all conffiles so you are allowed +to modify them. However, this is discouraged and you are encouraged to check +out the Debian Menu System to add things to that either as a local user or +system wide. + +See http://www.debian.org/doc/packaging-manuals/menu.html/ + +-- Simon Huggins <huggie@earth.li> Sun, 25 Apr 2004 19:49:49 +0100 --- xfdesktop4-4.4.2.orig/debian/xfdesktop4.prerm +++ xfdesktop4-4.4.2/debian/xfdesktop4.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 --- xfdesktop4-4.4.2.orig/debian/watch +++ xfdesktop4-4.4.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.xfce.org/archive/xfce-(.*)/src/ \ + xfdesktop-(.*)\.tar\.bz2 --- xfdesktop4-4.4.2.orig/debian/docs +++ xfdesktop4-4.4.2/debian/docs @@ -0,0 +1 @@ +doc/README.kiosk --- xfdesktop4-4.4.2.orig/debian/patches/02_show_context_menu.patch +++ xfdesktop4-4.4.2/debian/patches/02_show_context_menu.patch @@ -0,0 +1,178 @@ +diff -Nur xfdesktop-4.3.99.1/src/menu.c xfdesktop-4.3.99.1.new/src/menu.c +--- xfdesktop-4.3.99.1/src/menu.c 2006-10-23 12:51:26.000000000 +0300 ++++ xfdesktop-4.3.99.1.new/src/menu.c 2006-10-23 14:12:42.000000000 +0300 +@@ -72,6 +72,9 @@ + } + #endif + ++extern GtkWidget* common_desktop_menu(GdkScreen *gscreen); ++GtkWidget *cmenu_widget = NULL; ++ + void + popup_desktop_menu(GdkScreen *gscreen, gint button, guint32 time) + { +@@ -79,9 +82,16 @@ + GtkWidget *menu_widget; + GdkWindow *root; + +- if(!desktop_menu) +- return; +- ++ if(!desktop_menu) { ++ if (!cmenu_widget) { ++ cmenu_widget = common_desktop_menu(gscreen); ++ } ++ gtk_menu_set_screen(GTK_MENU(cmenu_widget), gscreen); ++ gtk_menu_popup(GTK_MENU(cmenu_widget), NULL, NULL, NULL, NULL, ++ button, time); ++ return; ++ } ++ + if(xfce_desktop_menu_need_update(desktop_menu)) + xfce_desktop_menu_force_regen(desktop_menu); + +diff -Nur xfdesktop-4.3.99.1/src/xfdesktop-file-icon-manager.c xfdesktop-4.3.99.1.new/src/xfdesktop-file-icon-manager.c +--- xfdesktop-4.3.99.1/src/xfdesktop-file-icon-manager.c 2006-10-23 12:51:26.000000000 +0300 ++++ xfdesktop-4.3.99.1.new/src/xfdesktop-file-icon-manager.c 2006-10-23 14:13:01.000000000 +0300 +@@ -1508,6 +1508,131 @@ + } + } + ++XfdesktopFileIconManager *the_fmanager; ++ ++GtkWidget * ++common_desktop_menu(GdkScreen *gscreen) ++{ ++ GList *l; ++ GtkWidget *menu2, *mi, *img, *menu3; ++ ThunarVfsMimeInfo *minfo; ++ ThunarVfsPath *templates_path; ++ gchar *templates_path_str; ++ gint w = 0, h = 0; ++ GdkPixbuf *pix; ++ XfdesktopFileIconManager *fmanager = the_fmanager; ++#ifdef HAVE_THUNARX ++ GtkWidget *toplevel = gtk_widget_get_toplevel(GTK_WIDGET(fmanager->priv->icon_view)); ++#endif ++ gboolean have_templates; ++ ++ gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h); ++ menu2 = gtk_menu_new(); ++ ++ mi = gtk_image_menu_item_new_with_mnemonic(_("Create _Launcher...")); ++ minfo = thunar_vfs_mime_database_get_info(thunar_mime_database, ++ "application/x-desktop"); ++ if(minfo) { ++ const gchar *icon_name = thunar_vfs_mime_info_lookup_icon_name(minfo, ++ gtk_icon_theme_get_default()); ++ pix = xfce_themed_icon_load(icon_name, w); ++ if(pix) { ++ img = gtk_image_new_from_pixbuf(pix); ++ gtk_widget_show(img); ++ g_object_unref(G_OBJECT(pix)); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ } ++ } ++ g_object_set_data(G_OBJECT(mi), "xfdesktop-launcher-type", "Application"); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu2), mi); ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_file_icon_menu_create_launcher), ++ fmanager); ++ ++ mi = gtk_image_menu_item_new_with_mnemonic(_("Create _URL Link...")); ++ pix = xfce_themed_icon_load("gnome-fs-bookmark", w); ++ if(!pix) ++ pix = xfce_themed_icon_load("emblem-favorite", w); ++ if(pix) { ++ img = gtk_image_new_from_pixbuf(pix); ++ gtk_widget_show(img); ++ g_object_unref(G_OBJECT(pix)); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ } ++ g_object_set_data(G_OBJECT(mi), "xfdesktop-launcher-type", "Link"); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu2), mi); ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_file_icon_menu_create_launcher), ++ fmanager); ++ mi = gtk_image_menu_item_new_with_mnemonic(_("Create _Folder...")); ++ minfo = thunar_vfs_mime_database_get_info(thunar_mime_database, ++ "inode/directory"); ++ if(minfo) { ++ const gchar *icon_name = thunar_vfs_mime_info_lookup_icon_name(minfo, ++ gtk_icon_theme_get_default()); ++ pix = xfce_themed_icon_load(icon_name, w); ++ if(pix) { ++ img = gtk_image_new_from_pixbuf(pix); ++ gtk_widget_show(img); ++ g_object_unref(G_OBJECT(pix)); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ } ++ } ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu2), mi); ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_file_icon_menu_create_folder), ++ fmanager); ++ ++ mi = gtk_menu_item_new_with_mnemonic("Create From _Template"); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu2), mi); ++ ++ menu3 = gtk_menu_new(); ++ gtk_widget_show(menu3); ++ gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), menu3); ++ ++ templates_path_str = g_build_filename(xfce_get_homedir(), ++ "Templates", ++ NULL); ++ templates_path = thunar_vfs_path_new(templates_path_str, NULL); ++ g_free(templates_path_str); ++ if(templates_path) { ++ have_templates = xfdesktop_file_icon_menu_fill_template_menu(menu3, ++ templates_path, ++ fmanager); ++ thunar_vfs_path_unref(templates_path); ++ } ++ ++ img = gtk_image_new_from_stock(GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); ++ gtk_widget_show(img); ++ mi = gtk_image_menu_item_new_with_mnemonic(_("_Empty File")); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu3), mi); ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_file_icon_template_item_activated), ++ fmanager); ++ ++ mi = gtk_separator_menu_item_new(); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu2), mi); ++ ++ ++ img = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_MENU); ++ gtk_widget_show(img); ++ mi = gtk_image_menu_item_new_with_mnemonic(_("Desktop _Settings...")); ++ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu2), mi); ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_mcs_settings_launch), fmanager); ++ ++ return menu2; ++} ++ + static void + xfdesktop_file_icon_menu_popup(XfdesktopIcon *icon, + gpointer user_data) +@@ -2720,7 +2845,8 @@ + #endif + + g_return_val_if_fail(!fmanager->priv->inited, FALSE); +- ++ ++ the_fmanager = fmanager; + fmanager->priv->icon_view = icon_view; + + fmanager->priv->gscreen = gtk_widget_get_screen(GTK_WIDGET(icon_view)); --- xfdesktop4-4.4.2.orig/debian/patches/01_show-backdrop-by-default.patch +++ xfdesktop4-4.4.2/debian/patches/01_show-backdrop-by-default.patch @@ -0,0 +1,14 @@ +--- xfdesktop4/settings/appearance-settings.c.orig 2006-11-05 11:57:02.000000000 +0100 ++++ xfdesktop4/settings/appearance-settings.c 2006-12-18 12:58:11.000000000 +0100 +@@ -275,9 +275,9 @@ + if(setting) + bp->show_image = setting->data.v_int == 0 ? FALSE : TRUE; + else { +- bp->show_image = FALSE; ++ bp->show_image = TRUE; + mcs_manager_set_int(mcs_plugin->manager, setting_name, +- BACKDROP_CHANNEL, 0); ++ BACKDROP_CHANNEL, 1); + } + + /* the color style */ --- xfdesktop4-4.4.2.orig/debian/patches/10_backdrop_zoom.patch +++ xfdesktop4-4.4.2/debian/patches/10_backdrop_zoom.patch @@ -0,0 +1,50 @@ +diff -Nur xfdesktop4-4.4.2/settings/appearance-settings.c xfdesktop4-4.4.2.new/settings/appearance-settings.c +--- xfdesktop4-4.4.2/settings/appearance-settings.c 2008-03-02 17:17:32.000000000 +0100 ++++ xfdesktop4-4.4.2.new/settings/appearance-settings.c 2008-03-02 17:18:53.000000000 +0100 +@@ -738,6 +738,7 @@ + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _("Tiled")); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _("Stretched")); + gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _("Scaled")); ++ gtk_combo_box_append_text(GTK_COMBO_BOX(combo), _("Zoomed")); + gtk_combo_box_set_active(GTK_COMBO_BOX(combo), bp->style); + gtk_label_set_mnemonic_widget(GTK_LABEL(label), combo); + gtk_widget_show(combo); +diff -Nur xfdesktop4-4.4.2/src/xfce-backdrop.c xfdesktop4-4.4.2.new/src/xfce-backdrop.c +--- xfdesktop4-4.4.2/src/xfce-backdrop.c 2008-03-02 17:17:32.000000000 +0100 ++++ xfdesktop4-4.4.2.new/src/xfce-backdrop.c 2008-03-02 17:18:53.000000000 +0100 +@@ -656,6 +656,22 @@ + interp, 255); + break; + ++ case XFCE_BACKDROP_IMAGE_ZOOMED: ++ xscale = (gdouble)w / iw; ++ yscale = (gdouble)h / ih; ++ if(xscale < yscale) { ++ xscale = yscale; ++ xo = (w - (iw * xscale)) * 0.5; ++ yo = 0; ++ } else { ++ yscale = xscale; ++ xo = 0; ++ yo = (h - (ih * yscale)) * 0.5; ++ } ++ gdk_pixbuf_composite(image, final_image, 0, 0, ++ w, h, xo, yo, xscale, yscale, interp, 255); ++ break; ++ + default: + g_critical("Invalid image style: %d\n", (gint)istyle); + } +diff -Nur xfdesktop4-4.4.2/src/xfce-backdrop.h xfdesktop4-4.4.2.new/src/xfce-backdrop.h +--- xfdesktop4-4.4.2/src/xfce-backdrop.h 2008-03-02 17:17:32.000000000 +0100 ++++ xfdesktop4-4.4.2.new/src/xfce-backdrop.h 2008-03-02 17:18:53.000000000 +0100 +@@ -48,7 +48,8 @@ + XFCE_BACKDROP_IMAGE_CENTERED, + XFCE_BACKDROP_IMAGE_TILED, + XFCE_BACKDROP_IMAGE_STRETCHED, +- XFCE_BACKDROP_IMAGE_SCALED ++ XFCE_BACKDROP_IMAGE_SCALED, ++ XFCE_BACKDROP_IMAGE_ZOOMED + } XfceBackdropImageStyle; + + typedef enum --- xfdesktop4-4.4.2.orig/debian/patches/series +++ xfdesktop4-4.4.2/debian/patches/series @@ -0,0 +1,8 @@ +00_activate_menu_item.patch +02_show_context_menu.patch +02_use_eject_where_needed.patch +03_fix-memory-leak.patch +03_special_icons_config.patch +04_fix-CRITICAL-register-message-startup.patch +05_fix-build-with-Bsymbolic-functions.patch +10_backdrop_zoom.patch --- xfdesktop4-4.4.2.orig/debian/patches/03_special_icons_config.patch +++ xfdesktop4-4.4.2/debian/patches/03_special_icons_config.patch @@ -0,0 +1,470 @@ +diff -Nur xfdesktop4-4.4.2/settings/behavior-settings.c xfdesktop4-4.4.2.new/settings/behavior-settings.c +--- xfdesktop4-4.4.2/settings/behavior-settings.c 2007-11-17 20:31:41.000000000 +0100 ++++ xfdesktop4-4.4.2.new/settings/behavior-settings.c 2008-03-02 17:39:34.000000000 +0100 +@@ -22,6 +22,7 @@ + #endif + + #include <libxfcegui4/libxfcegui4.h> ++#include <libxfce4util/libxfce4util.h> + + #include "xfce-desktop.h" + #include "xfdesktop-common.h" +@@ -54,6 +55,10 @@ + static gboolean desktop_icons_use_system_font = TRUE; + static guint desktop_icons_font_size = 12; /* default, i guess */ + static guint desktop_icons_icon_size = 32; /* default */ ++static gboolean show_home = TRUE; ++static gboolean show_filesystem = TRUE; ++static gboolean show_trash = TRUE; ++static gboolean show_removable = TRUE; + #endif + + static void +@@ -96,6 +101,43 @@ + + #ifdef ENABLE_DESKTOP_ICONS + static void ++set_show_option(GtkWidget *w, gpointer user_data) ++{ ++ BackdropDialog *bd = (BackdropDialog *)user_data; ++ guint opt; ++ ++ opt = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(w), "xfce-shownum")); ++ switch (opt) ++ { ++ case XFCE_DESKTOP_SHOW_HOME: ++ show_home = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)); ++ mcs_manager_set_int(bd->plugin->manager, ++ "showhome", BACKDROP_CHANNEL, ++ show_home ? 1 : 0); ++ break; ++ case XFCE_DESKTOP_SHOW_FILESYSTEM: ++ show_filesystem = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)); ++ mcs_manager_set_int(bd->plugin->manager, ++ "showfilesystem", BACKDROP_CHANNEL, ++ show_filesystem ? 1 : 0); ++ break; ++ case XFCE_DESKTOP_SHOW_TRASH: ++ show_trash = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)); ++ mcs_manager_set_int(bd->plugin->manager, ++ "showtrash", BACKDROP_CHANNEL, ++ show_trash ? 1 : 0); ++ break; ++ case XFCE_DESKTOP_SHOW_REMOVABLE: ++ show_removable = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)); ++ mcs_manager_set_int(bd->plugin->manager, ++ "showremovable", BACKDROP_CHANNEL, ++ show_removable ? 1 : 0); ++ break; ++ } ++ mcs_manager_notify(bd->plugin->manager, BACKDROP_CHANNEL); ++} ++ ++static void + set_sbtn_option(GtkSpinButton *sbtn, + gpointer user_data) + { +@@ -138,7 +180,11 @@ + } else + gtk_widget_set_sensitive(bd->vbox_icon_settings, FALSE); + +- ++ if(desktop_icon_style == XFCE_DESKTOP_ICON_STYLE_FILES) ++ gtk_widget_set_sensitive(bd->hbox_show_icons, TRUE); ++ else ++ gtk_widget_set_sensitive(bd->hbox_show_icons, FALSE); ++ + mcs_manager_set_int(bd->plugin->manager, "desktopiconstyle", + BACKDROP_CHANNEL, desktop_icon_style); + mcs_manager_notify(bd->plugin->manager, BACKDROP_CHANNEL); +@@ -202,6 +248,47 @@ + if(setting && setting->data.v_int > 0) + desktop_icons_icon_size = setting->data.v_int; + ++ /* special icons */ ++ gchar *filename; ++ XfceRc *rc; ++ ++ filename = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, ++ "xfce4/desktop/xfdesktoprc", ++ FALSE); ++ rc = xfce_rc_simple_open (filename, FALSE); ++ g_free (filename); ++ if (rc) ++ { ++ if (xfce_rc_has_group (rc, "file-icons")) ++ { ++ xfce_rc_set_group (rc, "file-icons"); ++ show_home = xfce_rc_read_bool_entry (rc, "show-home", TRUE); ++ show_filesystem = xfce_rc_read_bool_entry (rc, "show-filesystem", TRUE); ++ show_trash = xfce_rc_read_bool_entry (rc, "show-trash", TRUE); ++ show_removable = xfce_rc_read_bool_entry (rc, "show-removable", TRUE); ++ } ++ xfce_rc_close (rc); ++ } ++ ++ setting = mcs_manager_setting_lookup(plugin->manager, "showhome", ++ BACKDROP_CHANNEL); ++ if(setting) ++ show_home = setting->data.v_int ? TRUE : FALSE; ++ ++ setting = mcs_manager_setting_lookup(plugin->manager, "showfilesystem", ++ BACKDROP_CHANNEL); ++ if(setting) ++ show_filesystem = setting->data.v_int ? TRUE : FALSE; ++ ++ setting = mcs_manager_setting_lookup(plugin->manager, "showtrash", ++ BACKDROP_CHANNEL); ++ if(setting) ++ show_trash = setting->data.v_int ? TRUE : FALSE; ++ ++ setting = mcs_manager_setting_lookup(plugin->manager, "showremovable", ++ BACKDROP_CHANNEL); ++ if(setting) ++ show_removable = setting->data.v_int ? TRUE : FALSE; + #endif /* ENABLE_DESKTOP_ICONS */ + } + +@@ -229,7 +316,7 @@ + GtkWidget *btn; + #endif + #ifdef ENABLE_DESKTOP_ICONS +- GtkWidget *combo, *sbtn, *lbl, *hbox; ++ GtkWidget *combo, *sbtn, *lbl, *hbox, *table; + #endif + + kiosk = xfce_kiosk_new("xfdesktop"); +@@ -350,11 +437,60 @@ + + gtk_widget_set_sensitive(bd->frame_sysfont, !desktop_icons_use_system_font); + ++ if (desktop_icon_style != XFCE_DESKTOP_ICON_STYLE_FILES) ++ gtk_widget_set_sensitive(bd->vbox_icon_settings, FALSE); ++ ++ + if(desktop_icon_style == XFCE_DESKTOP_ICON_STYLE_NONE) + gtk_widget_set_sensitive(bd->vbox_icon_settings, FALSE); + + if(!xfce_kiosk_query(kiosk, "CustomizeDesktopIcons")) + gtk_widget_set_sensitive(frame_bin, FALSE); ++ ++ bd->hbox_show_icons = gtk_hbox_new (FALSE, FALSE); ++ gtk_widget_show(bd->hbox_show_icons); ++ gtk_box_pack_start(GTK_BOX(bd->vbox_icon_settings),bd->hbox_show_icons, FALSE, FALSE, 0); ++ ++ table = gtk_table_new (3, 3, TRUE); ++ gtk_widget_show (table); ++ gtk_box_pack_start(GTK_BOX(bd->hbox_show_icons), table, FALSE, FALSE, 0); ++ ++ lbl = gtk_label_new_with_mnemonic(_("Show ic_ons for: ")); ++ gtk_widget_show(lbl); ++ gtk_table_attach(GTK_TABLE (table), lbl, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); ++ ++ bd->chk_show_home = gtk_check_button_new_with_mnemonic(_("_home")); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bd->chk_show_home), show_home); ++ gtk_widget_show (bd->chk_show_home); ++ g_object_set_data(G_OBJECT(bd->chk_show_home), "xfce-shownum", ++ GUINT_TO_POINTER(XFCE_DESKTOP_SHOW_HOME)); ++ gtk_table_attach(GTK_TABLE (table), bd->chk_show_home, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0); ++ ++ bd->chk_show_filesystem = gtk_check_button_new_with_mnemonic(_("_file system")); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bd->chk_show_filesystem), show_filesystem); ++ gtk_widget_show (bd->chk_show_filesystem); ++ g_object_set_data(G_OBJECT(bd->chk_show_filesystem), "xfce-shownum", ++ GUINT_TO_POINTER(XFCE_DESKTOP_SHOW_FILESYSTEM)); ++ gtk_table_attach(GTK_TABLE (table), bd->chk_show_filesystem, 1, 3, 1, 2, GTK_FILL, GTK_FILL, 0, 0); ++ ++ bd->chk_show_trash = gtk_check_button_new_with_mnemonic(_("_trash")); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bd->chk_show_trash), show_trash); ++ gtk_widget_show (bd->chk_show_trash); ++ g_object_set_data(G_OBJECT(bd->chk_show_trash), "xfce-shownum", ++ GUINT_TO_POINTER(XFCE_DESKTOP_SHOW_TRASH)); ++ gtk_table_attach(GTK_TABLE (table), bd->chk_show_trash, 2, 3, 0, 1, GTK_FILL, GTK_FILL, 0, 0); ++ ++ bd->chk_show_removable = gtk_check_button_new_with_mnemonic(_("_removable devices")); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (bd->chk_show_removable), show_removable); ++ gtk_widget_show (bd->chk_show_removable); ++ g_object_set_data(G_OBJECT(bd->chk_show_removable), "xfce-shownum", ++ GUINT_TO_POINTER(XFCE_DESKTOP_SHOW_REMOVABLE)); ++ gtk_table_attach(GTK_TABLE (table), bd->chk_show_removable, 1, 3, 2, 3, GTK_FILL, GTK_FILL, 0, 0); ++ ++ g_signal_connect(G_OBJECT(bd->chk_show_home), "toggled", G_CALLBACK(set_show_option), bd); ++ g_signal_connect(G_OBJECT(bd->chk_show_filesystem), "toggled", G_CALLBACK(set_show_option), bd); ++ g_signal_connect(G_OBJECT(bd->chk_show_trash), "toggled", G_CALLBACK(set_show_option), bd); ++ g_signal_connect(G_OBJECT(bd->chk_show_removable), "toggled", G_CALLBACK(set_show_option), bd); + #endif + + xfce_kiosk_free(kiosk); +diff -Nur xfdesktop4-4.4.2/settings/settings-common.h xfdesktop4-4.4.2.new/settings/settings-common.h +--- xfdesktop4-4.4.2/settings/settings-common.h 2007-11-17 20:31:41.000000000 +0100 ++++ xfdesktop4-4.4.2.new/settings/settings-common.h 2008-03-02 17:39:34.000000000 +0100 +@@ -45,6 +45,11 @@ + #ifdef ENABLE_DESKTOP_ICONS + GtkWidget *vbox_icon_settings; + GtkWidget *frame_sysfont; ++ GtkWidget *chk_show_home; ++ GtkWidget *chk_show_filesystem; ++ GtkWidget *chk_show_trash; ++ GtkWidget *chk_show_removable; ++ GtkWidget *hbox_show_icons; + #endif + } BackdropDialog; + +diff -Nur xfdesktop4-4.4.2/src/xfce-desktop.c xfdesktop4-4.4.2.new/src/xfce-desktop.c +--- xfdesktop4-4.4.2/src/xfce-desktop.c 2007-11-17 20:31:41.000000000 +0100 ++++ xfdesktop4-4.4.2.new/src/xfce-desktop.c 2008-03-02 17:39:34.000000000 +0100 +@@ -98,6 +98,10 @@ + guint icons_size; + GtkWidget *icon_view; + gdouble system_font_size; ++ gboolean show_home; ++ gboolean show_filesystem; ++ gboolean show_trash; ++ gboolean show_removable; + #endif + }; + +@@ -173,51 +177,20 @@ + + path = thunar_vfs_path_new(desktop_path, NULL); + if(path) { +- XfceRc *rcfile; +- /* defaults */ +- gboolean show_removable = TRUE, show_filesystem = TRUE; +- gboolean show_home = TRUE, show_trash = TRUE; +- + manager = xfdesktop_file_icon_manager_new(path); + thunar_vfs_path_unref(path); + +- rcfile = xfce_rc_config_open(XFCE_RESOURCE_CONFIG, +- "xfce4/desktop/xfdesktoprc", +- TRUE); +- if(rcfile) { +- if(xfce_rc_has_group(rcfile, "file-icons")) { +- xfce_rc_set_group(rcfile, "file-icons"); +- show_filesystem = xfce_rc_read_bool_entry(rcfile, +- "show-filesystem", +- show_filesystem); +- show_home = xfce_rc_read_bool_entry(rcfile, +- "show-home", +- show_home); +- show_trash = xfce_rc_read_bool_entry(rcfile, +- "show-trash", +- show_trash); +- show_removable = xfce_rc_read_bool_entry(rcfile, +- "show-removable", +- show_removable); +- } +- +- xfce_rc_close(rcfile); +- } +- + xfdesktop_file_icon_manager_set_show_special_file(XFDESKTOP_FILE_ICON_MANAGER(manager), + XFDESKTOP_SPECIAL_FILE_ICON_FILESYSTEM, +- show_filesystem); ++ desktop->priv->show_filesystem); + xfdesktop_file_icon_manager_set_show_special_file(XFDESKTOP_FILE_ICON_MANAGER(manager), + XFDESKTOP_SPECIAL_FILE_ICON_HOME, +- show_home); ++ desktop->priv->show_home); + xfdesktop_file_icon_manager_set_show_special_file(XFDESKTOP_FILE_ICON_MANAGER(manager), + XFDESKTOP_SPECIAL_FILE_ICON_TRASH, +- show_trash); ++ desktop->priv->show_trash); + xfdesktop_file_icon_manager_set_show_removable_media(XFDESKTOP_FILE_ICON_MANAGER(manager), +- show_removable); +- } else { +- g_critical("Unable to create ThunarVfsPath for '%s'", +- desktop_path); ++ desktop->priv->show_removable); + } + g_free(desktop_path); + } +@@ -859,6 +832,38 @@ + #endif + } + ++#ifdef ENABLE_DESKTOP_ICONS ++void ++xfce_desktop_set_show_special (XfceDesktop *desktop, ++ int what, ++ guint value) ++{ ++ g_return_if_fail(XFCE_IS_DESKTOP(desktop)); ++ ++ if(desktop->priv->icon_view) { ++ gtk_widget_destroy(desktop->priv->icon_view); ++ desktop->priv->icon_view = NULL; ++ } ++ ++ switch (what) ++ { ++ case XFCE_DESKTOP_SHOW_HOME: ++ desktop->priv->show_home = value ? TRUE : FALSE; ++ break; ++ case XFCE_DESKTOP_SHOW_FILESYSTEM: ++ desktop->priv->show_filesystem = value ? TRUE : FALSE; ++ break; ++ case XFCE_DESKTOP_SHOW_TRASH: ++ desktop->priv->show_trash = value ? TRUE : FALSE; ++ break; ++ case XFCE_DESKTOP_SHOW_REMOVABLE: ++ desktop->priv->show_removable = value ? TRUE : FALSE; ++ break; ++ } ++ xfce_desktop_setup_icon_view(desktop); ++} ++#endif ++ + void + xfce_desktop_set_icon_size(XfceDesktop *desktop, + guint icon_size) +diff -Nur xfdesktop4-4.4.2/src/xfce-desktop.h xfdesktop4-4.4.2.new/src/xfce-desktop.h +--- xfdesktop4-4.4.2/src/xfce-desktop.h 2007-11-17 20:31:41.000000000 +0100 ++++ xfdesktop4-4.4.2.new/src/xfce-desktop.h 2008-03-02 17:39:47.000000000 +0100 +@@ -49,6 +49,14 @@ + XFCE_DESKTOP_ICON_STYLE_FILES, + } XfceDesktopIconStyle; + ++typedef enum ++{ ++ XFCE_DESKTOP_SHOW_HOME = 0, ++ XFCE_DESKTOP_SHOW_FILESYSTEM, ++ XFCE_DESKTOP_SHOW_TRASH, ++ XFCE_DESKTOP_SHOW_REMOVABLE, ++} XfceDesktopShowSpecial; ++ + struct _XfceDesktop + { + GtkWindow window; +@@ -86,7 +94,9 @@ + gboolean use_system); + void xfce_desktop_set_icon_font_size(XfceDesktop *desktop, + guint font_size_points); +- ++void xfce_desktop_set_show_special (XfceDesktop *desktop, ++ int what, ++ guint value); + void xfce_desktop_set_session_logout_func(XfceDesktop *desktop, + SessionLogoutFunc logout_func); + +diff -Nur xfdesktop4-4.4.2/src/xfce-desktop-settings.c xfdesktop4-4.4.2.new/src/xfce-desktop-settings.c +--- xfdesktop4-4.4.2/src/xfce-desktop-settings.c 2007-11-17 20:31:41.000000000 +0100 ++++ xfdesktop4-4.4.2.new/src/xfce-desktop-settings.c 2008-03-02 17:39:34.000000000 +0100 +@@ -59,6 +59,8 @@ + + #include "xfdesktop-common.h" + #include "xfce-desktop-settings.h" ++#include "xfdesktop-special-file-icon.h" ++#include "xfdesktop-icon-view-manager.h" + + static void + save_list_file_minus_one(const gchar *filename, const gchar **files, gint badi) +@@ -269,6 +271,76 @@ + mcs_setting_free(setting); + setting = NULL; + } ++ ++ /* special icons */ ++ gchar *filename; ++ XfceRc *rc; ++ gboolean showhome = TRUE; ++ gboolean showfilesystem = TRUE; ++ gboolean showtrash = TRUE; ++ gboolean showremovable = TRUE; ++ ++ filename = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, ++ "xfce4/desktop/xfdesktoprc", ++ FALSE); ++ rc = xfce_rc_simple_open (filename, FALSE); ++ g_free (filename); ++ if (rc) ++ { ++ if (xfce_rc_has_group (rc, "file-icons")) ++ { ++ xfce_rc_set_group (rc, "file-icons"); ++ showhome = xfce_rc_read_bool_entry (rc, "show-home", TRUE); ++ showfilesystem = xfce_rc_read_bool_entry (rc, "show-filesystem", TRUE); ++ showtrash = xfce_rc_read_bool_entry (rc, "show-trash", TRUE); ++ showremovable = xfce_rc_read_bool_entry (rc, "show-removable", TRUE); ++ } ++ xfce_rc_close (rc); ++ } ++ ++ if(MCS_SUCCESS == mcs_client_get_setting(mcs_client, "showhome", ++ BACKDROP_CHANNEL, &setting)) ++ { ++ xfce_desktop_set_show_special (desktop, XFCE_DESKTOP_SHOW_HOME, ++ setting->data.v_int); ++ mcs_setting_free(setting); ++ setting = NULL; ++ } else ++ xfce_desktop_set_show_special (desktop, XFCE_DESKTOP_SHOW_HOME, ++ showhome ? 1 : 0); ++ ++ if(MCS_SUCCESS == mcs_client_get_setting(mcs_client, "showfilesystem", ++ BACKDROP_CHANNEL, &setting)) ++ { ++ xfce_desktop_set_show_special (desktop, XFCE_DESKTOP_SHOW_FILESYSTEM, ++ setting->data.v_int); ++ mcs_setting_free(setting); ++ setting = NULL; ++ } else ++ xfce_desktop_set_show_special (desktop, XFCE_DESKTOP_SHOW_FILESYSTEM, ++ showfilesystem ? 1 : 0); ++ ++ if(MCS_SUCCESS == mcs_client_get_setting(mcs_client, "showtrash", ++ BACKDROP_CHANNEL, &setting)) ++ { ++ xfce_desktop_set_show_special (desktop, XFCE_DESKTOP_SHOW_TRASH, ++ setting->data.v_int); ++ mcs_setting_free(setting); ++ setting = NULL; ++ } else ++ xfce_desktop_set_show_special (desktop, XFCE_DESKTOP_SHOW_TRASH, ++ showtrash ? 1 : 0); ++ ++ if(MCS_SUCCESS == mcs_client_get_setting(mcs_client, "showremovable", ++ BACKDROP_CHANNEL, &setting)) ++ { ++ xfce_desktop_set_show_special (desktop, XFCE_DESKTOP_SHOW_REMOVABLE, ++ setting->data.v_int); ++ mcs_setting_free(setting); ++ setting = NULL; ++ } else ++ xfce_desktop_set_show_special (desktop, XFCE_DESKTOP_SHOW_REMOVABLE, ++ showremovable ? 1 : 0); + #endif + + for(i = 0; i < nmonitors; i++) { +@@ -414,6 +486,30 @@ + xfce_desktop_set_icon_font_size(desktop, setting->data.v_int); + return TRUE; + } ++ ++ if(!strcmp(setting->name, "showhome")) { ++ xfce_desktop_set_show_special(desktop, XFCE_DESKTOP_SHOW_HOME, ++ setting->data.v_int); ++ return TRUE; ++ } ++ ++ if(!strcmp(setting->name, "showfilesystem")) { ++ xfce_desktop_set_show_special(desktop, XFCE_DESKTOP_SHOW_FILESYSTEM, ++ setting->data.v_int); ++ return TRUE; ++ } ++ ++ if(!strcmp(setting->name, "showtrash")) { ++ xfce_desktop_set_show_special(desktop, XFCE_DESKTOP_SHOW_TRASH, ++ setting->data.v_int); ++ return TRUE; ++ } ++ ++ if(!strcmp(setting->name, "showremovable")) { ++ xfce_desktop_set_show_special(desktop, XFCE_DESKTOP_SHOW_REMOVABLE, ++ setting->data.v_int); ++ return TRUE; ++ } + #endif + + /* get the screen and monitor number */ --- xfdesktop4-4.4.2.orig/debian/patches/00_activate_menu_item.patch +++ xfdesktop4-4.4.2/debian/patches/00_activate_menu_item.patch @@ -0,0 +1,16 @@ +Index: src/menu.c +=================================================================== +--- xfdesktop4-4.4.2/src/menu.c (révision 26578) ++++ xfdesktop4-4.4.2/src/menu.c (copie de travail) +@@ -95,8 +95,10 @@ + if(!xfdesktop_popup_grab_available(root, time)) + g_critical("Unable to get keyboard/mouse grab. Unable to popup desktop menu"); + else { ++ /* Bug#3652: for some reason passing the correct button here breaks on ++ * some systems but not others. always pass 0 for now. */ + gtk_menu_popup(GTK_MENU(menu_widget), NULL, NULL, NULL, NULL, +- button, time); ++ 0, time); + } + #endif + } --- xfdesktop4-4.4.2.orig/debian/patches/04_fix-CRITICAL-register-message-startup.patch +++ xfdesktop4-4.4.2/debian/patches/04_fix-CRITICAL-register-message-startup.patch @@ -0,0 +1,15 @@ +Index: xfdesktop/src/main.c +=================================================================== +--- xfdesktop/src/main.c (revision 26631) ++++ xfdesktop/src/main.c (revision 26632) +@@ -382,8 +382,8 @@ + windowlist_set_show_icons(desktop_gtk_menu_images); + + if(mcs_client) { +- settings_register_callback(menu_settings_changed, NULL); +- settings_register_callback(windowlist_settings_changed, NULL); ++ settings_register_callback(menu_settings_changed, desktops[0]); ++ settings_register_callback(windowlist_settings_changed, desktops[0]); + } + + signal(SIGHUP, sighandler_cb); --- xfdesktop4-4.4.2.orig/debian/patches/05_fix-build-with-Bsymbolic-functions.patch +++ xfdesktop4-4.4.2/debian/patches/05_fix-build-with-Bsymbolic-functions.patch @@ -0,0 +1,11 @@ +--- xfdesktop4-4.4.2.orig/modules/menu/desktop-menuspec.h ++++ xfdesktop4-4.4.2/modules/menu/desktop-menuspec.h +@@ -82,6 +82,6 @@ + * @param paths A GPtrArray obtained from either menuspec_get_path_simple() or + * menuspec_get_path_multilevel(). + */ +-G_INLINE_FUNC void desktop_menuspec_path_free(GPtrArray *paths); ++void desktop_menuspec_path_free(GPtrArray *paths); + + #endif /* ifdef __MENUSPEC_H__ */ + --- xfdesktop4-4.4.2.orig/debian/patches/03_fix-memory-leak.patch +++ xfdesktop4-4.4.2/debian/patches/03_fix-memory-leak.patch @@ -0,0 +1,34 @@ +Index: xfce_4_4/modules/menu/desktop-menu-dentry.c +=================================================================== +--- xfce_4_4/modules/menu/desktop-menu-dentry.c (revision 26634) ++++ xfce_4_4/modules/menu/desktop-menu-dentry.c (revision 26635) +@@ -173,6 +173,7 @@ + if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0) + break; + } ++ g_list_free(items); + + gtk_menu_shell_insert(menu_shell, mi, i); + +Index: xfce_4_4/modules/menu/desktop-menuspec.c +=================================================================== +--- xfce_4_4/modules/menu/desktop-menuspec.c (revision 26651) ++++ xfce_4_4/modules/menu/desktop-menuspec.c (revision 26652) +@@ -203,7 +203,7 @@ + else + foundcat = NULL; + if(!foundcat) { +- g_ptr_array_free(revpath, FALSE); ++ g_ptr_array_free(revpath, TRUE); + revpath = NULL; + break; + } +@@ -220,7 +220,7 @@ + newpath[totlen] = 0; + + g_ptr_array_add(mtfpi->paths, newpath); +- g_ptr_array_free(revpath, FALSE); ++ g_ptr_array_free(revpath, TRUE); + } + } + } --- xfdesktop4-4.4.2.orig/debian/patches/02_use_eject_where_needed.patch +++ xfdesktop4-4.4.2/debian/patches/02_use_eject_where_needed.patch @@ -0,0 +1,42 @@ +diff -ru xfdesktop4-4.4.2.orig/src/xfdesktop-volume-icon.c xfdesktop4-4.4.2/src/xfdesktop-volume-icon.c +--- xfdesktop4-4.4.2.orig/src/xfdesktop-volume-icon.c 2007-11-17 20:31:41.000000000 +0100 ++++ xfdesktop4-4.4.2/src/xfdesktop-volume-icon.c 2007-12-12 01:07:27.421327344 +0100 +@@ -562,19 +562,7 @@ + icon); + } + +- mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume")); +- gtk_widget_show(mi); +- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); +- if(!thunar_vfs_volume_is_mounted(volume)) +- gtk_widget_set_sensitive(mi, FALSE); +- else { +- g_signal_connect(G_OBJECT(mi), "activate", +- G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount), +- icon); +- } +- +- if(thunar_vfs_volume_is_disc(volume) +- && thunar_vfs_volume_is_ejectable(volume)) ++ if(thunar_vfs_volume_is_ejectable(volume)) + { + mi = gtk_image_menu_item_new_with_mnemonic(_("E_ject Volume")); + gtk_widget_show(mi); +@@ -582,6 +570,17 @@ + g_signal_connect(G_OBJECT(mi), "activate", + G_CALLBACK(xfdesktop_volume_icon_menu_eject), + icon); ++ } else { ++ mi = gtk_image_menu_item_new_with_mnemonic(_("_Unmount Volume")); ++ gtk_widget_show(mi); ++ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); ++ if(!thunar_vfs_volume_is_mounted(volume)) ++ gtk_widget_set_sensitive(mi, FALSE); ++ else { ++ g_signal_connect(G_OBJECT(mi), "activate", ++ G_CALLBACK(xfdesktop_volume_icon_menu_toggle_mount), ++ icon); ++ } + } + + mi = gtk_separator_menu_item_new(); --- xfdesktop4-4.4.2.orig/config.guess +++ xfdesktop4-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