rev 6184 - trunk/common-patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Mon May 14 21:37:44 UTC 2007
Author: ana
Date: 2007-05-14 21:37:44 +0000 (Mon, 14 May 2007)
New Revision: 6184
Modified:
trunk/common-patches/02_autotools_update.diff
trunk/common-patches/03_libtool_update.diff
Log:
updating common patches 02_autotools_update.diff is empty
Modified: trunk/common-patches/02_autotools_update.diff
===================================================================
--- trunk/common-patches/02_autotools_update.diff 2007-05-14 21:30:24 UTC (rev 6183)
+++ trunk/common-patches/02_autotools_update.diff 2007-05-14 21:37:44 UTC (rev 6184)
@@ -1,355 +0,0 @@
-diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh 2006-03-17 16:38:42.000000000 -0500
-+++ b/admin/install-sh 2006-03-24 19:22:40.000000000 -0500
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2005-11-07.23
-+scriptversion=2005-05-14.22
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -58,21 +58,7 @@
- rmprog="${RMPROG-rm}"
- mkdirprog="${MKDIRPROG-mkdir}"
-
--posix_glob=
--posix_mkdir=
--
--# Symbolic mode for testing mkdir with directories.
--# It is the same as 755, but also tests that "u+" works.
--test_mode=u=rwx,g=rx,o=rx,u+wx
--
--# Desired mode of installed file.
--mode=0755
--
--# Desired mode of newly created intermediate directories.
--# It is empty if not known yet.
--intermediate_mode=
--
--chmodcmd=$chmodprog
-+chmodcmd="$chmodprog 0755"
- chowncmd=
- chgrpcmd=
- stripcmd=
-@@ -125,7 +111,7 @@
-
- --help) echo "$usage"; exit $?;;
-
-- -m) mode=$2
-+ -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-@@ -178,8 +164,6 @@
- exit 0
- fi
-
--test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
--
- for src
- do
- # Protect names starting with `-'.
-@@ -189,11 +173,15 @@
-
- if test -n "$dir_arg"; then
- dst=$src
-- dstdir=$dst
-- test -d "$dstdir"
-- dstdir_status=$?
-- else
-+ src=
-
-+ if test -d "$dst"; then
-+ mkdircmd=:
-+ chmodcmd=
-+ else
-+ mkdircmd=$mkdirprog
-+ fi
-+ else
- # 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 '*'.
-@@ -220,122 +208,53 @@
- echo "$0: $dstarg: Is a directory" >&2
- exit 1
- fi
-- dstdir=$dst
-- dst=$dstdir/`basename "$src"`
-- dstdir_status=0
-- else
-- # Prefer dirname, but fall back on a substitute if dirname fails.
-- dstdir=`
-- (dirname "$dst") 2>/dev/null ||
-- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$dst" : 'X\(//\)[^/]' \| \
-- X"$dst" : 'X\(//\)$' \| \
-- X"$dst" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-- echo X"$dst" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'
-- `
--
-- test -d "$dstdir"
-- dstdir_status=$?
-+ dst=$dst/`basename "$src"`
- fi
- fi
-
-- obsolete_mkdir_used=false
-+ # This sed command emulates the dirname command.
-+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-- if test $dstdir_status != 0; then
-- case $posix_mkdir in
-- '')
-- posix_mkdir=false
-- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
-- posix_mkdir=true
-- else
-- # Remove any dirs left behind by ancient mkdir implementations.
-- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
-- fi ;;
-- esac
-+ # Make sure that the destination directory exists.
-
-- if
-- $posix_mkdir && {
-+ # Skip lots of stat calls in the usual case.
-+ if test ! -d "$dstdir"; then
-+ defaultIFS='
-+ '
-+ IFS="${IFS-$defaultIFS}"
-+
-+ oIFS=$IFS
-+ # Some sh's can't handle IFS=/ for some reason.
-+ IFS='%'
-+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+ shift
-+ IFS=$oIFS
-
-- # With -d, create the new directory with the user-specified mode.
-- # Otherwise, create it using the same intermediate mode that
-- # mkdir -p would use when creating intermediate directories.
-- # POSIX says that this mode is "$(umask -S),u+wx", so use that
-- # if umask -S works.
--
-- if test -n "$dir_arg"; then
-- mkdir_mode=$mode
-- else
-- case $intermediate_mode in
-- '')
-- if umask_S=`(umask -S) 2>/dev/null`; then
-- intermediate_mode=$umask_S,u+wx
-- else
-- intermediate_mode=$test_mode
-- fi ;;
-- esac
-- mkdir_mode=$intermediate_mode
-- fi
--
-- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
-- }
-- then :
-- else
-+ pathcomp=
-
-- # mkdir does not conform to POSIX, or it failed possibly due to
-- # a race condition. Create the directory the slow way, step by
-- # step, checking for races as we go.
--
-- case $dstdir in
-- /*) pathcomp=/ ;;
-- -*) pathcomp=./ ;;
-- *) pathcomp= ;;
-- esac
--
-- case $posix_glob in
-- '')
-- if (set -f) 2>/dev/null; then
-- posix_glob=true
-- else
-- posix_glob=false
-- fi ;;
-- esac
--
-- oIFS=$IFS
-- IFS=/
-- $posix_glob && set -f
-- set fnord $dstdir
-+ while test $# -ne 0 ; do
-+ pathcomp=$pathcomp$1
- shift
-- $posix_glob && set +f
-- IFS=$oIFS
--
-- for d
-- do
-- test "x$d" = x && continue
--
-- pathcomp=$pathcomp$d
-- if test ! -d "$pathcomp"; then
-- $mkdirprog "$pathcomp"
-- # Don't fail if two instances are running concurrently.
-- test -d "$pathcomp" || exit 1
-- fi
-- pathcomp=$pathcomp/
-- done
-- obsolete_mkdir_used=true
-- fi
-+ if test ! -d "$pathcomp"; then
-+ $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
-+ fi
-+ pathcomp=$pathcomp/
-+ done
- fi
-
- if test -n "$dir_arg"; then
-- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
-+ $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
-+ dstfile=`basename "$dst"`
-
- # Make a couple of temp file names in the proper directory.
- dsttmp=$dstdir/_inst.$$_
-@@ -343,6 +262,7 @@
-
- # Trap to clean up those temp files at exit.
- trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+ trap '(exit $?); exit' 1 2 13 15
-
- # Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
-@@ -356,10 +276,10 @@
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
-+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
-- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
-@@ -371,12 +291,11 @@
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
-- if test -f "$dst"; then
-- $doit $rmcmd -f "$dst" 2>/dev/null \
-- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-+ if test -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 $dst" >&2
-+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit 1
- }
- else
-@@ -385,14 +304,17 @@
- } &&
-
- # Now rename the file to the real destination.
-- $doit $mvcmd "$dsttmp" "$dst"
-+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- }
-- } || exit 1
--
-- trap '' 0
-- fi
-+ }
-+ fi || { (exit 1); exit 1; }
- done
-
-+# The final little trick to "correctly" pass the exit status to the exit trap.
-+{
-+ (exit 0); exit 0
-+}
-+
- # Local variables:
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
-diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2006-03-17 16:38:41.000000000 -0500
-+++ b/admin/missing 2006-03-24 19:22:40.000000000 -0500
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
-
--scriptversion=2004-09-07.08
-+scriptversion=2005-06-08.21
-
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-
-@@ -19,8 +19,8 @@
-
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -87,12 +87,12 @@
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-
- Send bug reports to <bug-automake at gnu.org>."
-- exit 0
-+ exit $?
- ;;
-
- -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing $scriptversion (GNU Automake)"
-- exit 0
-+ exit $?
- ;;
-
- -*)
-@@ -288,11 +288,18 @@
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
-+ # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
-- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-- fi
-+ # ... or it is the one specified with @setfilename ...
-+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-+ fi
-+ # If the file does not exist, the user really needs makeinfo;
-+ # let's fail without touching anything.
-+ test -f $file || exit 1
- touch $file
- ;;
-
Modified: trunk/common-patches/03_libtool_update.diff
===================================================================
--- trunk/common-patches/03_libtool_update.diff 2007-05-14 21:30:24 UTC (rev 6183)
+++ trunk/common-patches/03_libtool_update.diff 2007-05-14 21:37:44 UTC (rev 6184)
@@ -1,6 +1,6 @@
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2006-03-17 16:38:41.000000000 -0500
-+++ b/admin/libtool.m4.in 2006-03-24 19:22:40.000000000 -0500
+--- a/admin/libtool.m4.in 2007-05-14 12:58:18.000000000 +0200
++++ b/admin/libtool.m4.in 2007-05-14 23:36:38.000000000 +0200
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -685,7 +685,7 @@
- libsuff=
- if test "x$LINUX_64_MODE" = x64; then
- # Some platforms are per default 64-bit, so there's no /lib64
-- if test -d /lib64; then
+- if test -d /lib64 -a ! -h /lib64; then
- libsuff=64
- fi
- fi
@@ -3795,8 +3795,8 @@
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
diff -Nrua a/admin/ltmain.sh b/admin/ltmain.sh
---- a/admin/ltmain.sh 2006-03-17 16:38:41.000000000 -0500
-+++ b/admin/ltmain.sh 2006-03-24 19:22:40.000000000 -0500
+--- a/admin/ltmain.sh 2007-05-14 12:58:18.000000000 +0200
++++ b/admin/ltmain.sh 2007-05-14 23:36:38.000000000 +0200
@@ -1,7 +1,7 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
More information about the pkg-kde-commits
mailing list