[Pkg-kde-commits] rev 326 - in branches/kde-3.3.2: kdeaccessibility/debian/patches kdeadmin/debian/patches kdebase/debian/patches kdegraphics/debian/patches kdelibs/debian/patches kdeutils/debian/patches
Christopher Martin
chrsmrtn-guest@haydn.debian.org
Fri, 17 Dec 2004 06:37:28 -0700
Author: chrsmrtn-guest
Date: 2004-12-17 06:37:01 -0700 (Fri, 17 Dec 2004)
New Revision: 326
Modified:
branches/kde-3.3.2/kdeaccessibility/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdeadmin/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdebase/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdegraphics/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdelibs/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdeutils/debian/patches/02_autotools_update.diff
Log:
Fix autotools patch - update to latest version.
Modified: branches/kde-3.3.2/kdeaccessibility/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdeaccessibility/debian/patches/02_autotools_update.diff 2004-12-17 03:40:15 UTC (rev 325)
+++ branches/kde-3.3.2/kdeaccessibility/debian/patches/02_autotools_update.diff 2004-12-17 13:37:01 UTC (rev 326)
@@ -6,13 +6,13 @@
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-12.08
+
+# 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,76 +25,116 @@
+@@ -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.
@@ -164,6 +164,8 @@
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
@@ -722,7 +724,7 @@
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-09-10.20
++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
@@ -781,7 +783,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1155,7 +1157,7 @@
+ 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.
+
@@ -1168,7 +1170,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=
Modified: branches/kde-3.3.2/kdeadmin/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdeadmin/debian/patches/02_autotools_update.diff 2004-12-17 03:40:15 UTC (rev 325)
+++ branches/kde-3.3.2/kdeadmin/debian/patches/02_autotools_update.diff 2004-12-17 13:37:01 UTC (rev 326)
@@ -6,13 +6,13 @@
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-12.08
+
+# 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,76 +25,116 @@
+@@ -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.
@@ -164,6 +164,8 @@
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
@@ -722,7 +724,7 @@
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-09-10.20
++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
@@ -781,7 +783,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1155,7 +1157,7 @@
+ 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.
+
@@ -1168,7 +1170,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=
Modified: branches/kde-3.3.2/kdebase/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdebase/debian/patches/02_autotools_update.diff 2004-12-17 03:40:15 UTC (rev 325)
+++ branches/kde-3.3.2/kdebase/debian/patches/02_autotools_update.diff 2004-12-17 13:37:01 UTC (rev 326)
@@ -6,13 +6,13 @@
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-12.08
+
+# 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,76 +25,116 @@
+@@ -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.
@@ -164,6 +164,8 @@
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
@@ -722,7 +724,7 @@
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-09-10.20
++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
@@ -781,7 +783,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1155,7 +1157,7 @@
+ 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.
+
@@ -1168,7 +1170,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=
Modified: branches/kde-3.3.2/kdegraphics/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdegraphics/debian/patches/02_autotools_update.diff 2004-12-17 03:40:15 UTC (rev 325)
+++ branches/kde-3.3.2/kdegraphics/debian/patches/02_autotools_update.diff 2004-12-17 13:37:01 UTC (rev 326)
@@ -6,13 +6,13 @@
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-12.08
+
+# 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,76 +25,116 @@
+@@ -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.
@@ -164,6 +164,8 @@
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
@@ -179,8 +181,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- kdelibs-orig/admin/config.guess
-+++ kdelibs-patched/admin/config.guess
+--- kdegraphics-orig/admin/config.guess
++++ kdegraphics-patched/admin/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -242,8 +244,8 @@
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
---- kdelibs-orig/admin/depcomp
-+++ kdelibs-patched/admin/depcomp
+--- kdegraphics-orig/admin/depcomp
++++ kdegraphics-patched/admin/depcomp
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -714,15 +716,15 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- kdelibs-orig/admin/install-sh
-+++ kdelibs-patched/admin/install-sh
+--- kdegraphics-orig/admin/install-sh
++++ kdegraphics-patched/admin/install-sh
@@ -1,19 +1,38 @@
#!/bin/sh
-#
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-09-10.20
++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
@@ -781,7 +783,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1155,7 +1157,7 @@
+ 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.
+
@@ -1168,7 +1170,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=
@@ -1264,8 +1267,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- kdelibs-orig/admin/missing
-+++ kdelibs-patched/admin/missing
+--- kdegraphics-orig/admin/missing
++++ kdegraphics-patched/admin/missing
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -1522,8 +1525,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- kdelibs-orig/admin/mkinstalldirs
-+++ kdelibs-patched/admin/mkinstalldirs
+--- kdegraphics-orig/admin/mkinstalldirs
++++ kdegraphics-patched/admin/mkinstalldirs
@@ -1,20 +1,32 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -1648,8 +1651,8 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
---- kdelibs-orig/admin/ylwrap
-+++ kdelibs-patched/admin/ylwrap
+--- kdegraphics-orig/admin/ylwrap
++++ kdegraphics-patched/admin/ylwrap
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
Modified: branches/kde-3.3.2/kdelibs/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdelibs/debian/patches/02_autotools_update.diff 2004-12-17 03:40:15 UTC (rev 325)
+++ branches/kde-3.3.2/kdelibs/debian/patches/02_autotools_update.diff 2004-12-17 13:37:01 UTC (rev 326)
@@ -6,13 +6,13 @@
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-12.08
+
+# 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,76 +25,116 @@
+@@ -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.
@@ -164,6 +164,8 @@
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
@@ -722,7 +724,7 @@
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-09-10.20
++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
@@ -781,7 +783,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1155,7 +1157,7 @@
+ 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.
+
@@ -1168,7 +1170,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=
Modified: branches/kde-3.3.2/kdeutils/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdeutils/debian/patches/02_autotools_update.diff 2004-12-17 03:40:15 UTC (rev 325)
+++ branches/kde-3.3.2/kdeutils/debian/patches/02_autotools_update.diff 2004-12-17 13:37:01 UTC (rev 326)
@@ -6,13 +6,13 @@
# Wrapper for compilers which do not understand `-c -o'.
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-+scriptversion=2004-09-10.20
++scriptversion=2004-10-12.08
+
+# 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,76 +25,116 @@
+@@ -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.
@@ -164,6 +164,8 @@
if test -f "$cofile"; then
- mv "$cofile" "$ofile"
+ mv "$cofile" "$ofile"
++elif test -f "${cofile}bj"; then
++ mv "${cofile}bj" "$ofile"
fi
-rmdir $lockdir
@@ -722,7 +724,7 @@
# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
+
-+scriptversion=2004-09-10.20
++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
@@ -781,7 +783,7 @@
# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
-@@ -41,236 +58,265 @@
+@@ -41,236 +58,266 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
@@ -1155,7 +1157,7 @@
+ 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.
+
@@ -1168,7 +1170,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=