[Pkg-kde-commits] rev 268 - people/dato/packages/tags people/dato/packages/trunk trunk/packages/kdeutils/debian trunk/packages/kdeutils/debian/patches
Adeodato Sim??
dato-guest@haydn.debian.org
Thu, 18 Nov 2004 16:20:08 -0700
Author: dato-guest
Date: 2004-11-18 16:19:42 -0700 (Thu, 18 Nov 2004)
New Revision: 268
Added:
trunk/packages/kdeutils/debian/patches/01_kdeutils_branch.diff.uu
Removed:
people/dato/packages/tags/kdeutils/
people/dato/packages/trunk/kdeutils/
trunk/packages/kdeutils/debian/patches/01_kdeutils_branch.diff.uu
Modified:
trunk/packages/kdeutils/debian/ark.install
trunk/packages/kdeutils/debian/changelog
trunk/packages/kdeutils/debian/control
trunk/packages/kdeutils/debian/kcharselect.install
trunk/packages/kdeutils/debian/kdelirc.install
trunk/packages/kdeutils/debian/kdepasswd.menu
trunk/packages/kdeutils/debian/kgpg.install
trunk/packages/kdeutils/debian/khexedit.install
trunk/packages/kdeutils/debian/kmilo.install
trunk/packages/kdeutils/debian/kregexpeditor.install
trunk/packages/kdeutils/debian/patches/02_autotools_update.diff
trunk/packages/kdeutils/debian/patches/05_pedantic-errors.diff
Log:
- Update trunk/packages/kdeutils from my trunk directory under people.
Modified: trunk/packages/kdeutils/debian/ark.install
===================================================================
--- trunk/packages/kdeutils/debian/ark.install 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/ark.install 2004-11-18 23:19:42 UTC (rev 268)
@@ -18,8 +18,12 @@
debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_options.png
debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
debian/tmp/usr/share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
-debian/tmp/usr/share/apps/konqueror/servicemenus/ark_directory_service.desktop
-debian/tmp/usr/share/apps/konqueror/servicemenus/arkservicemenu.desktop
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_adddir.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_addfile.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_delete.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_extract.png
+debian/tmp/usr/share/apps/ark/icons/crystalsvg/32x32/actions/ark_view.png
+debian/tmp/usr/share/config.kcfg/ark.kcfg
debian/tmp/usr/share/doc/kde/HTML/en/ark/common
debian/tmp/usr/share/doc/kde/HTML/en/ark/index.cache.bz2
debian/tmp/usr/share/doc/kde/HTML/en/ark/index.docbook
Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/changelog 2004-11-18 23:19:42 UTC (rev 268)
@@ -1,3 +1,25 @@
+kdeutils (4:3.3.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * KDE_3_3_BRANCH update.
+ * Added kdessh Depends on ssh. (Closes: #271875)
+ * Added Build-Depends libxtst-dev. (Closes: #276835)
+
+ -- Christopher L Cheney <ccheney@debian.org> Mon, 8 Nov 2004 14:30:00 -0600
+
+kdeutils (4:3.3.0-1) unstable; urgency=high
+
+ * New upstream release.
+
+ -- Christopher L Cheney <ccheney@debian.org> Sat, 14 Aug 2004 23:00:00 -0500
+
+kdeutils (4:3.2.3-1) unstable; urgency=high
+
+ * New upstream release.
+ * Added kgpg Depends: gnupg. (Closes: #252132)
+
+ -- Christopher L Cheney <ccheney@debian.org> Wed, 4 Aug 2004 01:00:00 -0500
+
kdeutils (4:3.2.2-2) unstable; urgency=high
* KDE_3_2_BRANCH pbuttonsd fix. (Closes: #245820)
Modified: trunk/packages/kdeutils/debian/control
===================================================================
--- trunk/packages/kdeutils/debian/control 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/control 2004-11-18 23:19:42 UTC (rev 268)
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Christopher L Cheney <ccheney@debian.org>
-Build-Depends: automake1.8, debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.2.1), libkonq4-dev (>> 4:3.2.1), libsnmp5-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
+Build-Depends: automake1.9, debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.1), libkonq4-dev (>> 4:3.3.1), libsnmp5-dev, libxtst-dev, pbbuttonsd-dev [powerpc], sharutils, tpctl [i386]
Standards-Version: 3.6.1.0
Package: kdeutils
Section: kde
Architecture: all
-Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}), kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version})
+Depends: ark (>= ${Source-Version}), kcalc (>= ${Source-Version}), kcharselect (>= ${Source-Version}), kdelirc (>= ${Source-Version}), kdessh (>= ${Source-Version}), kdf (>= ${Source-Version}), kedit (>= ${Source-Version}), kfloppy (>= ${Source-Version}), kgpg (>= ${Source-Version}), khexedit (>= ${Source-Version}), kjots (>= ${Source-Version}), klaptopdaemon (>= ${Source-Version}), kmilo (>= ${Source-Version}), kregexpeditor (>= ${Source-Version}), ksim (>= ${Source-Version}), ktimer (>= ${Source-Version}), kwalletmanager (>= ${Source-Version})
Description: KDE Utilities metapackage
KDE is a powerful Open Source graphical desktop environment for Unix
workstations. It combines ease of use, contemporary functionality, and
@@ -22,7 +22,6 @@
Section: utils
Architecture: any
Depends: ark (= ${Source-Version}), kcalc (= ${Source-Version}), kdelirc (= ${Source-Version}), kedit (= ${Source-Version}), klaptopdaemon (= ${Source-Version}), kmilo (= ${Source-Version}), kregexpeditor (= ${Source-Version}), ksim (= ${Source-Version})
-Replaces: kregexpeditor (<< 4:3.2.0), ksim (<< 4:3.2.0)
Description: KDE Utilities [development]
KDE is a powerful Open Source graphical desktop environment for Unix
workstations. It combines ease of use, contemporary functionality, and
@@ -97,24 +96,10 @@
.
This package is part of the official KDE utils module.
-Package: kdepasswd
-Section: utils
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: KDE password changer
- KDE is a powerful Open Source graphical desktop environment for Unix
- workstations. It combines ease of use, contemporary functionality, and
- outstanding graphical design with the technological superiority of the Unix
- operating system.
- .
- This is a simple app for users to change their system passwords with.
- .
- This package is part of the official KDE utils module.
-
Package: kdessh
Section: kde
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ssh
Description: KDE ssh frontend
KDE is a powerful Open Source graphical desktop environment for Unix
workstations. It combines ease of use, contemporary functionality, and
@@ -173,7 +158,7 @@
Package: kgpg
Section: utils
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, gnupg
Suggests: khelpcenter
Description: GnuPG frontend for KDE
KDE is a powerful Open Source graphical desktop environment for Unix
@@ -262,7 +247,6 @@
Architecture: any
Depends: ${shlibs:Depends}
Suggests: khelpcenter
-Replaces: libkregexpeditor (<< 4:3.1.5)
Description: graphical regular expression editor plugin
KDE is a powerful Open Source graphical desktop environment for Unix
workstations. It combines ease of use, contemporary functionality, and
Modified: trunk/packages/kdeutils/debian/kcharselect.install
===================================================================
--- trunk/packages/kdeutils/debian/kcharselect.install 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/kcharselect.install 2004-11-18 23:19:42 UTC (rev 268)
@@ -2,6 +2,7 @@
debian/tmp/usr/lib/kde3/kcharselect_panelapplet.la
debian/tmp/usr/lib/kde3/kcharselect_panelapplet.so
debian/tmp/usr/share/applications/kde/KCharSelect.desktop
+debian/tmp/usr/share/apps/kconf_update/kcharselect.upd
debian/tmp/usr/share/apps/kicker/applets/kcharselectapplet.desktop
debian/tmp/usr/share/doc/kde/HTML/en/kcharselect/common
debian/tmp/usr/share/doc/kde/HTML/en/kcharselect/index.cache.bz2
Modified: trunk/packages/kdeutils/debian/kdelirc.install
===================================================================
--- trunk/packages/kdeutils/debian/kdelirc.install 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/kdelirc.install 2004-11-18 23:19:42 UTC (rev 268)
@@ -34,6 +34,7 @@
debian/tmp/usr/share/apps/remotes/hauppauge.remote.xml
debian/tmp/usr/share/apps/remotes/remote.dtd
debian/tmp/usr/share/apps/remotes/sherwood.remote.xml
+debian/tmp/usr/share/apps/remotes/sonytv.remote.xml
debian/tmp/usr/share/autostart/irkick.desktop
debian/tmp/usr/share/doc/kde/HTML/en/irkick/common
debian/tmp/usr/share/doc/kde/HTML/en/irkick/index.cache.bz2
Modified: trunk/packages/kdeutils/debian/kdepasswd.menu
===================================================================
--- trunk/packages/kdeutils/debian/kdepasswd.menu 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/kdepasswd.menu 2004-11-18 23:19:42 UTC (rev 268)
@@ -1,6 +1,7 @@
?package(kdepasswd):\
- needs="X11"\
- section="Apps/System"\
+ needs=X11\
+ section=Apps/System\
hints="KDE"\
+ kderemove="y"\
title="kdepasswd"\
command="/usr/bin/kdepasswd"
Modified: trunk/packages/kdeutils/debian/kgpg.install
===================================================================
--- trunk/packages/kdeutils/debian/kgpg.install 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/kgpg.install 2004-11-18 23:19:42 UTC (rev 268)
@@ -3,6 +3,7 @@
debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png
+debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key4.png
debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_edit.png
debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_export.png
debian/tmp/usr/share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_gen.png
@@ -16,10 +17,10 @@
debian/tmp/usr/share/apps/kgpg/kgpg.rc
debian/tmp/usr/share/apps/kgpg/listkeys.rc
debian/tmp/usr/share/apps/kgpg/pics/kgpg_anim.gif
-debian/tmp/usr/share/apps/kgpg/pics/kgpg_bad.png
-debian/tmp/usr/share/apps/kgpg/pics/kgpg_good.png
-debian/tmp/usr/share/apps/kgpg/pics/kgpg_marginal.png
-debian/tmp/usr/share/apps/kgpg/pics/kgpg_unknown.png
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_blank.png
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_docked.gif
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_docked.png
+debian/tmp/usr/share/apps/kgpg/pics/kgpg_fill.png
debian/tmp/usr/share/apps/kgpg/tips
debian/tmp/usr/share/apps/konqueror/servicemenus/encryptfile.desktop
debian/tmp/usr/share/apps/konqueror/servicemenus/encryptfolder.desktop
Modified: trunk/packages/kdeutils/debian/khexedit.install
===================================================================
--- trunk/packages/kdeutils/debian/khexedit.install 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/khexedit.install 2004-11-18 23:19:42 UTC (rev 268)
@@ -3,9 +3,9 @@
debian/tmp/usr/lib/kde3/libkbyteseditwidget.so
debian/tmp/usr/share/applications/kde/khexedit.desktop
debian/tmp/usr/share/apps/khexedit/khexeditui.rc
-debian/tmp/usr/share/apps/khexedit/toolbar/hexdrag.png
-debian/tmp/usr/share/apps/khexedit/toolbar/hexmask.png
-debian/tmp/usr/share/apps/khexedit/toolbar/hexwrite.png
+debian/tmp/usr/share/apps/khexedit/pics/hexdrag.png
+debian/tmp/usr/share/apps/khexedit/pics/hexmask.png
+debian/tmp/usr/share/apps/khexedit/pics/hexwrite.png
debian/tmp/usr/share/doc/kde/HTML/en/khexedit/common
debian/tmp/usr/share/doc/kde/HTML/en/khexedit/index.cache.bz2
debian/tmp/usr/share/doc/kde/HTML/en/khexedit/index.docbook
Modified: trunk/packages/kdeutils/debian/kmilo.install
===================================================================
--- trunk/packages/kdeutils/debian/kmilo.install 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/kmilo.install 2004-11-18 23:19:42 UTC (rev 268)
@@ -1,15 +1,21 @@
debian/tmp/usr/lib/kde3/kcm_kvaio.la
debian/tmp/usr/lib/kde3/kcm_kvaio.so
+debian/tmp/usr/lib/kde3/kcm_thinkpad.la
+debian/tmp/usr/lib/kde3/kcm_thinkpad.so
debian/tmp/usr/lib/kde3/kded_kmilod.la
debian/tmp/usr/lib/kde3/kded_kmilod.so
debian/tmp/usr/lib/kde3/kmilo_generic.la
debian/tmp/usr/lib/kde3/kmilo_generic.so
debian/tmp/usr/lib/kde3/kmilo_kvaio.la
debian/tmp/usr/lib/kde3/kmilo_kvaio.so
+debian/tmp/usr/lib/kde3/kmilo_thinkpad.la
+debian/tmp/usr/lib/kde3/kmilo_thinkpad.so
debian/tmp/usr/lib/libkmilo.so.1
debian/tmp/usr/lib/libkmilo.so.1.0.0
debian/tmp/usr/share/applications/kde/kvaio.desktop
+debian/tmp/usr/share/applications/kde/thinkpad.desktop
debian/tmp/usr/share/services/kded/kmilod.desktop
debian/tmp/usr/share/services/kmilo/kmilo_generic.desktop
debian/tmp/usr/share/services/kmilo/kmilo_kvaio.desktop
+debian/tmp/usr/share/services/kmilo/kmilo_thinkpad.desktop
debian/tmp/usr/share/servicetypes/kmilo/kmilopluginsvc.desktop
Modified: trunk/packages/kdeutils/debian/kregexpeditor.install
===================================================================
--- trunk/packages/kdeutils/debian/kregexpeditor.install 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/kregexpeditor.install 2004-11-18 23:19:42 UTC (rev 268)
@@ -48,4 +48,9 @@
debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/texttool.png
debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/theEditor.png
debian/tmp/usr/share/doc/kde/HTML/en/KRegExpEditor/wordboundary.png
+debian/tmp/usr/share/icons/crystalsvg/128x128/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/crystalsvg/48x48/apps/kregexpeditor.png
+debian/tmp/usr/share/icons/crystalsvg/64x64/apps/kregexpeditor.png
debian/tmp/usr/share/services/kregexpeditorgui.desktop
Deleted: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch.diff.uu
Copied: trunk/packages/kdeutils/debian/patches/01_kdeutils_branch.diff.uu (from rev 267, tags/packages/kdeutils/kdeutils-3.3.1-1/debian/patches/01_kdeutils_branch.diff.uu)
Modified: trunk/packages/kdeutils/debian/patches/02_autotools_update.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/02_autotools_update.diff 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/patches/02_autotools_update.diff 2004-11-18 23:19:42 UTC (rev 268)
@@ -1,25 +1,28 @@
-diff -Nrua kdeutils-3.2.2/admin/compile kdeutils-patched/admin/compile
---- kdeutils-3.2.2/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ kdeutils-patched/admin/compile 2004-04-25 23:25:34.000000000 -0500
+diff -Nrua kdeutils-3.3.1/admin/compile kdeutils-patched/admin/compile
+--- kdeutils-3.3.1/admin/compile 2002-09-30 07:18:17.000000000 -0500
++++ kdeutils-patched/admin/compile 2004-11-03 20:01:22.000000000 -0600
@@ -1,8 +1,9 @@
#! /bin/sh
-
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2003-11-09.00
++scriptversion=2004-10-12.08
+
-+# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
-@@ -24,9 +25,36 @@
+@@ -24,76 +25,118 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
+-
+-prog=$1
+-shift
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
@@ -49,55 +52,68 @@
+ exit 0
+ ;;
+esac
-+
- prog=$1
- shift
-@@ -35,39 +63,39 @@
+ ofile=
cfile=
- args=
- while test $# -gt 0; do
+-args=
+-while test $# -gt 0; do
- case "$1" in
-+ case "$1" in
- -o)
+- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we do something ugly here.
- ofile=$2
- shift
- case "$ofile" in
-+ # configure might choose to run compile as `compile cc -o foo foo.c'.
-+ # So we do something ugly here.
-+ ofile=$2
-+ shift
-+ case "$ofile" in
- *.o | *.obj)
+- *.o | *.obj)
- ;;
-+ ;;
- *)
+- *)
- args="$args -o $ofile"
- ofile=
- ;;
- esac
-+ args="$args -o $ofile"
-+ ofile=
-+ ;;
-+ esac
- ;;
- *.c)
+- ;;
+- *.c)
- cfile=$1
- args="$args $1"
- ;;
-+ cfile=$1
-+ args="$args $1"
-+ ;;
- *)
+- *)
- args="$args $1"
- ;;
- esac
- shift
-+ args="$args $1"
-+ ;;
-+ esac
++eat=
++
++for arg
++do
++ if test -n "$eat"; then
++ eat=
++ else
++ case $1 in
++ -o)
++ # configure might choose to run compile as `compile cc -o foo foo.c'.
++ # So we strip `-o arg' only if arg is an object.
++ eat=1
++ case $2 in
++ *.o | *.obj)
++ ofile=$2
++ ;;
++ *)
++ set x "$@" -o "$2"
++ shift
++ ;;
++ esac
++ ;;
++ *.c)
++ cfile=$1
++ set x "$@" "$1"
++ shift
++ ;;
++ *)
++ set x "$@" "$1"
++ shift
++ ;;
++ esac
++ fi
+ shift
done
@@ -113,35 +129,50 @@
+ # normal compilation that the losing compiler can handle. If no
+ # `.c' file was seen then we are probably linking. That is also
+ # ok.
-+ exec "$prog" $args
++ exec "$@"
fi
# Name of file we expect compiler to create.
-@@ -79,10 +107,10 @@
+-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
++cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+ # Create the lock directory.
+ # Note: use `[/.-]' here to ensure that we don't use the same name
+ # that we are using for the .o file. Also, base the name on the expected
# object file name, since that is what matters with a parallel build.
- lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
++lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
while true; do
- if mkdir $lockdir > /dev/null 2>&1; then
- break
- fi
- sleep 1
-+ if mkdir $lockdir > /dev/null 2>&1; then
++ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
done
# FIXME: race condition here if user kills between mkdir and trap.
- trap "rmdir $lockdir; exit 1" 1 2 15
-@@ -92,8 +120,17 @@
- status=$?
+-trap "rmdir $lockdir; exit 1" 1 2 15
++trap "rmdir '$lockdir'; exit 1" 1 2 15
+ # Run the compile.
+-"$prog" $args
+-status=$?
++"$@"
++ret=$?
+
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
fi
- rmdir $lockdir
- exit $status
+-rmdir $lockdir
+-exit $status
++rmdir "$lockdir"
++exit $ret
+
+# Local Variables:
+# mode: shell-script
@@ -151,942 +182,86 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeutils-3.2.2/admin/config.guess kdeutils-patched/admin/config.guess
---- kdeutils-3.2.2/admin/config.guess 2002-10-26 11:44:28.000000000 -0500
-+++ kdeutils-patched/admin/config.guess 2004-01-08 21:12:01.000000000 -0600
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
+diff -Nrua kdeutils-3.3.1/admin/config.guess kdeutils-patched/admin/config.guess
+--- kdeutils-3.3.1/admin/config.guess 2004-08-02 09:17:40.000000000 -0500
++++ kdeutils-patched/admin/config.guess 2004-08-25 09:25:50.000000000 -0500
+@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ # 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
--timestamp='2002-10-21'
-+timestamp='2004-01-05'
+-timestamp='2004-06-24'
++timestamp='2004-08-13'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-@@ -98,14 +98,18 @@
- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
- # use `HOST_CC' if defined, but it is deprecated.
-
--# This shell variable is my proudest work .. or something. --bje
-+# Portable tmp directory creation inspired by the Autoconf team.
-
--set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
--(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-- || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
--dummy=$tmpdir/dummy ;
--files="$dummy.c $dummy.o $dummy.rel $dummy" ;
--trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
- case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int x;" > $dummy.c ;
- for c in cc gcc c89 c99 ; do
-@@ -113,15 +117,13 @@
- CC_FOR_BUILD="$c"; break ;
- fi ;
- done ;
-- rm -f $files ;
- if test x"$CC_FOR_BUILD" = x ; then
- CC_FOR_BUILD=no_compiler_found ;
- fi
- ;;
- ,,*) CC_FOR_BUILD=$CC ;;
- ,*,*) CC_FOR_BUILD=$HOST_CC ;;
--esac ;
--unset files'
-+esac ;'
-
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -178,7 +180,18 @@
- ;;
- esac
- # The OS release
-- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ # Debian GNU/NetBSD machines have a different userland, and
-+ # thus, need a distinct triplet. However, they do not need
-+ # kernel version information, so it can be replaced with a
-+ # suitable tag, in the style of linux-gnu.
-+ case "${UNAME_VERSION}" in
-+ Debian*)
-+ release='-gnu'
-+ ;;
-+ *)
-+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+ ;;
-+ esac
- # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- # contains redundant information, the shorter form:
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-@@ -208,6 +221,9 @@
+@@ -203,9 +203,6 @@
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+- arc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+- exit 0 ;;
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+@@ -230,18 +227,12 @@
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
-+ pegasos:OpenBSD:*:*)
-+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+ exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-@@ -227,68 +243,52 @@
- if test $UNAME_RELEASE = "V4.0"; then
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
-+ # According to Compaq, /usr/sbin/psrinfo has been available on
-+ # OSF/1 and Tru64 systems produced since 1995. I hope that
-+ # covers most systems running today. This code pipes the CPU
-+ # types through head -n 1, so we only detect the type of CPU 0.
-+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+ case "$ALPHA_CPU_TYPE" in
-+ "EV4 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV4.5 (21064)")
-+ UNAME_MACHINE="alpha" ;;
-+ "LCA4 (21066/21068)")
-+ UNAME_MACHINE="alpha" ;;
-+ "EV5 (21164)")
-+ UNAME_MACHINE="alphaev5" ;;
-+ "EV5.6 (21164A)")
-+ UNAME_MACHINE="alphaev56" ;;
-+ "EV5.6 (21164PC)")
-+ UNAME_MACHINE="alphapca56" ;;
-+ "EV5.7 (21164PC)")
-+ UNAME_MACHINE="alphapca57" ;;
-+ "EV6 (21264)")
-+ UNAME_MACHINE="alphaev6" ;;
-+ "EV6.7 (21264A)")
-+ UNAME_MACHINE="alphaev67" ;;
-+ "EV6.8CB (21264C)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8AL (21264B)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.8CX (21264D)")
-+ UNAME_MACHINE="alphaev68" ;;
-+ "EV6.9A (21264/EV69A)")
-+ UNAME_MACHINE="alphaev69" ;;
-+ "EV7 (21364)")
-+ UNAME_MACHINE="alphaev7" ;;
-+ "EV7.9 (21364A)")
-+ UNAME_MACHINE="alphaev79" ;;
-+ esac
- # A Vn.n version is a released version.
- # A Tn.n version is a released field test version.
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
-- eval $set_cc_for_build
-- cat <<EOF >$dummy.s
-- .data
--\$Lformat:
-- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
--
-- .text
-- .globl main
-- .align 4
-- .ent main
--main:
-- .frame \$30,16,\$26,0
-- ldgp \$29,0(\$27)
-- .prologue 1
-- .long 0x47e03d80 # implver \$0
-- lda \$2,-1
-- .long 0x47e20c21 # amask \$2,\$1
-- lda \$16,\$Lformat
-- mov \$0,\$17
-- not \$1,\$18
-- jsr \$26,printf
-- ldgp \$29,0(\$26)
-- mov 0,\$16
-- jsr \$26,exit
-- .end main
--EOF
-- $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
-- if test "$?" = 0 ; then
-- case `$dummy` in
-- 0-0)
-- UNAME_MACHINE="alpha"
-- ;;
-- 1-0)
-- UNAME_MACHINE="alphaev5"
-- ;;
-- 1-1)
-- UNAME_MACHINE="alphaev56"
-- ;;
-- 1-101)
-- UNAME_MACHINE="alphapca56"
-- ;;
-- 2-303)
-- UNAME_MACHINE="alphaev6"
-- ;;
-- 2-307)
-- UNAME_MACHINE="alphaev67"
-- ;;
-- 2-1307)
-- UNAME_MACHINE="alphaev68"
-- ;;
-- 3-1307)
-- UNAME_MACHINE="alphaev7"
-- ;;
-- esac
-- fi
-- rm -f $dummy.s $dummy && rmdir $tmpdir
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
-+ Alpha*:OpenVMS:*:*)
-+ echo alpha-hp-vms
-+ exit 0 ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
-@@ -310,6 +310,9 @@
- *:OS/390:*:*)
- echo i370-ibm-openedition
- exit 0 ;;
-+ *:OS400:*:*)
-+ echo powerpc-ibm-os400
-+ exit 0 ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
-@@ -327,6 +330,9 @@
- NILE*:*:*:dcosx)
- echo pyramid-pyramid-svr4
- exit 0 ;;
-+ DRS?6000:unix:4.0:6*)
-+ echo sparc-icl-nx6
-+ exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
-@@ -439,8 +445,7 @@
- EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-- && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-- rm -f $dummy.c $dummy && rmdir $tmpdir
-+ && exit 0
- echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
- Motorola:PowerMAX_OS:*:*)
-@@ -449,7 +454,7 @@
- Motorola:*:4.3:PL8-*)
- echo powerpc-harris-powermax
- exit 0 ;;
-- Night_Hawk:*:*:PowerMAX_OS)
-+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
- echo powerpc-harris-powermax
- exit 0 ;;
- Night_Hawk:Power_UNIX:*:*)
-@@ -524,8 +529,7 @@
- exit(0);
- }
- EOF
-- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-- rm -f $dummy.c $dummy && rmdir $tmpdir
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
-@@ -624,10 +628,20 @@
- }
- EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-- rm -f $dummy.c $dummy && rmdir $tmpdir
-+ test -z "$HP_ARCH" && HP_ARCH=hppa
- fi ;;
- esac
-+ if [ ${HP_ARCH} = "hppa2.0w" ]
-+ then
-+ # avoid double evaluation of $set_cc_for_build
-+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+ then
-+ HP_ARCH="hppa2.0w"
-+ else
-+ HP_ARCH="hppa64"
-+ fi
-+ fi
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
- ia64:HP-UX:*:*)
-@@ -661,8 +675,7 @@
- exit (0);
- }
- EOF
-- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-- rm -f $dummy.c $dummy && rmdir $tmpdir
-+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo unknown-hitachi-hiuxwe2
- exit 0 ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-@@ -720,21 +733,26 @@
- CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
-- CRAY*T3D:*:*:*)
-- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+- pmax:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- CRAY*T3E:*:*:*)
- echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ sgi:OpenBSD:*:*)
+- echo mipseb-unknown-openbsd${UNAME_RELEASE}
++ echo mips64-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- CRAY*SV1:*:*:*)
- echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
-+ *:UNICOS/mp:*:*)
-+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit 0 ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
-+ 5000:UNIX_System_V:4.*:*)
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit 0 ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
-@@ -756,8 +774,10 @@
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-- rm -f $dummy.c && rmdir $tmpdir
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-+ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-+ # FreeBSD's kernel, but not the complete OS.
-+ case ${LIBC} in gnu) kernel_only='k' ;; esac
-+ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
-@@ -768,14 +788,17 @@
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
-- x86:Interix*:3*)
-- echo i386-pc-interix3
-+ x86:Interix*:[34]*)
-+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+ exit 0 ;;
-+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- # UNAME_MACHINE based on the output of uname instead of i386?
-- echo i386-pc-interix
-+ echo i586-pc-interix
- exit 0 ;;
- i*:UWIN*:*)
- echo ${UNAME_MACHINE}-pc-uwin
-@@ -787,14 +810,22 @@
- echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
- *:GNU:*:*)
-+ # the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
-+ *:GNU/*:*:*)
-+ # other systems with GNU libc and userland
-+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+ exit 0 ;;
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
- arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-+ cris:Linux:*:*)
-+ echo cris-axis-linux-gnu
-+ exit 0 ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -818,8 +849,26 @@
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-- rm -f $dummy.c && rmdir $tmpdir
-- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+ ;;
-+ mips64:Linux:*:*)
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #undef CPU
-+ #undef mips64
-+ #undef mips64el
-+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+ CPU=mips64el
-+ #else
-+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+ CPU=mips64
-+ #else
-+ CPU=
-+ #endif
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
-@@ -855,6 +904,9 @@
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
-+ sh64*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit 0 ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
-@@ -912,9 +964,11 @@
- LIBC=gnuaout
- #endif
- #endif
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-- rm -f $dummy.c && rmdir $tmpdir
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- ;;
-@@ -932,6 +986,26 @@
- # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
-+ i*86:OS/2:*:*)
-+ # If we were able to find `uname', then EMX Unix compatibility
-+ # is probably installed.
-+ echo ${UNAME_MACHINE}-pc-os2-emx
-+ exit 0 ;;
-+ i*86:XTS-300:*:STOP)
-+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit 0 ;;
-+ i*86:atheos:*:*)
-+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit 0 ;;
-+ i*86:syllable:*:*)
-+ echo ${UNAME_MACHINE}-pc-syllable
-+ exit 0 ;;
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit 0 ;;
-+ i*86:*DOS:*:*)
-+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit 0 ;;
- i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -966,9 +1040,6 @@
- echo ${UNAME_MACHINE}-pc-sysv32
- fi
- exit 0 ;;
-- i*86:*DOS:*:*)
-- echo ${UNAME_MACHINE}-pc-msdosdjgpp
+- wgrisc:OpenBSD:*:*)
+- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-@@ -995,9 +1066,12 @@
- mc68k:UNIX:SYSTEM5:3.51m)
- echo m68k-convergent-sysv
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
-+ M680?0:D-NIX:5.3:*)
-+ echo m68k-diab-dnix
-+ exit 0 ;;
- M68*:*:R3V[567]*:*)
+@@ -1081,7 +1072,7 @@
+ exit 0 ;;
+ M68*:*:R3V[5678]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -1014,9 +1088,6 @@
- mc68030:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit 0 ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-- echo i386-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
- TSUNAMI:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
-@@ -1098,7 +1169,11 @@
+@@ -1179,9 +1170,10 @@
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
*:Darwin:*:*)
-- echo `uname -p`-apple-darwin${UNAME_RELEASE}
-+ case `uname -p` in
-+ *86) UNAME_PROCESSOR=i686 ;;
-+ powerpc) UNAME_PROCESSOR=powerpc ;;
-+ esac
-+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+- case `uname -p` in
++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++ case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
+- powerpc) UNAME_PROCESSOR=powerpc ;;
++ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
- *:procnto*:*:* | *:QNX:[0123456789]*:*)
- UNAME_PROCESSOR=`uname -p`
-@@ -1111,7 +1186,7 @@
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit 0 ;;
-- NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
-+ NSR-?:NONSTOP_KERNEL:*:*)
- echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
- *:NonStop-UX:*:*)
-@@ -1134,11 +1209,6 @@
- fi
- echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
-- i*86:OS/2:*:*)
-- # If we were able to find `uname', then EMX Unix compatibility
-- # is probably installed.
-- echo ${UNAME_MACHINE}-pc-os2-emx
-- exit 0 ;;
- *:TOPS-10:*:*)
- echo pdp10-unknown-tops10
- exit 0 ;;
-@@ -1157,11 +1227,11 @@
- *:ITS:*:*)
- echo pdp10-unknown-its
- exit 0 ;;
-- i*86:XTS-300:*:STOP)
-- echo ${UNAME_MACHINE}-unknown-stop
-+ SEI:*:*:SEIUX)
-+ echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
-- i*86:atheos:*:*)
-- echo ${UNAME_MACHINE}-unknown-atheos
-+ *:DRAGONFLY:*:*)
-+ echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
- exit 0 ;;
- esac
-
-@@ -1283,8 +1353,7 @@
- }
- EOF
-
--$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
--rm -f $dummy.c $dummy && rmdir $tmpdir
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
- # Apollos put the system type in the environment.
-
-diff -Nrua kdeutils-3.2.2/admin/config.sub kdeutils-patched/admin/config.sub
---- kdeutils-3.2.2/admin/config.sub 2002-10-26 11:44:28.000000000 -0500
-+++ kdeutils-patched/admin/config.sub 2004-01-08 21:12:01.000000000 -0600
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002 Free Software Foundation, Inc.
-+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
--timestamp='2002-09-05'
-+timestamp='2004-01-05'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -118,7 +118,8 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
- ;;
-@@ -228,13 +229,14 @@
- | a29k \
- | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+ | am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-- | clipper \
-+ | c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
-- | ip2k \
-+ | ip2k | iq2000 \
- | m32r | m68000 | m68k | m88k | mcore \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
-@@ -245,21 +247,24 @@
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
- | mipsisa32 | mipsisa32el \
-+ | mipsisa32r2 | mipsisa32r2el \
- | mipsisa64 | mipsisa64el \
-+ | mipsisa64r2 | mipsisa64r2el \
- | mipsisa64sb1 | mipsisa64sb1el \
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
-+ | msp430 \
- | ns16k | ns32k \
- | openrisc | or32 \
- | pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
-- | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
- | strongarm \
-- | tahoe | thumb | tic80 | tron \
-+ | tahoe | thumb | tic4x | tic80 | tron \
- | v850 | v850e \
- | we32k \
- | x86 | xscale | xstormy16 | xtensa \
-@@ -294,7 +299,7 @@
- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
- | bs2000-* \
-- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
-+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
- | d10v-* | d30v-* | dlx-* \
- | elxsi-* \
-@@ -302,7 +307,7 @@
- | h8300-* | h8500-* \
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
-- | ip2k-* \
-+ | ip2k-* | iq2000-* \
- | m32r-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
-@@ -315,21 +320,26 @@
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
- | mipsisa32-* | mipsisa32el-* \
-+ | mipsisa32r2-* | mipsisa32r2el-* \
- | mipsisa64-* | mipsisa64el-* \
-+ | mipsisa64r2-* | mipsisa64r2el-* \
- | mipsisa64sb1-* | mipsisa64sb1el-* \
- | mipsisa64sr71k-* | mipsisa64sr71kel-* \
-- | mipstx39 | mipstx39el \
-- | none-* | np1-* | ns16k-* | ns32k-* \
-+ | mipstx39-* | mipstx39el-* \
-+ | msp430-* \
-+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
- | orion-* \
- | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-- | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-+ | tahoe-* | thumb-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-@@ -367,6 +377,12 @@
- basic_machine=a29k-none
- os=-bsd
- ;;
-+ amd64)
-+ basic_machine=x86_64-pc
-+ ;;
-+ amd64-*)
-+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
-@@ -716,6 +732,10 @@
- np1)
- basic_machine=np1-gould
- ;;
-+ nv1)
-+ basic_machine=nv1-cray
-+ os=-unicosmp
-+ ;;
- nsr-tandem)
- basic_machine=nsr-tandem
- ;;
-@@ -727,6 +747,10 @@
- basic_machine=or32-unknown
- os=-coff
- ;;
-+ os400)
-+ basic_machine=powerpc-ibm
-+ os=-os400
-+ ;;
- OSE68000 | ose68000)
- basic_machine=m68000-ericsson
- os=-ose
-@@ -758,18 +782,24 @@
- pentiumpro | p6 | 6x86 | athlon | athlon_*)
- basic_machine=i686-pc
- ;;
-- pentiumii | pentium2)
-+ pentiumii | pentium2 | pentiumiii | pentium3)
- basic_machine=i686-pc
- ;;
-+ pentium4)
-+ basic_machine=i786-pc
-+ ;;
- pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- pentiumpro-* | p6-* | 6x86-* | athlon-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-- pentiumii-* | pentium2-*)
-+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
-+ pentium4-*)
-+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
- pn)
- basic_machine=pn-gould
- ;;
-@@ -828,6 +858,10 @@
- sb1el)
- basic_machine=mipsisa64sb1el-unknown
- ;;
-+ sei)
-+ basic_machine=mips-sei
-+ os=-seiux
-+ ;;
- sequent)
- basic_machine=i386-sequent
- ;;
-@@ -835,6 +869,9 @@
- basic_machine=sh-hitachi
- os=-hms
- ;;
-+ sh64)
-+ basic_machine=sh64-unknown
-+ ;;
- sparclite-wrs | simso-wrs)
- basic_machine=sparclite-wrs
- os=-vxworks
-@@ -901,10 +938,6 @@
- basic_machine=i386-sequent
- os=-dynix
- ;;
-- t3d)
-- basic_machine=alpha-cray
-- os=-unicos
-- ;;
- t3e)
- basic_machine=alphaev5-cray
- os=-unicos
-@@ -913,14 +946,18 @@
- basic_machine=t90-cray
- os=-unicos
- ;;
-- tic4x | c4x*)
-- basic_machine=tic4x-unknown
-- os=-coff
-- ;;
- tic54x | c54x*)
- basic_machine=tic54x-unknown
- os=-coff
- ;;
-+ tic55x | c55x*)
-+ basic_machine=tic55x-unknown
-+ os=-coff
-+ ;;
-+ tic6x | c6x*)
-+ basic_machine=tic6x-unknown
-+ os=-coff
-+ ;;
- tx39)
- basic_machine=mipstx39-unknown
- ;;
-@@ -934,6 +971,10 @@
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
-+ tpf)
-+ basic_machine=s390x-ibm
-+ os=-tpf
-+ ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
-@@ -977,10 +1018,6 @@
- basic_machine=hppa1.1-winbond
- os=-proelf
- ;;
-- windows32)
-- basic_machine=i386-pc
-- os=-windows32-msvcrt
-- ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
-@@ -1027,7 +1064,7 @@
- we32k)
- basic_machine=we32k-att
- ;;
-- sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sh64)
-@@ -1106,18 +1143,19 @@
- | -aos* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-+ | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-- | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
-+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -qnx*)
-@@ -1129,8 +1167,10 @@
- ;;
- esac
- ;;
-+ -nto-qnx*)
-+ ;;
- -nto*)
-- os=-nto-qnx
-+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
- ;;
- -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-@@ -1139,6 +1179,9 @@
- -mac*)
- os=`echo $os | sed -e 's|mac|macos|'`
- ;;
-+ -linux-dietlibc)
-+ os=-linux-dietlibc
-+ ;;
- -linux*)
- os=`echo $os | sed -e 's|linux|linux-gnu|'`
- ;;
-@@ -1151,6 +1194,9 @@
- -opened*)
- os=-openedition
- ;;
-+ -os400*)
-+ os=-os400
-+ ;;
- -wince*)
- os=-wince
- ;;
-@@ -1172,6 +1218,9 @@
- -atheos*)
- os=-atheos
- ;;
-+ -syllable*)
-+ os=-syllable
-+ ;;
- -386bsd)
- os=-bsd
- ;;
-@@ -1194,6 +1243,9 @@
- -sinix*)
- os=-sysv4
- ;;
-+ -tpf*)
-+ os=-tpf
-+ ;;
- -triton*)
- os=-sysv3
- ;;
-@@ -1224,6 +1276,12 @@
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
- ;;
-+ -aros*)
-+ os=-aros
-+ ;;
-+ -kaos*)
-+ os=-kaos
-+ ;;
- -none)
- ;;
- *)
-@@ -1255,6 +1313,9 @@
- arm*-semi)
- os=-aout
- ;;
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
- # This must come before the *-dec entry.
- pdp10-*)
- os=-tops20
-@@ -1433,9 +1494,15 @@
- -mvs* | -opened*)
- vendor=ibm
- ;;
-+ -os400*)
-+ vendor=ibm
-+ ;;
- -ptx*)
- vendor=sequent
- ;;
-+ -tpf*)
-+ vendor=ibm
-+ ;;
- -vxsim* | -vxworks* | -windiss*)
- vendor=wrs
- ;;
-diff -Nrua kdeutils-3.2.2/admin/depcomp kdeutils-patched/admin/depcomp
---- kdeutils-3.2.2/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ kdeutils-patched/admin/depcomp 2004-04-25 23:25:34.000000000 -0500
+diff -Nrua kdeutils-3.3.1/admin/depcomp kdeutils-patched/admin/depcomp
+--- kdeutils-3.3.1/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
++++ kdeutils-patched/admin/depcomp 2004-11-03 20:01:22.000000000 -0600
@@ -1,7 +1,9 @@
#! /bin/sh
-
# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+
-+scriptversion=2004-04-25.13
++scriptversion=2004-05-31.23
+
+# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-@@ -25,13 +27,52 @@
+@@ -25,13 +27,45 @@
# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
@@ -1106,6 +281,7 @@
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
++ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
@@ -1124,23 +300,16 @@
echo "depcomp: Variables source, object and depmode must be set" 1>&2
exit 1
fi
- # `libtool' can also be set to `yes' or `no'.
+-# `libtool' can also be set to `yes' or `no'.
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-+if test -z "$depfile"; then
-+ base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
-+ dir=`echo "$object" | sed 's,/.*$,/,'`
-+ if test "$dir" = "$object"; then
-+ dir=
-+ fi
-+ # FIXME: should be _deps on DOS.
-+ depfile="$dir.deps/$base"
-+fi
-+
++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
++depfile=${depfile-`echo "$object" |
++ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
-@@ -163,19 +204,25 @@
+@@ -163,19 +197,25 @@
aix)
# The C for AIX Compiler uses -M and outputs the dependencies
@@ -1172,7 +341,7 @@
if test $stat -eq 0; then :
else
rm -f "$tmpdepfile"
-@@ -183,6 +230,7 @@
+@@ -183,6 +223,7 @@
fi
if test -f "$tmpdepfile"; then
@@ -1180,7 +349,7 @@
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
-@@ -198,11 +246,9 @@
+@@ -198,11 +239,9 @@
;;
icc)
@@ -1194,7 +363,7 @@
# foo.o: sub/foo.c
# foo.o: sub/foo.h
# which is wrong. We want:
-@@ -210,6 +256,12 @@
+@@ -210,6 +249,12 @@
# sub/foo.o: sub/foo.h
# sub/foo.c:
# sub/foo.h:
@@ -1207,7 +376,7 @@
"$@" -MD -MF "$tmpdepfile"
stat=$?
-@@ -219,45 +271,60 @@
+@@ -219,45 +264,63 @@
exit $stat
fi
rm -f "$depfile"
@@ -1242,9 +411,12 @@
- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'`
if test "$libtool" = yes; then
+ # Dependencies are output in .lo.d with libtool 1.4.
-+ # They are output in .o.d with libtool 1.5.
++ # With libtool 1.5 they are output both in $dir.libs/$base.o.d
++ # and in $dir.libs/$base.o.d and $dir$base.o.d. We process the
++ # latter, because the former will be cleaned when $dir.libs is
++ # erased.
+ tmpdepfile1="$dir.libs/$base.lo.d"
-+ tmpdepfile2="$dir.libs/$base.o.d"
++ tmpdepfile2="$dir$base.o.d"
+ tmpdepfile3="$dir.libs/$base.d"
"$@" -Wc,-MD
else
@@ -1279,7 +451,7 @@
else
echo "#dummy" > "$depfile"
fi
-@@ -270,34 +337,42 @@
+@@ -270,34 +333,42 @@
dashmstdout)
# Important note: in order to support this mode, a compiler *must*
@@ -1348,7 +520,7 @@
rm -f "$depfile"
cat < "$tmpdepfile" > "$depfile"
tr ' ' '
-@@ -315,36 +390,40 @@
+@@ -315,36 +386,40 @@
;;
makedepend)
@@ -1416,7 +588,7 @@
' | \
## Some versions of the HPUX 10.20 sed can't process this invocation
## correctly. Breaking it into two sed invocations is a workaround.
-@@ -354,35 +433,39 @@
+@@ -354,35 +429,39 @@
cpp)
# Important note: in order to support this mode, a compiler *must*
@@ -1481,7 +653,7 @@
rm -f "$depfile"
echo "$object : \\" > "$depfile"
cat < "$tmpdepfile" >> "$depfile"
-@@ -392,34 +475,27 @@
+@@ -392,34 +471,27 @@
msvisualcpp)
# Important note: in order to support this mode, a compiler *must*
@@ -1534,7 +706,7 @@
rm -f "$depfile"
echo "$object : \\" > "$depfile"
. "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
-@@ -439,3 +515,12 @@
+@@ -439,3 +511,12 @@
esac
exit 0
@@ -1547,16 +719,16 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeutils-3.2.2/admin/install-sh kdeutils-patched/admin/install-sh
---- kdeutils-3.2.2/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ kdeutils-patched/admin/install-sh 2004-04-25 23:25:34.000000000 -0500
+diff -Nrua kdeutils-3.3.1/admin/install-sh kdeutils-patched/admin/install-sh
+--- kdeutils-3.3.1/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
++++ kdeutils-patched/admin/install-sh 2004-11-03 20:01:22.000000000 -0600
@@ -1,19 +1,38 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-04-01.17
++scriptversion=2004-10-22.00
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
@@ -1570,11 +742,18 @@
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
++#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
#
+-# Copyright 1991 by the Massachusetts Institute of Technology
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
@@ -1584,13 +763,6 @@
-# written prior permission. M.I.T. makes no representations about the
-# suitability of this software for any purpose. It is provided "as is"
-# without express or implied warranty.
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
@@ -1615,15 +787,13 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,268 @@
+@@ -41,236 +58,266 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-transformbasename=""
-transform_arg=""
-+transformbasename=
-+transform_arg=
- instcmd="$mvprog"
+-instcmd="$mvprog"
chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
@@ -1685,26 +855,31 @@
- shift
- continue;;
- esac
+-done
+src=
+dst=
+dir_arg=
++dstarg=
++no_target_directory=
+
-+usage="Usage: $0 [OPTION]... SRCFILE DSTFILE
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+ or: $0 [OPTION]... SRCFILES... DIRECTORY
-+ or: $0 -d DIRECTORIES...
++ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++ or: $0 [OPTION]... -d DIRECTORIES...
+
-+In the first form, install SRCFILE to DSTFILE, removing SRCFILE by default.
-+In the second, create the directory path DIR.
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
+
+Options:
-+-b=TRANSFORMBASENAME
-+-c copy source (using $cpprog) instead of moving (using $mvprog).
++-c (ignored)
+-d create directories instead of installing files.
-+-g GROUP $chgrp installed files to GROUP.
-+-m MODE $chmod installed files to MODE.
-+-o USER $chown installed files to USER.
-+-s strip installed files (using $stripprog).
-+-t=TRANSFORM
++-g GROUP $chgrpprog installed files to GROUP.
++-m MODE $chmodprog installed files to MODE.
++-o USER $chownprog installed files to USER.
++-s $stripprog installed files.
++-t DIRECTORY install into DIRECTORY.
++-T report an error if DSTFILE is a directory.
+--help display this help and exit.
+--version display version info and exit.
+
@@ -1714,14 +889,9 @@
+
+while test -n "$1"; do
+ case $1 in
-+ -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-+ shift
++ -c) shift
+ continue;;
+
-+ -c) instcmd=$cpprog
-+ shift
-+ continue;;
-+
+ -d) dir_arg=true
+ shift
+ continue;;
@@ -1746,29 +916,6 @@
+ -s) stripcmd=$stripprog
+ shift
+ continue;;
-+
-+ -t=*) transformarg=`echo $1 | sed 's/-t=//'`
-+ shift
-+ continue;;
-+
-+ --version) echo "$0 $scriptversion"; exit 0;;
-+
-+ *) # When -d is used, all remaining arguments are directories to create.
-+ test -n "$dir_arg" && break
-+ # Otherwise, the last argument is the destination. Remove it from $@.
-+ for arg
-+ do
-+ if test -n "$dstarg"; then
-+ # $@ is not empty: it contains at least $arg.
-+ set fnord "$@" "$dstarg"
-+ shift # fnord
-+ fi
-+ shift # arg
-+ dstarg=$arg
-+ done
-+ break;;
-+ esac
- done
-if [ x"$src" = x ]
-then
@@ -1819,16 +966,8 @@
- else
- :
- fi
-+if test -z "$1"; then
-+ if test -z "$dir_arg"; then
-+ echo "$0: no input file specified." >&2
-+ exit 1
-+ fi
-+ # It's OK to call `install-sh -d' without argument.
-+ # This can happen when creating conditional directories.
-+ exit 0
- fi
-
+-fi
+-
-## this sed command emulates the dirname command
-dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
@@ -1848,17 +987,130 @@
-IFS=$oIFS
-
-pathcomp=''
--
++ -t) dstarg=$2
++ shift
++ shift
++ continue;;
+
-while [ $# -ne 0 ] ; do
- pathcomp=$pathcomp$1
-- shift
--
++ -T) no_target_directory=true
+ shift
++ continue;;
+
- if [ ! -d "$pathcomp" ] ;
- then
- $mkdirprog "$pathcomp"
- else
- :
- fi
++ --version) echo "$0 $scriptversion"; exit 0;;
+
+- pathcomp=$pathcomp/
++ *) # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ test -n "$dir_arg$dstarg" && break
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++ break;;
++ esac
+ done
+-fi
+-
+-if [ x"$dir_arg" != x ]
+-then
+- $doit $instcmd "$dst" &&
+
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
+-else
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+- if [ x"$transformarg" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- dstfile=`basename "$dst" $transformbasename |
+- sed $transformarg`$transformbasename
+- fi
+-
+-# don't allow the sed command to completely eliminate the filename
+-
+- if [ x"$dstfile" = x ]
+- then
+- dstfile=`basename "$dst"`
+- else
+- :
+- fi
+-
+-# Make a couple of temp file names in the proper directory.
+-
+- dsttmp=$dstdir/#inst.$$#
+- rmtmp=$dstdir/#rm.$$#
+-
+-# Trap to clean up temp files at exit.
+-
+- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
+- trap '(exit $?); exit' 1 2 13 15
+-
+-# Move or copy the file name to the temp name
+-
+- $doit $instcmd "$src" "$dsttmp" &&
+-
+-# and set any options; do chmod last to preserve setuid bits
+-
+-# If any of these fail, we abort the whole thing. If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
+-
+- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
+- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
+- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
+- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
+-
+-# Now remove or move aside any old file at destination location. We try this
+-# two ways since rm can't unlink itself on some systems and the destination
+-# file might be busy for other reasons. In this case, the final cleanup
+-# might fail but the new file should still install successfully.
+-
+-{
+- if [ -f "$dstdir/$dstfile" ]
+- then
+- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
+- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
+- {
+- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+- (exit 1); exit
+- }
+- else
+- :
+- fi
+-} &&
+-
+-# Now rename the file to the real destination.
++if test -z "$1"; then
++ if test -z "$dir_arg"; then
++ echo "$0: no input file specified." >&2
++ exit 1
++ fi
++ # It's OK to call `install-sh -d' without argument.
++ # This can happen when creating conditional directories.
++ exit 0
++fi
+
+- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+for src
+do
+ # Protect names starting with `-'.
@@ -1871,13 +1123,13 @@
+ src=
+
+ if test -d "$dst"; then
-+ instcmd=:
++ mkdircmd=:
+ chmodcmd=
+ else
-+ instcmd=$mkdirprog
++ mkdircmd=$mkdirprog
+ fi
+ else
-+ # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
++ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+ if test ! -f "$src" && test ! -d "$src"; then
@@ -1896,16 +1148,20 @@
+ -*) dst=./$dst ;;
+ esac
-- pathcomp=$pathcomp/
+-fi &&
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+ if test -d "$dst"; then
++ if test -n "$no_target_directory"; then
++ echo "$0: $dstarg: Is a directory" >&2
++ exit 1
++ fi
+ dst=$dst/`basename "$src"`
+ fi
+ fi
+
+ # This sed command emulates the dirname command.
-+ dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
++ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+ # Make sure that the destination directory exists.
+
@@ -1918,7 +1174,8 @@
+ oIFS=$IFS
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
-+ set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
++ shift
+ IFS=$oIFS
+
+ pathcomp=
@@ -1927,51 +1184,42 @@
+ pathcomp=$pathcomp$1
+ shift
+ if test ! -d "$pathcomp"; then
-+ $mkdirprog "$pathcomp" || lasterr=$?
++ $mkdirprog "$pathcomp"
+ # mkdir can fail with a `File exist' error in case several
+ # install-sh are creating the directory concurrently. This
+ # is OK.
-+ test ! -d "$pathcomp" && { (exit ${lasterr-1}); exit; }
++ test -d "$pathcomp" || exit
+ fi
+ pathcomp=$pathcomp/
+ done
+ fi
+
+ if test -n "$dir_arg"; then
-+ $doit $instcmd "$dst" \
++ $doit $mkdircmd "$dst" \
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+ else
-+ # If we're going to rename the final executable, determine the name now.
-+ if test -z "$transformarg"; then
-+ dstfile=`basename "$dst"`
-+ else
-+ dstfile=`basename "$dst" $transformbasename \
-+ | sed $transformarg`$transformbasename
-+ fi
++ dstfile=`basename "$dst"`
+
-+ # don't allow the sed command to completely eliminate the filename.
-+ test -z "$dstfile" && dstfile=`basename "$dst"`
-+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
+
+ # Trap to clean up those temp files at exit.
-+ trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
++ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+ trap '(exit $?); exit' 1 2 13 15
+
-+ # Move or copy the file name to the temp name
-+ $doit $instcmd "$src" "$dsttmp" &&
++ # Copy the file name to the temp name.
++ $doit $cpprog "$src" "$dsttmp" &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+ # If any of these fail, we abort the whole thing. If we want to
+ # ignore errors from any of these, just make sure not to ignore
-+ # errors from the above "$doit $instcmd $src $dsttmp" command.
++ # errors from the above "$doit $cpprog $src $dsttmp" command.
+ #
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
@@ -2008,87 +1256,7 @@
+ }
+ }
+ fi || { (exit 1); exit; }
- done
--fi
--
--if [ x"$dir_arg" != x ]
--then
-- $doit $instcmd "$dst" &&
--
-- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
--else
--
--# If we're going to rename the final executable, determine the name now.
--
-- if [ x"$transformarg" = x ]
-- then
-- dstfile=`basename "$dst"`
-- else
-- dstfile=`basename "$dst" $transformbasename |
-- sed $transformarg`$transformbasename
-- fi
--
--# don't allow the sed command to completely eliminate the filename
--
-- if [ x"$dstfile" = x ]
-- then
-- dstfile=`basename "$dst"`
-- else
-- :
-- fi
--
--# Make a couple of temp file names in the proper directory.
--
-- dsttmp=$dstdir/#inst.$$#
-- rmtmp=$dstdir/#rm.$$#
--
--# Trap to clean up temp files at exit.
--
-- trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-- trap '(exit $?); exit' 1 2 13 15
--
--# Move or copy the file name to the temp name
--
-- $doit $instcmd "$src" "$dsttmp" &&
--
--# and set any options; do chmod last to preserve setuid bits
--
--# If any of these fail, we abort the whole thing. If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
--
-- if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-- if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
--
--# Now remove or move aside any old file at destination location. We try this
--# two ways since rm can't unlink itself on some systems and the destination
--# file might be busy for other reasons. In this case, the final cleanup
--# might fail but the new file should still install successfully.
--
--{
-- if [ -f "$dstdir/$dstfile" ]
-- then
-- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-- $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-- {
-- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-- (exit 1); exit
-- }
-- else
-- :
-- fi
--} &&
--
--# Now rename the file to the real destination.
--
-- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
--
--fi &&
++done
# The final little trick to "correctly" pass the exit status to the exit trap.
-
@@ -2103,22 +1271,22 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeutils-3.2.2/admin/missing kdeutils-patched/admin/missing
---- kdeutils-3.2.2/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ kdeutils-patched/admin/missing 2004-04-25 23:25:34.000000000 -0500
+diff -Nrua kdeutils-3.3.1/admin/missing kdeutils-patched/admin/missing
+--- kdeutils-3.3.1/admin/missing 2002-10-26 11:44:28.000000000 -0500
++++ kdeutils-patched/admin/missing 2004-11-03 20:01:22.000000000 -0600
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+
-+scriptversion=2003-09-02.23
++scriptversion=2004-09-07.08
+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
-@@ -38,12 +42,23 @@
+@@ -38,18 +42,24 @@
configure_ac=configure.in
fi
@@ -2140,9 +1308,15 @@
+ msg="probably too old"
+ fi
;;
- esac
+-esac
+-
+-# If it does not exist, or fails to run (possibly an outdated version),
+-# try to emulate it.
+-case "$1" in
-@@ -74,11 +89,13 @@
+ -h|--h|--he|--hel|--help)
+ echo "\
+@@ -74,11 +84,15 @@
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
tar try tar, gnutar, gtar, then tar without non-portable flags
@@ -2150,53 +1324,117 @@
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to <bug-automake@gnu.org>."
++ exit 0
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.4 - GNU automake"
+ echo "missing $scriptversion (GNU Automake)"
++ exit 0
;;
-*)
-@@ -94,7 +111,7 @@
+@@ -87,14 +101,44 @@
+ exit 1
+ ;;
+
+- aclocal*)
++esac
++
++# Now exit if we have it, but it failed. Also exit now if we
++# don't have it and --version was passed (most likely to detect
++# the program).
++case "$1" in
++ lex|yacc)
++ # Not GNU programs, they don't have --version.
++ ;;
++
++ tar)
++ if test -n "$run"; then
++ echo 1>&2 "ERROR: \`tar' requires --run"
++ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ exit 1
++ fi
++ ;;
++
++ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++ # Could not run --version or --help. This is probably someone
++ # running `$TOOL --version' or `$TOOL --help' to check whether
++ # $TOOL exists and not knowing $TOOL uses missing.
++ exit 1
fi
++ ;;
++esac
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case "$1" in
++ aclocal*)
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
-@@ -108,7 +125,7 @@
- fi
+@@ -102,13 +146,8 @@
+ ;;
+ autoconf)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
-@@ -122,7 +139,7 @@
- fi
+@@ -116,13 +155,8 @@
+ ;;
+ autoheader)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
-@@ -146,7 +163,7 @@
- fi
+@@ -140,13 +174,8 @@
+ ;;
+ automake*)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
-@@ -162,10 +179,10 @@
- fi
+@@ -156,16 +185,11 @@
+ ;;
+ autom4te)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
- system. You might have modified some files without having the
@@ -2208,7 +1446,7 @@
archive site."
file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-@@ -185,7 +202,7 @@
+@@ -185,7 +209,7 @@
bison|yacc)
echo 1>&2 "\
@@ -2217,7 +1455,7 @@
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
-@@ -215,7 +232,7 @@
+@@ -215,7 +239,7 @@
lex|flex)
echo 1>&2 "\
@@ -2226,26 +1464,49 @@
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
-@@ -243,7 +260,7 @@
- fi
+@@ -237,13 +261,8 @@
+ ;;
+ help2man)
+- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+- # We have it, but it failed.
+- exit 1
+- fi
+-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
-@@ -268,7 +285,7 @@
- fi
+@@ -262,13 +281,8 @@
+ ;;
+ makeinfo)
+- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+- # We have makeinfo, but it failed.
+- exit 1
+- fi
+-
echo 1>&2 "\
-WARNING: \`$1' is missing on your system. You should only need it if
+WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
indirectly affecting the aspect of the manual. The spurious
call might also be the consequence of using a buggy \`make' (AIX,
-@@ -323,10 +340,10 @@
+@@ -284,10 +298,6 @@
+ tar)
+ shift
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+@@ -323,10 +333,10 @@
+
*)
echo 1>&2 "\
-WARNING: \`$1' is needed, and you do not seem to have it handy on your
@@ -2258,7 +1519,7 @@
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
-@@ -334,3 +351,10 @@
+@@ -334,3 +344,10 @@
esac
exit 0
@@ -2269,9 +1530,9 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
-diff -Nrua kdeutils-3.2.2/admin/mkinstalldirs kdeutils-patched/admin/mkinstalldirs
---- kdeutils-3.2.2/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
-+++ kdeutils-patched/admin/mkinstalldirs 2004-04-25 23:25:34.000000000 -0500
+diff -Nrua kdeutils-3.3.1/admin/mkinstalldirs kdeutils-patched/admin/mkinstalldirs
+--- kdeutils-3.3.1/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
++++ kdeutils-patched/admin/mkinstalldirs 2004-11-03 20:01:22.000000000 -0600
@@ -1,20 +1,32 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -2396,17 +1657,17 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
-diff -Nrua kdeutils-3.2.2/admin/ylwrap kdeutils-patched/admin/ylwrap
---- kdeutils-3.2.2/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ kdeutils-patched/admin/ylwrap 2004-04-25 23:25:34.000000000 -0500
+diff -Nrua kdeutils-3.3.1/admin/ylwrap kdeutils-patched/admin/ylwrap
+--- kdeutils-3.3.1/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
++++ kdeutils-patched/admin/ylwrap 2004-11-03 20:01:22.000000000 -0600
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+
-+scriptversion=2003-11-18.20
++scriptversion=2004-09-10.20
+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003
++# Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
+# Free Software Foundation, Inc.
+#
# Written by Tom Tromey <tromey@cygnus.com>.
@@ -2513,18 +1774,19 @@
esac
# FIXME: add hostname here for parallel makes that run commands on
-@@ -79,61 +105,105 @@
+@@ -79,65 +105,118 @@
cd $dirname
-$prog ${1+"$@"} "$input"
+-status=$?
+case $# in
+ 0) $prog "$input" ;;
+ *) $prog "$@" "$input" ;;
+esac
- status=$?
++ret=$?
- if test $status -eq 0; then
+-if test $status -eq 0; then
- set X $pairlist
- shift
- first=yes
@@ -2561,6 +1823,7 @@
- # it is better for it to just mention the .y file with no
- # path.
- sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
++if test $ret -eq 0; then
+ set X $pairlist
+ shift
+ first=yes
@@ -2637,7 +1900,7 @@
+ -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g'`
+
+ sed -e "/^#/!b" -e "s,$input_rx,," -e "s,$from,$2," \
-+ -e "s,$FROM,$TARGET," "$from" >"$target" || status=$?
++ -e "s,$FROM,$TARGET," "$from" >"$target" || ret=$?
+
+ # Check whether header files must be updated.
+ if test $first = no; then
@@ -2655,7 +1918,7 @@
+ # is not specified, we don't want an error when the header
+ # file is "missing".
+ if test $first = yes; then
-+ status=1
++ ret=1
+ fi
+ fi
+ shift
@@ -2664,14 +1927,15 @@
+ done
else
- status=$?
-+ status=$?
++ ret=$?
fi
# Remove the directory.
-@@ -141,3 +211,12 @@
+ cd ..
rm -rf $dirname
- exit $status
+-exit $status
++exit $ret
+
+# Local Variables:
+# mode: shell-script
Modified: trunk/packages/kdeutils/debian/patches/05_pedantic-errors.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/05_pedantic-errors.diff 2004-11-18 23:16:57 UTC (rev 267)
+++ trunk/packages/kdeutils/debian/patches/05_pedantic-errors.diff 2004-11-18 23:19:42 UTC (rev 268)
@@ -1,7 +1,7 @@
-diff -Nrua kdeutils-3.2.2/admin/acinclude.m4.in kdeutils-patched/admin/acinclude.m4.in
---- kdeutils-3.2.2/admin/acinclude.m4.in 2004-03-30 07:04:04.000000000 -0600
-+++ kdeutils-patched/admin/acinclude.m4.in 2004-04-16 19:52:52.000000000 -0500
-@@ -2111,9 +2111,6 @@
+diff -Nrua kdeutils-3.3.0/admin/acinclude.m4.in kdeutils-patched/admin/acinclude.m4.in
+--- kdeutils-3.3.0/admin/acinclude.m4.in 2004-07-26 09:13:36.000000000 -0500
++++ kdeutils-patched/admin/acinclude.m4.in 2004-08-14 23:15:02.000000000 -0500
+@@ -2087,9 +2087,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
LIBS="$LIBS $X_EXTRA_LIBS"