--- xfce4-utils-4.4.2.orig/debian/changelog +++ xfce4-utils-4.4.2/debian/changelog @@ -0,0 +1,544 @@ +xfce4-utils (4.4.2-4ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - switch to cdbs + - debian/control: + + b-d on autotools-dev, debhelper (>= 5), cdbs and drop chrpath + + adhere to DebianMaintainerField + - debian/patches/00_xdg_data_dirs.patch: + make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set + - debian/patches/02_xfce4-about_return_version.patch: + patch to print Xfce4 version when passed arg "--xfce-version" as part of + the about-this-computer spec + - debian/rules: pass --enable-dbus --with-vendor-info=Ubuntu to ./configure + - debian/compat: bump to 5. + * debian/control: + - drop quilt from b-d + - do not depend on exo-utils (not in the archive yet). + * debian/patches/series: dropped. + + -- Lionel Le Folgoc Sun, 27 Jan 2008 11:21:56 +0100 + +xfce4-utils (4.4.2-4) unstable; urgency=low + + * debian/Debian: changed email address for About Box. + * debian/patches: + - 01_xflock4-test-running-screensaver added, test the running screensaver + instead of the installed ones. + * debian/rules: + - include quilt patch system. + - activate x support at configure time. + - remove useless replace for xterm in xfterm4 (use exo-open by default). + * debian/control: + - build-dep on quilt. + - dep on exo-utils as we use some tools in this package. + - build-dep against libdbus-1-dev and libdbus-glib-1-dev to add dbus + support to xfrun. Add dbus to Recommends: accordingly. + + -- Yves-Alexis Perez Sat, 26 Jan 2008 13:46:58 +0100 + +xfce4-utils (4.4.2-3ubuntu3) hardy; urgency=low + + * debian/rules, debian/Ubuntu: install missing vendor infos. (LP: #177742) + + -- Lionel Le Folgoc Sun, 23 Dec 2007 01:39:54 +0100 + +xfce4-utils (4.4.2-3ubuntu2) hardy; urgency=low + + * debian/patches/02_xfce4-about_return_version.patch: + . Created patch to print Xfce4 version when passed + arg "--xfce-version" as part of the about-this-computer + spec. + + -- Cody A.W. Somerville Sat, 15 Dec 2007 15:35:46 -0400 + +xfce4-utils (4.4.2-3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - switch to cdbs + - debian/control: + + b-d on autotools-dev, debhelper (>= 5), cdbs & libdbus-glib-1-dev, and + drop chrpath + + adhere to DebianMaintainerField + + recommends dbus + - debian/patches/00_xdg_data_dirs.patch: + make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set + - debian/rules: pass --enable-dbus --with-vendor-info=Ubuntu + - debian/compat: bump to 5. + + -- Lionel Le Folgoc Sat, 08 Dec 2007 23:08:12 +0100 + +xfce4-utils (4.4.2-3) unstable; urgency=low + + * The “brown paper bag” release. + * debian/control: depend on x11-xserver-utils and not x11-servers-utils… + + -- Yves-Alexis Perez Sat, 08 Dec 2007 22:43:10 +0100 + +xfce4-utils (4.4.2-2) unstable; urgency=low + + * debian/control: + - rewrite long description (include startxfce4) + - updated standard versions to 3.7.3. + - add dependencies on xinit and x11-server-utils because startxfce4 need + them. closes: #454985 + - add my debian.org email address to uploader field. + - drop dpatch build-dep as we don't have patches anymore. + * debian/rules: remove dpatch rules include. + + -- Yves-Alexis Perez Sat, 08 Dec 2007 19:09:48 +0100 + +xfce4-utils (4.4.2-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - switch to cdbs + - debian/control: + + b-d on cdbs & libdbus-glib-1-dev, and drop chrpath & dpatch + + adhere to DebianMaintainerField + + recommends dbus + - debian/patches/00_xdg_data_dirs.patch: + make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set + - debian/rules: pass --enable-dbus. + * debian/patches: + - 00_xdg_data_dirs.patch: updated + - 01_gnome_screensaver.patch: dropped. + * debian/compat: bump to 5. + * debian/control: bump debhelper b-d to (>= 5), add autotools-dev. + * debian/rules: pass --with-vendor-info=Ubuntu. + + -- Lionel Le Folgoc Sat, 08 Dec 2007 14:00:35 +0100 + +xfce4-utils (4.4.2-1) unstable; urgency=low + + [ Yves-Alexis Perez ] + * New upstream release. + * debian/rules: + - don't ignore all make errors at clean stage. + - fix parallel builds. + + [ Simon Huggins ] + * Add Vcs-* headers to debian/control + + -- Yves-Alexis Perez Sun, 02 Dec 2007 11:31:33 +0100 + +xfce4-utils (4.4.1-3ubuntu2) hardy; urgency=low + + * debian/patches/01_gnome_screensaver.patch: correctly check for + gnome-screensaver, thanks Camille Dominique for the patch. (LP: #161758) + + -- Lionel Le Folgoc Sat, 10 Nov 2007 22:04:16 +0100 + +xfce4-utils (4.4.1-3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - debian/patches/00_xdg_data_dirs.patch: + make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set + - debian/patches/01_gnome_screensaver.patch: + try launching gnome-screensaver first, fall back to xscreensaver + + -- Gauvain Pocentek Fri, 26 Oct 2007 22:53:38 +0200 + +xfce4-utils (4.4.1-3) unstable; urgency=low + + * 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. + * debian/menu: Remove leftover \ closes: #447282 + + -- Simon Huggins Sun, 21 Oct 2007 09:12:27 +0100 + +xfce4-utils (4.4.1-2) unstable; urgency=low + + (Yves-Alexis Perez) + * debian/xfterm4.1, debian/xfce4-utils.1: update bug reporting address in + manpage. + * debian/menu: switch to new menu policy. + * debian/postinst: use posix kill -s to avoid problems on hurd. + (Simon Huggins) + * debian/rules: fixup mistake in startxfce4 that stops local panel plugins + working closes: #427918 + * Recommend a screensaver so that xflock4 works (first reported by Cyril + Brulebois in 2006 and shamefully not fixed til now, sorry) closes: #430288 + + -- Yves-Alexis Perez Mon, 08 Oct 2007 14:46:40 +0100 + +xfce4-utils (4.4.1-1ubuntu5) gutsy; urgency=low + + * debian/patches/00_xdg_data_dirs.patch: + make sure to add /etc/xdg/xubuntu even if XDG_DATA_DIRS is already set + * debian/patches/01_gnome_screensaver.patch: + fix test for return value of executing gnome-screensaver + + -- Jani Monoses Thu, 04 Oct 2007 23:13:05 +0200 + +xfce4-utils (4.4.1-1ubuntu4) gutsy; urgency=low + + * debian/patches/01_gnome_screensaver.patch: updated, also patch xflock4 to + run gnome-screensaver if present (thanks Marcin Gąsiorowski). + + -- Lionel Le Folgoc Tue, 25 Sep 2007 20:36:32 +0200 + +xfce4-utils (4.4.1-1ubuntu3) gutsy; urgency=low + + * debian/patches/00_xdg_data_dirs.patch: + Do not add /usr/share twice to $XDG_DATA_DIRS + + -- Jani Monoses Tue, 11 Sep 2007 15:21:02 +0200 + +xfce4-utils (4.4.1-1ubuntu2) gutsy; urgency=low + + * debian/patches/01_gnome_screensaver.patch: + Try launching gnome-screensaver first, fall back to xscreensaver + + -- Jani Monoses Tue, 28 Aug 2007 16:17:19 +0200 + +xfce4-utils (4.4.1-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - use xfce.mk + - 00_xdg_data_dirs.patch: add specific xubuntu config dir + - keep using firefox as browser in xfbrowser4 + * Updated Maitainer field + + -- Gauvain Pocentek Fri, 4 May 2007 11:52:10 +0200 + +xfce4-utils (4.4.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: added versionned build-dep against gtk2.10. + * debian/startxfce4.1: correct path. closes: #416943 + * documentation provided is now for 4.4. closes: #372846 + * debian/copyright: update copyright holders. + + -- Yves-Alexis Perez Sun, 15 Apr 2007 15:28:17 +0100 + +xfce4-utils (4.4.0-1) experimental; urgency=low + + (Yves-Alexis Perez) + * New upstream release. + * debian/control: updated build deps against Xfce 4.4. + * Provide a missing manpage for xfbrowser4. + * Use iceweasel instead of firefox in the static browser list of xfbrowser4. + + (Emanuele Rocca) + * Empty TODO file removed. + + -- Yves-Alexis Perez Thu, 25 Jan 2007 00:12:53 +0100 + +xfce4-utils (4.4.0-0ubuntu1) feisty; urgency=low + + * New upstream release + * debian/rules: do not remove the COPYING file, used by xfce4-about + LP #75158 + * Thighten B-D versions + + -- Gauvain Pocentek Tue, 23 Jan 2007 10:27:02 +0100 + +xfce4-utils (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: moved thunar to Recommends. Updated description + accordingly. Closes: #397085 + + -- Yves-Alexis Perez Thu, 16 Nov 2006 15:30:02 +0100 + +xfce4-utils (4.3.99.2-0ubuntu1) feisty; urgency=low + + * New upstream release (4.4RC2) + * Bump standards version and Xfce libs versions (B-D) + * Remove extra license file + + -- Gauvain Pocentek Thu, 9 Nov 2006 14:53:37 +0100 + +xfce4-utils (4.3.99.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: updated build-dep against Xfce 4.4RC1 (4.3.99.1). + * xfmountdev4: use thunar instead of xftree4 + + -- Yves-Alexis Perez Sat, 23 Sep 2006 13:43:02 +0100 + +xfce4-utils (4.3.90.2svn+r22590-0ubuntu2) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Thu, 24 Aug 2006 18:22:55 +0200 + +xfce4-utils (4.3.90.2svn+r22590-0ubuntu1) edgy; urgency=low + + * Upstream svn snapshot + * debian/patches/00_xdg_data_dirs: the only change left compared + to upstream is setting custom XDG_DATA_DIRS + + -- Jani Monoses Mon, 31 Jul 2006 16:00:23 +0300 + +xfce4-utils (4.3.90.2-1) unstable; urgency=low + + (Yves-Alexis Perez) + * New upstream release. + * 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 Mon, 10 Jul 2006 19:19:54 +0200 + +xfce4-utils (4.3.90.1svn+r21673-0ubuntu2) dapper; urgency=low + + * Make the command inherit the directory where xfrun4 was invoked, + do not start it in the filesystem root (LP #45179) + + -- Jani Monoses Sat, 20 May 2006 12:01:25 +0300 + +xfce4-utils (4.3.90.1svn+r21673-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (set XDG_DATA_DIRS, add Czech translation) + * Prepend /etc/xdg/xubuntu to XDG_DATA_DIRS so we can override default + MIME handlers in /usr/share/applications/defaults.list + + -- Jani Monoses Mon, 15 May 2006 17:14:15 +0300 + +xfce4-utils (4.3.90.1svn+r21596-0ubuntu1) dapper; urgency=low + + * Fix cancel button disappearing on click (LP bug #43277) + + -- Jani Monoses Mon, 8 May 2006 15:57:20 +0300 + +xfce4-utils (4.3.90.1svn+r21415-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Enable xfrun4 called via dbus and Recommend dbus + * Remove postinst/prerm which restart xfce-mcs-manager + + -- Jani Monoses Mon, 1 May 2006 13:24:11 +0300 + +xfce4-utils (4.3.90.1svn+r21203-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (4.4 beta1) + * Revert last change since xfdesktop creates ~/Desktop now + + -- Jani Monoses Mon, 24 Apr 2006 16:27:04 +0300 + +xfce4-utils (4.3.90.1-1) unstable; urgency=low + + * New upstream release + + -- Yves-Alexis Perez Wed, 03 May 2006 18:35:05 +0100 + +xfce4-utils (4.3.0svn+r20782-0ubuntu2) dapper; urgency=low + + * Create ~/Desktop in xinitrc if that directory does not exist + for the current user + + -- Jani Monoses Wed, 19 Apr 2006 21:34:14 +0300 + +xfce4-utils (4.3.0svn+r20782-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot (fixes LP #31556) + + -- Jani Monoses Fri, 7 Apr 2006 08:45:25 +0300 + +xfce4-utils (4.3.0svn+r20393-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Add translation domain entry to .desktop files + * Switch to CDBS + * Remove obsolete xinerama patch and postrm + + -- Jani Monoses Tue, 14 Mar 2006 11:31:14 +0200 + +xfce4-utils (4.3.0svn+r19871-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * Bump all depends to 4.3 + + -- Jani Monoses Wed, 15 Feb 2006 16:20:37 +0200 + +xfce4-utils (4.3.0svn+r19850-0ubuntu1) dapper; urgency=low + + * Upstream svn snapshot + * UVF exception granted + + -- Jani Monoses Wed, 15 Feb 2006 12:52:05 +0200 + +xfce4-utils (4.2.3-2) unstable; urgency=low + + * Fix for X11R7; stop depending on xlibs-static-* + + -- Simon Huggins Mon, 17 Apr 2006 18:14:48 +0100 + +xfce4-utils (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 + * Move sysconfdir to /etc/xdg as per rest of the packages + + -- Yves-Alexis Perez Sun, 27 Nov 2005 11:58:10 +0000 + +xfce4-utils (4.2.2-1) unstable; urgency=low + + * Simon Huggins + - New Upstream Release + - Change suite to unstable + * Emanuele Rocca + - Remove Depends on debianutils, it is Essential + - Remove chmod +x for files in bin/, it's the job of dh_fixperms + - Actually, etc/X11/xdg/xfce4/xinitrc needs to be chmodded + - Add lintian override: usr/share/xfce4/COPYING is not useless + - Add manpage for startxfce4 + * Rudy Godoy + - Spelling fix for Xfce name + + -- Simon Huggins Sat, 18 Jun 2005 09:44:35 +0100 + +xfce4-utils (4.2.1-1) experimental; urgency=low + + * ML: New Upstream Release (Xfce 4.2.1) + * ML: Upload to experimental to prevents problems with NEW packages + * ML: debian/control: Added Maintainer/Uploaders fields + + -- Martin Loschwitz Sat, 19 Mar 2005 13:02:00 +0100 + +xfce4-utils (4.2.0-2) experimental; urgency=low + + * Add --enable-final to configure. + * Add a Homepage: to the description + * Ship README AUTHORS and NEWS too. + * Stop rebuilding the docs - we don't do this anywhere else as upstream + should have built them in their tarballs. + + -- Simon Huggins Sun, 16 Jan 2005 16:45:32 +0000 + +xfce4-utils (4.2.0-1) experimental; urgency=low + + * New Upstream Release + + -- Simon Huggins Sat, 15 Jan 2005 12:00:40 +0000 + +xfce4-utils (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:28:00 +0100 + +xfce4-utils (4.0.6-1) unstable; urgency=low + + * New upstream release + * Reworked the description a bit + * Use a better way to use x-terminal-emulator not xterm in xfterm4 + + -- Simon Huggins Mon, 19 Jul 2004 19:43:03 +0100 + +xfce4-utils (4.0.5-3) unstable; urgency=low + + * Add patch from Michael Banck to disable libgtkhtml2 on Hurd closes: #254384 + * Use sensible-browser instead of mozilla (add Depends: debianutils) + closes: #254231 + * Remove Norbert Tretkowski from uploaders as requested + + -- Simon Huggins Sat, 03 Jul 2004 18:25:07 +0100 + +xfce4-utils (4.0.5-2) unstable; urgency=low + + * gdm's changelog lies. /etc/dm/Sessions isn't supported by KDM. Put the + desktop file in /usr/share/xsessions instead + + -- Simon Huggins Tue, 04 May 2004 21:03:07 +0100 + +xfce4-utils (4.0.5-1) unstable; urgency=low + + * New upstream release + * Update upstream's libtool + * Correct path to docs in manpage + * Put back startxfce4 and /etc/X11/xfce4/xinitrc. Upstream want this and I + can see no reason to exclude it. + * Update xlibs-pic dependency to xlibs-static-pic + * Install upstream's xfce.desktop to actually give us a gdm session under + the new gdm closes: #241080 + * Since we're installing this desktop file, add a postrm to remove it on purge + * Add a Suggests on xfce4-session since this will improve the desktop file + + -- Simon Huggins Sun, 02 May 2004 17:20:21 +0100 + +xfce4-utils (4.0.3-2) unstable; urgency=low + + * Update libtool closes: #237339 + * Just adding Daniel wasn't enough. Add self to Uploaders so katie doesn't + think this is an NMU again. + + -- Simon Huggins Tue, 09 Mar 2004 13:49:04 +0000 + +xfce4-utils (4.0.3-1) unstable; urgency=low + + * New Upstream release. + * Add Daniel Silverstone to Uploaders as approved by + madkiss + * Change xfterm4 to use x-terminal-emulator by default and Depend: on + xterm|x-terminal-emulator closes: #217204 + * Add manpage for xfterm4 closes: #221834 + * Add generic manpage for xfce4-utils refering to the upstream docs and + link their specific manpages to it + * Remove the .la and .a files from mcs-plugins + * Quote needs in menu for lintian + * Thanks to Daniel for checking and uploading these packages + + -- Simon Huggins Wed, 25 Feb 2004 11:24:58 +0000 + +xfce4-utils (4.0.2-1) unstable; urgency=low + + * New Upstream release. + * Added Build-Dependency for xlibs-pic (Closes: #215592) + + -- Martin Loschwitz Fri, 26 Dec 2003 16:51:00 +0100 + +xfce4-utils (4.0.0.final-1) unstable; urgency=low + + * New Upstream release. + * New Co-Maintainer: Norbert Tretkowski. + * Various cleanups in debian/ subdirectory. + * Bumped Standards-Version to 3.6.1 (no changes). + + -- Martin Loschwitz Tue, 29 Sep 2003 17:27:00 +0200 + +xfce4-utils (4.0.0+cvs.20030421-1) unstable; urgency=low + + * New CVS checkout (2003-04-21) + + -- Martin Loschwitz Mon, 21 Apr 2003 19:44:00 +0200 + +xfce4-utils (4.0.0+cvs.20030301-1) unstable; urgency=low + + * New CVS checkout (Using Xfce CVS, 2003-03-01) + * Official release (really this time!) (last release was never made public) + * debian/control: Changed Maintainer e-mail address + + -- Martin Loschwitz Sat, 01 Mar 2003 14:52:00 +0100 + +xfce4-utils (4.0.0+cvs.20030216-1) unstable; urgency=low + + * New CVS checkout (Using Xfce CVS, 2003-02-16) + * Official release (last release was never made public) + + -- Martin Loschwitz Sun, 16 Feb 2003 13:21:00 +0100 + +xfce4-utils (4.0.0+cvs.20030119-1) unstable; urgency=low + + * New CVS checkout (Using Xfce4 CVS, 2003-01-19) + + -- Martin Loschwitz Sun, 19 Jan 2003 18:48:00 +0100 + +xfce4-utils (4.0.0+cvs.20021222-1) unstable; urgency=low + + * New CVS checkout (using Xfce4 CVS, 2002-12-22) + * debian/control: Made some Suggests: being Recommends: + + -- Martin Loschwitz Sun, 22 Dec 2002 16:08:00 +0100 + +xfce4-utils (4.0.0+cvs.20021127-1) unstable; urgency=low + + * Initial Release. (Closes: #166636) + + -- Martin Loschwitz Wed, 27 Nov 2002 18:25:00 +0100 --- xfce4-utils-4.4.2.orig/debian/watch +++ xfce4-utils-4.4.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.xfce.org/archive/xfce-(.*)/src/ \ + xfce-utils-(.*)\.tar\.bz2 --- xfce4-utils-4.4.2.orig/debian/rules +++ xfce4-utils-4.4.2/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/class/xfce.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-final --enable-dbus --with-vendor-info=Ubuntu --with-x +DEB_INSTALL_MANPAGES_xfce4-utils := debian/startxfce4.1 \ + debian/xfce4-utils.1 \ + debian/xfterm4.1 \ + debian/xfbrowser4.1 + +binary-post-install/xfce4-utils:: + rm -f debian/xfce4-utils/usr/lib/xfce4/*/*a + install -d debian/xfce4-utils/usr/share/xsessions + install -m 644 gdm/xfce.desktop debian/xfce4-utils/usr/share/xsessions/xfce4.desktop + install -m 644 debian/Ubuntu debian/xfce4-utils/usr/share/xfce4/ --- xfce4-utils-4.4.2.orig/debian/lintian-override +++ xfce4-utils-4.4.2/debian/lintian-override @@ -0,0 +1,4 @@ +# usr/share/xfce4/COPYING is necessary + +xfce4-utils binary: extra-license-file usr/share/xfce4/COPYING +xfce4-utils binary: extra-license-file usr/share/xfce4/COPYING.vi --- xfce4-utils-4.4.2.orig/debian/startxfce4.1 +++ xfce4-utils-4.4.2/debian/startxfce4.1 @@ -0,0 +1,41 @@ +.\" Copyright (c) 2005 Emanuele Rocca +.TH STARTXFCE4 "1" "June 2005" "startxfce4" "User Commands" +.SH NAME +startxfce4 \- initialize an Xfce session +.SH SYNOPSIS +.B startxfce4 +.SH DESCRIPTION +.PP +.B startxfce4 +is a script responsible for starting an Xfce session. It runs +.B xinit +passing the file specified in the +.B FILES +subsection as an argument. +.P +You may want to modify the default +.B xinitrc +file. In order to do that, copy +.I /etc/xdg/xfce4/xinitrc +to +.I ~/.config/xfce4/xinitrc +and modify that file. +.SH FILES +.PP +.IP ~/.config/xfce4/xinitrc +User configuration file +.IP /etc/X11/xdg/xfce4/xinitrc +System wide configuration file +.SH SEE ALSO +.PP +.BR xfce4-session (1), +.BR xinit (1), +.BR dbus-launch (1), +.BR ssh-agent (1), +.BR file:///usr/share/xfce4/doc/C/xfce4-use.html#xfce4-getting-started +.SH COPYRIGHT +Copyright \(co 2005 Emanuele Rocca +.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-utils-4.4.2.orig/debian/xfbrowser4.1 +++ xfce4-utils-4.4.2/debian/xfbrowser4.1 @@ -0,0 +1,19 @@ +.\" Copyright (C) 2007 Yves-Alexis Perez +.TH XFBROWSER4 "1" "January 2005" "xfce4_setup 0.1" "User Commands" +.SH NAME +xfbrowser4 \- wrapper script to run user defined browser +.SH SYNOPSIS +.B xfbrowser4 +.SH DESCRIPTION +.PP +Try to find and run an user-defined browser via $BROWSER variable, preferred +applications settings (in Xfce) or default to a static browser list. +.SH AUTHOR +Written by Yves-Alexis Perez +.SH "REPORTING BUGS" +Report bugs to http://bugs.debian.org +.SH COPYRIGHT +Copyright \(co 2007 Yves-Alexis Perez +.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-utils-4.4.2.orig/debian/menu +++ xfce4-utils-4.4.2/debian/menu @@ -0,0 +1,12 @@ +?package(xfce4-utils): needs="X11" section="Applications/System/Administration" \ + command="xfrun4" title="XFrun4" longtitle="XFce application start tool" \ + hints="Start tool" +?package(xfce4-utils): needs="text" section="Applications/Terminal Emulators" \ + command="xfterm4" title="Xfterm4" \ + longtitle="Launch script for terminal" hints="Start terminal" +?package(xfce4-utils): needs="text" section="Screen/Locking" command="xflock4" \ + title="Xflock4" longtitle="Locks the screen" hints="Screenlock" +?package(xfce4-utils): needs="X11" section="Help" command="xfhelp4" \ + title="Xfhelp4" longtitle="Shows help on XFce4" hints="Help" +?package(xfce4-utils): needs="X11" section="Help" command="xfce4-about" \ + title="Xfce4-about" longtitle="Shows infos on XFce4" hints="About Xfce4" --- xfce4-utils-4.4.2.orig/debian/Debian +++ xfce4-utils-4.4.2/debian/Debian @@ -0,0 +1,10 @@ +Debian Xfce Team is + +Co maintainers are: + +Simon Huggins +Yves-Alexis Perez +Emanuele Rocca + +Bugs should be reported to Debian BTS at: http://bugs.debian.org or using +reportbug. --- xfce4-utils-4.4.2.orig/debian/patches/00_xdg_data_dirs.patch +++ xfce4-utils-4.4.2/debian/patches/00_xdg_data_dirs.patch @@ -0,0 +1,15 @@ +diff -Nur xfce4-utils-4.4.1/scripts/startxfce4.in xfce4-utils-4.4.1.new/scripts/startxfce4.in +--- xfce4-utils-4.4.1/scripts/startxfce4.in 2007-04-02 07:34:54.000000000 +0200 ++++ xfce4-utils-4.4.1.new/scripts/startxfce4.in 2007-10-04 23:16:56.000000000 +0200 +@@ -28,9 +28,9 @@ + + if test "x$XDG_DATA_DIRS" = "x" + then +- XDG_DATA_DIRS="/usr/local/share:/usr/share:@datadir@" ++ XDG_DATA_DIRS="/etc/xdg/xubuntu:/usr/local/share:/usr/share:@datadir@" + else +- XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@" ++ XDG_DATA_DIRS="/etc/xdg/xubuntu:$XDG_DATA_DIRS:@datadir@" + fi + export XDG_DATA_DIRS + --- xfce4-utils-4.4.2.orig/debian/patches/01_xflock4-test-running-screensaver.patch +++ xfce4-utils-4.4.2/debian/patches/01_xflock4-test-running-screensaver.patch @@ -0,0 +1,14 @@ +--- xfce4-utils-4.4.2/scripts/xflock4.orig 2007-11-17 20:31:32.000000000 +0100 ++++ xfce4-utils-4.4.2/scripts/xflock4 2008-01-08 23:49:22.000000000 +0100 +@@ -19,9 +19,9 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # + +-if test x"`which xscreensaver-command 2>/dev/null`" != x""; then ++if ps aux | grep x[s]creensaver > /dev/null 2>&1; then + xscreensaver-command -lock +-elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then ++elif ps aux | grep gnome-[s]creensaver > /dev/null 2>&1; then + gnome-screensaver-command --lock + else + xlock $* --- xfce4-utils-4.4.2.orig/debian/patches/02_xfce4-about_return_version.patch +++ xfce4-utils-4.4.2/debian/patches/02_xfce4-about_return_version.patch @@ -0,0 +1,20 @@ +diff -Nur xfce4-utils-4.4.2/xfce4-about/info.c xfce4-utils-4.4.2.new/xfce4-about/info.c +--- xfce4-utils-4.4.2/xfce4-about/info.c 2007-11-17 15:31:32.000000000 -0400 ++++ xfce4-utils-4.4.2.new/xfce4-about/info.c 2007-12-15 17:49:17.000000000 -0400 +@@ -388,6 +389,16 @@ + GtkWidget *info_ok_button; + GtkWidget *info_help_button; + GdkPixbuf *logo_pb; ++ ++ if(argc >= 2 && !strcmp(argv[1], "--xfce-version")) ++ { ++#ifdef RELEASE_LABEL ++ g_printf("%s (%s)\n", xfce_version_string(), RELEASE_LABEL); ++#else ++ g_printf("%s\n", xfce_version_string()); ++#endif ++ exit(0); ++ } + + xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); + --- xfce4-utils-4.4.2.orig/debian/postinst +++ xfce4-utils-4.4.2/debian/postinst @@ -0,0 +1,10 @@ +#!/bin/sh -e + +if [ "$1" = "configure" ]; then + # Get xfce-mcs-manager to reinit + kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1|| true +fi + +#DEBHELPER# + +exit 0 --- xfce4-utils-4.4.2.orig/debian/postrm +++ xfce4-utils-4.4.2/debian/postrm @@ -0,0 +1,7 @@ +#!/bin/sh +set -e + +if [ "$1" = "purge" ]; then + rm -f /etc/dm/Sessions/xfce4.desktop +fi +#DEBHELPER# --- xfce4-utils-4.4.2.orig/debian/copyright +++ xfce4-utils-4.4.2/debian/copyright @@ -0,0 +1,40 @@ +This package was debianized by Martin Loschwitz on +Fri, 11 Oct 2002 17:26:39 +0200. + +It was downloaded from http://xfce.sourceforge.net/ + +Upstream Author are: +Jasper Huijsmans and +Olivier Fourdan +Benedikt Meurer +Xavier Maillard +Brian J. Tarricone + +Copyright holders: +xfrun: Copyright (c) 2006 Brian J. Tarricone +xfce4-about: Copyright (C) 1999-2007 Olivier Fourdan (fourdan@xfce.org) +xfhelp4: Copyright (C) 1999 Olivier Fourdan (fourdan@xfce.org) + Copyright (C) 2003 Jasper Huijsmans (jasper@xfce.org) +startxfce4: Copyright (C) 1996-2003 Olivier Fourdan (fourdan@xfce.org) +xflock4: Copyright (C) 1999, 2003 Olivier Fourdan (fourdan@xfce.org) +xfmountdev4: Copyright (C) 1999 Olivier Fourdan (fourdan@xfce.org) + +xfce4-user-guide is: (c) 2006 Jasper Huijsmans + +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'. --- xfce4-utils-4.4.2.orig/debian/compat +++ xfce4-utils-4.4.2/debian/compat @@ -0,0 +1 @@ +5 --- xfce4-utils-4.4.2.orig/debian/xfterm4.1 +++ xfce4-utils-4.4.2/debian/xfterm4.1 @@ -0,0 +1,24 @@ +.\" Copyright (C) 2004 Simon Huggins +.TH XFTERM4 "1" "February 2004" "xfce4_setup 0.1" "User Commands" +.SH NAME +xfterm4 \- terminal emulator script enhanced by the xfce4-panel +.SH SYNOPSIS +.B xfterm4 +.SH DESCRIPTION +.PP +Runs a terminal emulator \- normally x-terminal-emulator which can be set by +\fBupdate-alternatives\fR(8). +.br +When +.B xfterm4 +is run in the panel you can drag files or directories to it and have them +viewed by appropriate applications. +.SH AUTHOR +Written by Simon Huggins +.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-utils-4.4.2.orig/debian/xfce4-utils.1 +++ xfce4-utils-4.4.2/debian/xfce4-utils.1 @@ -0,0 +1,18 @@ +.\" Copyright (C) 2004 Simon Huggins +.TH XFCE4-UTILS "1" "February 2004" "xfce4_setup 0.1" "User Commands" +.SH NAME +xfce4-utils \- various XFce 4 utilities +.SH SYNOPSIS +.B xfce4-utils +.SH DESCRIPTION +.PP +These are various utilities which form part of the XFce desktop environment +.SH "SEE ALSO" +See /usr/share/xfce4/doc/C/xfce-utils.html for more information +.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-utils-4.4.2.orig/debian/xfce4-utils.links +++ xfce4-utils-4.4.2/debian/xfce4-utils.links @@ -0,0 +1,6 @@ +/usr/share/man/man1/xfce4-utils.1.gz /usr/share/man/man1/xfrun4.1.gz +/usr/share/man/man1/xfce4-utils.1.gz /usr/share/man/man1/xftaskbar4.1.gz +/usr/share/man/man1/xfce4-utils.1.gz /usr/share/man/man1/xflock4.1.gz +/usr/share/man/man1/xfce4-utils.1.gz /usr/share/man/man1/xfmountdev4.1.gz +/usr/share/man/man1/xfce4-utils.1.gz /usr/share/man/man1/xfhelp4.1.gz +/usr/share/man/man1/xfce4-utils.1.gz /usr/share/man/man1/xfce4-about.1.gz --- xfce4-utils-4.4.2.orig/debian/control +++ xfce4-utils-4.4.2/debian/control @@ -0,0 +1,24 @@ +Source: xfce4-utils +Section: x11 +Priority: optional +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers +Uploaders: Martin Loschwitz , Emanuele Rocca , Simon Huggins , Yves-Alexis Perez +Build-Depends: autotools-dev, cdbs, debhelper (>= 5), libgtk2.0-dev (>= 2.10.6), libxft-dev, xfce4-mcs-manager-dev (>= 4.4.2), libdbus-glib-1-dev, libdbus-1-dev +Standards-Version: 3.7.3 +Homepage: http://www.xfce.org/ +Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-utils/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-utils/ + +Package: xfce4-utils +Architecture: any +Depends: ${shlibs:Depends}, xterm|x-terminal-emulator, x11-xserver-utils, xinit +Recommends: xfwm4, xfce4-panel, thunar, xscreensaver | xlockmore | xlockmore-gl, dbus +Suggests: xfce4-session +Description: Various tools for Xfce + This package contains xfrun4, xfterm4, xflock4, xfmountdev4, xfbrowser4, + startxfce4, xfhelp4, xfce4-about, eight tools for Xfce. Xfce is a desktop + environment that uses the GTK+ library and isn't resource-hungry. + . + If you want to use xfmountdev4, be sure to install Thunar before because it's + called by it. --- xfce4-utils-4.4.2.orig/debian/Ubuntu +++ xfce4-utils-4.4.2/debian/Ubuntu @@ -0,0 +1,14 @@ +Xubuntu Team is https://launchpad.net/~xubuntu-team + +Co maintainers are: + +Lionel Le Folgoc +Gauvain Pocentek +Cody A.W. Somerville +Jérôme Guelfucci + +Bugs should be reported to Launchpad at: https://bugs.launchpad.net/ + + +Xubuntu packages are based on the Debian packages maintained by the +Debian Xfce Team . --- xfce4-utils-4.4.2.orig/debian/preinst +++ xfce4-utils-4.4.2/debian/preinst @@ -0,0 +1,14 @@ +#!/bin/sh -e + +if [ "$1" = "install" -o "$1" = "upgrade" ]; then + # Move the old config files before dpkg checks them. + if [ -d /etc/X11/xdg/xfce4 ]; then + mkdir -p /etc/xdg/xfce4 || true + mv /etc/X11/xdg/xfce4/* /etc/xdg/xfce4 || true + rmdir /etc/X11/xdg/xfce4 || true + fi +fi + +#DEBHELPER# + +exit 0 --- xfce4-utils-4.4.2.orig/debian/prerm +++ xfce4-utils-4.4.2/debian/prerm @@ -0,0 +1,10 @@ +#!/bin/sh -e + +if [ "$1" = "remove" ]; then + # Get xfce-mcs-manager to reinit + kill -s USR1 `pidof xfce-mcs-manager` >/dev/null 2>&1 || true +fi + +#DEBHELPER# + +exit 0 --- xfce4-utils-4.4.2.orig/config.guess +++ xfce4-utils-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-utils-4.4.2.orig/config.sub +++ xfce4-utils-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*)