rev 6458 - in kde-extras/kwlan: tags tags/0.6.2-1/debian tags/0.6.2-1/debian/patches trunk/debian trunk/debian/patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Sun Jun 10 10:06:53 UTC 2007
Author: fboudra-guest
Date: 2007-06-10 10:06:53 +0000 (Sun, 10 Jun 2007)
New Revision: 6458
Added:
kde-extras/kwlan/tags/0.6.2-1/
Modified:
kde-extras/kwlan/tags/0.6.2-1/debian/changelog
kde-extras/kwlan/tags/0.6.2-1/debian/patches/02_autotools_update.diff
kde-extras/kwlan/tags/0.6.2-1/debian/patches/03_libtool_update.diff
kde-extras/kwlan/tags/0.6.2-1/debian/rules
kde-extras/kwlan/trunk/debian/changelog
kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff
kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff
kde-extras/kwlan/trunk/debian/rules
Log:
Tags kwlan-0.6.2-1:
* New upstream release. (Closes: #427583)
* Add option to show commands in kdesu password requests.
* Cleanout upstream tarball shipped with debian/ dir.
* Remove svn commit files.
* Add clean target in rules to fix FTBFS if built twice in a row.
(Closes: #424485)
Copied: kde-extras/kwlan/tags/0.6.2-1 (from rev 6457, kde-extras/kwlan/trunk)
Modified: kde-extras/kwlan/tags/0.6.2-1/debian/changelog
===================================================================
--- kde-extras/kwlan/trunk/debian/changelog 2007-06-09 10:02:15 UTC (rev 6457)
+++ kde-extras/kwlan/tags/0.6.2-1/debian/changelog 2007-06-10 10:06:53 UTC (rev 6458)
@@ -1,17 +1,21 @@
-kwlan (0.6.2-1) UNRELEASED; urgency=low
+kwlan (0.6.2-1) unstable; urgency=low
- * (NOT RELEASED YET) New upstream release
- * Don't ship CMakeLists.txt
- * clean:: rm -f po/*/kwlan.gm
- - FTBFS if built twice in a row (Closes: #424485)
+ * New upstream release. (Closes: #427583)
+ * Add option to show commands in kdesu password requests.
- * TODO: Cleanout upstream shipped debian/ dir :-(
+ [ Fathi Boudra ]
+ * Cleanout upstream tarball shipped with debian/ dir.
+ * Remove svn commit files.
- -- Mark Purcell <msp at debian.org> Tue, 22 May 2007 22:23:21 +0100
+ [ Mark Purcell ]
+ * Add clean target in rules to fix FTBFS if built twice in a row.
+ (Closes: #424485)
+ -- Fathi Boudra <fboudra at free.fr> Sun, 10 Jun 2007 11:10:31 +0200
+
kwlan (0.6.1-2) unstable; urgency=low
- * Upload to unstable
+ * Upload to unstable.
-- Mark Purcell <msp at debian.org> Thu, 29 Mar 2007 22:23:38 +0100
Modified: kde-extras/kwlan/tags/0.6.2-1/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff 2007-06-09 10:02:15 UTC (rev 6457)
+++ kde-extras/kwlan/tags/0.6.2-1/debian/patches/02_autotools_update.diff 2007-06-10 10:06:53 UTC (rev 6458)
@@ -1,113 +1,304 @@
+diff -Nrua a/admin/depcomp b/admin/depcomp
+--- a/admin/depcomp 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/depcomp 2007-06-10 11:13:27.000000000 +0200
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-07-09.11
++scriptversion=2006-10-15.18
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 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
+@@ -91,7 +92,20 @@
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff. Hmm.
+- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am. Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++ for arg
++ do
++ case $arg in
++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++ *) set fnord "$@" "$arg" ;;
++ esac
++ shift # fnord
++ shift # $arg
++ done
++ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+@@ -276,6 +290,46 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++hp2)
++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++ # compilers, which have integrated preprocessors. The correct option
++ # to use with these is +Maked; it writes dependencies to a file named
++ # 'foo.d', which lands next to the object file, wherever that
++ # happens to be.
++ # Much of this is similar to the tru64 case; see comments there.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2"
++ exit $stat
++ fi
++
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add `dependent.h:' lines.
++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile" "$tmpdepfile2"
++ ;;
++
+ tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+@@ -288,13 +342,13 @@
+
+ if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+- # static library. This mecanism is used in libtool 1.4 series to
++ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+- # compilations output dependencies in in $dir.libs/$base.o.d and
++ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh 2007-02-13 14:18:54.000000000 +0100
-+++ b/admin/install-sh 2007-03-22 08:55:25.000000000 +0100
+--- a/admin/install-sh 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/install-sh 2007-06-10 11:13:27.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-11-07.23
-+scriptversion=2005-05-14.22
++scriptversion=2006-10-14.15
# 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}"
+@@ -39,15 +39,24 @@
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch. It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
++
++nl='
++'
++IFS=" "" $nl"
--posix_glob=
--posix_mkdir=
--
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
+
+ mvprog="${MVPROG-mv}"
+ cpprog="${CPPROG-cp}"
+@@ -61,17 +70,9 @@
+ 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 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"
+ chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
- stripcmd=
-@@ -125,7 +111,7 @@
+@@ -109,7 +110,7 @@
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ "
- --help) echo "$usage"; exit $?;;
-
-- -m) mode=$2
-+ -m) chmodcmd="$chmodprog $2"
+-while test -n "$1"; do
++while test $# -ne 0; do
+ case $1 in
+ -c) shift
+ continue;;
+@@ -128,6 +129,12 @@
+ -m) mode=$2
shift
shift
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
continue;;
-@@ -178,8 +164,6 @@
+
+ -o) chowncmd="$chownprog $2"
+@@ -150,25 +157,33 @@
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- *) # 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
++ --) shift
+ break;;
++
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
++
++ *) break;;
+ esac
+ done
+
+-if test -z "$1"; then
++if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
++ # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ # 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
++fi
++
++if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+@@ -178,7 +193,32 @@
exit 0
fi
-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
--
++if test -z "$dir_arg"; then
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Set umask so as not to create temps with too-generous modes.
++ # However, 'strip' requires both read and write access to temps.
++ case $mode in
++ # Optimize common cases.
++ *644) cp_umask=133;;
++ *755) cp_umask=22;;
++
++ *[0-7])
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw='% 200'
++ fi
++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++ *)
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw=,u+rw
++ fi
++ cp_umask=$mode$u_plus_rw;;
++ esac
++fi
+
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\(//\)$' \| \
+@@ -230,14 +270,25 @@
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-- echo X"$dst" |
++ 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
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
+ `
-- 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
-- '')
+ test -d "$dstdir"
+@@ -250,51 +301,86 @@
+ 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
@@ -116,32 +307,36 @@
- 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}"
++ # Create intermediate dirs using mode 755 as modified by the umask.
++ # This is like FreeBSD 'install' as of 1997-10-28.
++ umask=`umask`
++ case $stripcmd.$umask in
++ # Optimize common cases.
++ *[2367][2367]) mkdir_umask=$umask;;
++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
-+ 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
++ *[0-7])
++ mkdir_umask=`expr $umask + 22 \
++ - $umask % 100 % 40 + $umask % 20 \
++ - $umask % 10 % 4 + $umask % 2
++ `;;
++ *) mkdir_umask=$umask,go-w;;
++ esac
-- # With -d, create the new directory with the user-specified mode.
+ # 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
++ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
- mkdir_mode=$mode
-- else
++ mkdir_mode=-m$mode
+ else
- case $intermediate_mode in
- '')
- if umask_S=`(umask -S) 2>/dev/null`; then
@@ -151,157 +346,163 @@
- fi ;;
- esac
- mkdir_mode=$intermediate_mode
-- fi
--
++ mkdir_mode=
+ fi
+
- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
- }
-- then :
-- else
-+ pathcomp=
++ posix_mkdir=false
++ case $umask in
++ *[123567][0-7][0-7])
++ # POSIX mkdir -p sets u+wx bits regardless of umask, which
++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
++
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
+ then :
+ else
- # 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
++ # The umask is ridiculous, or 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
++ /*) prefix=/ ;;
++ -*) prefix=./ ;;
++ *) prefix= ;;
+ esac
+
+ case $posix_glob in
+@@ -314,19 +400,39 @@
+ $posix_glob && set +f
+ IFS=$oIFS
+
++ prefixes=
++
+ for d
+ do
- test "x$d" = x && continue
--
++ test -z "$d" && 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
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
+ fi
- pathcomp=$pathcomp/
-- done
++ prefix=$prefix/
+ 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
++
++ if test -n "$prefixes"; then
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
+ fi
-+ pathcomp=$pathcomp/
-+ done
+ fi
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 ||
+@@ -334,7 +440,7 @@
+ { 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"; }
-+
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
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.
+@@ -345,7 +451,7 @@
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 @@
+- $doit $cpprog "$src" "$dsttmp" &&
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+@@ -356,7 +462,7 @@
{ 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"; } &&
++ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$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="
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2007-02-13 14:18:54.000000000 +0100
-+++ b/admin/missing 2007-03-22 08:55:25.000000000 +0100
+--- a/admin/missing 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/missing 2007-06-10 11:13:27.000000000 +0200
@@ -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
++scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -316,7 +517,33 @@
# 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 @@
+@@ -33,6 +33,8 @@
+ fi
+
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +46,7 @@
+
+ msg="missing on your system"
+
+-case "$1" in
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+@@ -77,6 +79,7 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+@@ -87,12 +90,12 @@
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake at gnu.org>."
@@ -331,19 +558,134 @@
;;
-*)
-@@ -288,11 +288,18 @@
+@@ -106,7 +109,7 @@
+ # 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
++case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+@@ -135,7 +138,7 @@
+
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $1 in
+ aclocal*)
+ echo 1>&2 "\
+ WARNING: \`$1' is $msg. You should only need it if
+@@ -164,7 +167,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -192,8 +195,8 @@
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+@@ -214,25 +217,25 @@
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+@@ -244,18 +247,18 @@
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+@@ -267,11 +270,9 @@
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+@@ -288,11 +289,24 @@
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."
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
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`
++ 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
@@ -353,3 +695,41 @@
touch $file
;;
+@@ -310,13 +324,13 @@
+ fi
+ firstarg="$1"
+ if shift; then
+- case "$firstarg" in
++ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+- case "$firstarg" in
++ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
+--- a/admin/mkinstalldirs 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/mkinstalldirs 2007-06-10 11:13:27.000000000 +0200
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+
+-scriptversion=2005-06-29.22
++scriptversion=2006-05-11.19
+
+ # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+@@ -11,6 +11,9 @@
+ # bugs to <bug-automake at gnu.org> or send patches to
+ # <automake-patches at gnu.org>.
+
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
+ dirmode=
+
Modified: kde-extras/kwlan/tags/0.6.2-1/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff 2007-06-09 10:02:15 UTC (rev 6457)
+++ kde-extras/kwlan/tags/0.6.2-1/debian/patches/03_libtool_update.diff 2007-06-10 10:06:53 UTC (rev 6458)
@@ -1,6 +1,6 @@
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2007-02-13 14:18:54.000000000 +0100
-+++ b/admin/libtool.m4.in 2007-03-22 08:55:25.000000000 +0100
+--- a/admin/libtool.m4.in 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/libtool.m4.in 2007-06-10 11:13:27.000000000 +0200
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -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 2007-02-13 14:18:54.000000000 +0100
-+++ b/admin/ltmain.sh 2007-03-22 08:55:25.000000000 +0100
+--- a/admin/ltmain.sh 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/ltmain.sh 2007-06-10 11:13:27.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.
Modified: kde-extras/kwlan/tags/0.6.2-1/debian/rules
===================================================================
--- kde-extras/kwlan/trunk/debian/rules 2007-06-09 10:02:15 UTC (rev 6457)
+++ kde-extras/kwlan/tags/0.6.2-1/debian/rules 2007-06-10 10:06:53 UTC (rev 6458)
@@ -12,13 +12,13 @@
DEB_BUILDDIR = .
DEB_CONFIGURE_EXTRA_FLAGS := --enable-sudo
+makebuilddir/kwlan::
+ # remove svn commit file
+ find . -type f -name '*.tmp' | xargs rm -f
+
clean::
rm -f po/*/kwlan.gmo
-install/kwlan::
- # Bogus, shouldn't be shipped..
- rm -f debian/kaffeine/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt
-
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
Modified: kde-extras/kwlan/trunk/debian/changelog
===================================================================
--- kde-extras/kwlan/trunk/debian/changelog 2007-06-09 10:02:15 UTC (rev 6457)
+++ kde-extras/kwlan/trunk/debian/changelog 2007-06-10 10:06:53 UTC (rev 6458)
@@ -1,17 +1,21 @@
-kwlan (0.6.2-1) UNRELEASED; urgency=low
+kwlan (0.6.2-1) unstable; urgency=low
- * (NOT RELEASED YET) New upstream release
- * Don't ship CMakeLists.txt
- * clean:: rm -f po/*/kwlan.gm
- - FTBFS if built twice in a row (Closes: #424485)
+ * New upstream release. (Closes: #427583)
+ * Add option to show commands in kdesu password requests.
- * TODO: Cleanout upstream shipped debian/ dir :-(
+ [ Fathi Boudra ]
+ * Cleanout upstream tarball shipped with debian/ dir.
+ * Remove svn commit files.
- -- Mark Purcell <msp at debian.org> Tue, 22 May 2007 22:23:21 +0100
+ [ Mark Purcell ]
+ * Add clean target in rules to fix FTBFS if built twice in a row.
+ (Closes: #424485)
+ -- Fathi Boudra <fboudra at free.fr> Sun, 10 Jun 2007 11:10:31 +0200
+
kwlan (0.6.1-2) unstable; urgency=low
- * Upload to unstable
+ * Upload to unstable.
-- Mark Purcell <msp at debian.org> Thu, 29 Mar 2007 22:23:38 +0100
Modified: kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff 2007-06-09 10:02:15 UTC (rev 6457)
+++ kde-extras/kwlan/trunk/debian/patches/02_autotools_update.diff 2007-06-10 10:06:53 UTC (rev 6458)
@@ -1,113 +1,304 @@
+diff -Nrua a/admin/depcomp b/admin/depcomp
+--- a/admin/depcomp 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/depcomp 2007-06-10 11:13:27.000000000 +0200
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-07-09.11
++scriptversion=2006-10-15.18
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 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
+@@ -91,7 +92,20 @@
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff. Hmm.
+- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am. Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++ for arg
++ do
++ case $arg in
++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++ *) set fnord "$@" "$arg" ;;
++ esac
++ shift # fnord
++ shift # $arg
++ done
++ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+@@ -276,6 +290,46 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++hp2)
++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++ # compilers, which have integrated preprocessors. The correct option
++ # to use with these is +Maked; it writes dependencies to a file named
++ # 'foo.d', which lands next to the object file, wherever that
++ # happens to be.
++ # Much of this is similar to the tru64 case; see comments there.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2"
++ exit $stat
++ fi
++
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add `dependent.h:' lines.
++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile" "$tmpdepfile2"
++ ;;
++
+ tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+@@ -288,13 +342,13 @@
+
+ if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+- # static library. This mecanism is used in libtool 1.4 series to
++ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+- # compilations output dependencies in in $dir.libs/$base.o.d and
++ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff -Nrua a/admin/install-sh b/admin/install-sh
---- a/admin/install-sh 2007-02-13 14:18:54.000000000 +0100
-+++ b/admin/install-sh 2007-03-22 08:55:25.000000000 +0100
+--- a/admin/install-sh 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/install-sh 2007-06-10 11:13:27.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-11-07.23
-+scriptversion=2005-05-14.22
++scriptversion=2006-10-14.15
# 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}"
+@@ -39,15 +39,24 @@
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch. It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
++
++nl='
++'
++IFS=" "" $nl"
--posix_glob=
--posix_mkdir=
--
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
+
+ mvprog="${MVPROG-mv}"
+ cpprog="${CPPROG-cp}"
+@@ -61,17 +70,9 @@
+ 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 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"
+ chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
- stripcmd=
-@@ -125,7 +111,7 @@
+@@ -109,7 +110,7 @@
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ "
- --help) echo "$usage"; exit $?;;
-
-- -m) mode=$2
-+ -m) chmodcmd="$chmodprog $2"
+-while test -n "$1"; do
++while test $# -ne 0; do
+ case $1 in
+ -c) shift
+ continue;;
+@@ -128,6 +129,12 @@
+ -m) mode=$2
shift
shift
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
continue;;
-@@ -178,8 +164,6 @@
+
+ -o) chowncmd="$chownprog $2"
+@@ -150,25 +157,33 @@
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- *) # 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
++ --) shift
+ break;;
++
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
++
++ *) break;;
+ esac
+ done
+
+-if test -z "$1"; then
++if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
++ # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ # 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
++fi
++
++if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+@@ -178,7 +193,32 @@
exit 0
fi
-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
--
++if test -z "$dir_arg"; then
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Set umask so as not to create temps with too-generous modes.
++ # However, 'strip' requires both read and write access to temps.
++ case $mode in
++ # Optimize common cases.
++ *644) cp_umask=133;;
++ *755) cp_umask=22;;
++
++ *[0-7])
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw='% 200'
++ fi
++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++ *)
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw=,u+rw
++ fi
++ cp_umask=$mode$u_plus_rw;;
++ esac
++fi
+
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\(//\)$' \| \
+@@ -230,14 +270,25 @@
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-- echo X"$dst" |
++ 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
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
+ `
-- 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
-- '')
+ test -d "$dstdir"
+@@ -250,51 +301,86 @@
+ 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
@@ -116,32 +307,36 @@
- 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}"
++ # Create intermediate dirs using mode 755 as modified by the umask.
++ # This is like FreeBSD 'install' as of 1997-10-28.
++ umask=`umask`
++ case $stripcmd.$umask in
++ # Optimize common cases.
++ *[2367][2367]) mkdir_umask=$umask;;
++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
-+ 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
++ *[0-7])
++ mkdir_umask=`expr $umask + 22 \
++ - $umask % 100 % 40 + $umask % 20 \
++ - $umask % 10 % 4 + $umask % 2
++ `;;
++ *) mkdir_umask=$umask,go-w;;
++ esac
-- # With -d, create the new directory with the user-specified mode.
+ # 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
++ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
- mkdir_mode=$mode
-- else
++ mkdir_mode=-m$mode
+ else
- case $intermediate_mode in
- '')
- if umask_S=`(umask -S) 2>/dev/null`; then
@@ -151,157 +346,163 @@
- fi ;;
- esac
- mkdir_mode=$intermediate_mode
-- fi
--
++ mkdir_mode=
+ fi
+
- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
- }
-- then :
-- else
-+ pathcomp=
++ posix_mkdir=false
++ case $umask in
++ *[123567][0-7][0-7])
++ # POSIX mkdir -p sets u+wx bits regardless of umask, which
++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
++
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
+ then :
+ else
- # 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
++ # The umask is ridiculous, or 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
++ /*) prefix=/ ;;
++ -*) prefix=./ ;;
++ *) prefix= ;;
+ esac
+
+ case $posix_glob in
+@@ -314,19 +400,39 @@
+ $posix_glob && set +f
+ IFS=$oIFS
+
++ prefixes=
++
+ for d
+ do
- test "x$d" = x && continue
--
++ test -z "$d" && 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
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
+ fi
- pathcomp=$pathcomp/
-- done
++ prefix=$prefix/
+ 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
++
++ if test -n "$prefixes"; then
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
+ fi
-+ pathcomp=$pathcomp/
-+ done
+ fi
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 ||
+@@ -334,7 +440,7 @@
+ { 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"; }
-+
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
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.
+@@ -345,7 +451,7 @@
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 @@
+- $doit $cpprog "$src" "$dsttmp" &&
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+@@ -356,7 +462,7 @@
{ 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"; } &&
++ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$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="
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
diff -Nrua a/admin/missing b/admin/missing
---- a/admin/missing 2007-02-13 14:18:54.000000000 +0100
-+++ b/admin/missing 2007-03-22 08:55:25.000000000 +0100
+--- a/admin/missing 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/missing 2007-06-10 11:13:27.000000000 +0200
@@ -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
++scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -316,7 +517,33 @@
# 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 @@
+@@ -33,6 +33,8 @@
+ fi
+
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +46,7 @@
+
+ msg="missing on your system"
+
+-case "$1" in
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+@@ -77,6 +79,7 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+@@ -87,12 +90,12 @@
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake at gnu.org>."
@@ -331,19 +558,134 @@
;;
-*)
-@@ -288,11 +288,18 @@
+@@ -106,7 +109,7 @@
+ # 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
++case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+@@ -135,7 +138,7 @@
+
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $1 in
+ aclocal*)
+ echo 1>&2 "\
+ WARNING: \`$1' is $msg. You should only need it if
+@@ -164,7 +167,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -192,8 +195,8 @@
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+@@ -214,25 +217,25 @@
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+@@ -244,18 +247,18 @@
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+@@ -267,11 +270,9 @@
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+@@ -288,11 +289,24 @@
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."
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
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`
++ 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
@@ -353,3 +695,41 @@
touch $file
;;
+@@ -310,13 +324,13 @@
+ fi
+ firstarg="$1"
+ if shift; then
+- case "$firstarg" in
++ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+- case "$firstarg" in
++ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+diff -Nrua a/admin/mkinstalldirs b/admin/mkinstalldirs
+--- a/admin/mkinstalldirs 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/mkinstalldirs 2007-06-10 11:13:27.000000000 +0200
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+
+-scriptversion=2005-06-29.22
++scriptversion=2006-05-11.19
+
+ # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+@@ -11,6 +11,9 @@
+ # bugs to <bug-automake at gnu.org> or send patches to
+ # <automake-patches at gnu.org>.
+
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
+ dirmode=
+
Modified: kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff
===================================================================
--- kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff 2007-06-09 10:02:15 UTC (rev 6457)
+++ kde-extras/kwlan/trunk/debian/patches/03_libtool_update.diff 2007-06-10 10:06:53 UTC (rev 6458)
@@ -1,6 +1,6 @@
diff -Nrua a/admin/libtool.m4.in b/admin/libtool.m4.in
---- a/admin/libtool.m4.in 2007-02-13 14:18:54.000000000 +0100
-+++ b/admin/libtool.m4.in 2007-03-22 08:55:25.000000000 +0100
+--- a/admin/libtool.m4.in 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/libtool.m4.in 2007-06-10 11:13:27.000000000 +0200
@@ -1,28 +1,13 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
@@ -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 2007-02-13 14:18:54.000000000 +0100
-+++ b/admin/ltmain.sh 2007-03-22 08:55:25.000000000 +0100
+--- a/admin/ltmain.sh 2007-04-13 19:50:14.000000000 +0200
++++ b/admin/ltmain.sh 2007-06-10 11:13:27.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.
Modified: kde-extras/kwlan/trunk/debian/rules
===================================================================
--- kde-extras/kwlan/trunk/debian/rules 2007-06-09 10:02:15 UTC (rev 6457)
+++ kde-extras/kwlan/trunk/debian/rules 2007-06-10 10:06:53 UTC (rev 6458)
@@ -12,13 +12,13 @@
DEB_BUILDDIR = .
DEB_CONFIGURE_EXTRA_FLAGS := --enable-sudo
+makebuilddir/kwlan::
+ # remove svn commit file
+ find . -type f -name '*.tmp' | xargs rm -f
+
clean::
rm -f po/*/kwlan.gmo
-install/kwlan::
- # Bogus, shouldn't be shipped..
- rm -f debian/kaffeine/usr/share/doc/kde/HTML/en/doc/CMakeLists.txt
-
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
More information about the pkg-kde-commits
mailing list