Ubuntu
xkeyboard-config package

Merge lp:~ubuntu-branches/ubuntu/lucid/xkeyboard-config/lucid-201010032130 into lp:ubuntu/lucid/xkeyboard-config

  1. Lucid (10.04)
  2. lucid-201010032130
  3. Merge into lucid
Proposed by James Westby
Status: Work in progress
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/xkeyboard-config/lucid-201010032130
Merge into: lp:ubuntu/lucid/xkeyboard-config
Diff against target: 955 lines (+1/-890) (has conflicts)
4 files modified
debian/xkb-data.install (+1/-0)
install-sh (+0/-519)
missing (+0/-367)
semantics/semantics.dir (+0/-4)
Contents conflict in Makefile.in
Contents conflict in aclocal.m4
Contents conflict in compat/Makefile.in
Contents conflict in compat/compat.dir
Contents conflict in configure
Conflict adding file debian/xkb-data.install.  Moved existing file to debian/xkb-data.install.moved.
Contents conflict in docs/Makefile.in
Contents conflict in geometry/Makefile.in
Contents conflict in geometry/digital_vndr/Makefile.in
Contents conflict in geometry/geometry.dir
Contents conflict in geometry/sgi_vndr/Makefile.in
Contents conflict in keycodes/Makefile.in
Contents conflict in keycodes/digital_vndr/Makefile.in
Contents conflict in keycodes/keycodes.dir
Contents conflict in keycodes/sgi_vndr/Makefile.in
Contents conflict in keymap/Makefile.in
Contents conflict in keymap/digital_vndr/Makefile.in
Contents conflict in keymap/keymap.dir
Contents conflict in keymap/sgi_vndr/Makefile.in
Contents conflict in keymap/sun_vndr/Makefile.in
Contents conflict in po/Makefile.in.in
Contents conflict in rules/Makefile.in
Contents conflict in rules/bin/Makefile.in
Contents conflict in rules/compat/Makefile.in
Contents conflict in rules/evdev.xml.in
Contents conflict in rules/extras/Makefile.in
Contents conflict in semantics/Makefile.in
Contents conflict in symbols/Makefile.in
Contents conflict in symbols/digital_vndr/Makefile.in
Contents conflict in symbols/extras/Makefile.in
Contents conflict in symbols/fujitsu_vndr/Makefile.in
Contents conflict in symbols/hp_vndr/Makefile.in
Contents conflict in symbols/macintosh_vndr/Makefile.in
Contents conflict in symbols/nec_vndr/Makefile.in
Contents conflict in symbols/sgi_vndr/Makefile.in
Contents conflict in symbols/sony_vndr/Makefile.in
Contents conflict in symbols/sun_vndr/Makefile.in
Contents conflict in symbols/symbols.dir
Contents conflict in symbols/xfree68_vndr/Makefile.in
Contents conflict in types/Makefile.in
Contents conflict in types/types.dir
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/xkeyboard-config/lucid-201010032130

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/xkeyboard-config now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/xkeyboard-config/lucid-201010032130. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

69. By Bryce Harrington

Revert kazakh patch - rejected by archive admins as too likely to cause
regressions for others.

68. By Bryce Harrington

Patch to fix kazakh keyboard layout

67. By Bryce Harrington

Add missing attribution line

66. By Bryce Harrington

Changes for last few uploads

65. By Bryce Harrington

Add tw to Makefile so it will install

64. By Bryce Harrington

Correct mis-copied patch

63. By Bryce Harrington

Cherrypick patches from upstream git

This includes patches to enable the Apple aluminum keyboards, and
various minor layout enhancements or fixes to particular keys.

62. By Bryce Harrington

Give Arne credit

61. By Bryce Harrington

Add two patches from Arne

60. By Bryce Harrington

Merge with Debian and upstream version 1.8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'Makefile.in' => 'Makefile.in.THIS'
=== renamed file 'aclocal.m4' => 'aclocal.m4.THIS'
=== renamed file 'compat/Makefile.in' => 'compat/Makefile.in.THIS'
=== renamed file 'compat/compat.dir' => 'compat/compat.dir.THIS'
=== renamed file 'configure' => 'configure.THIS'
=== added file 'debian/xkb-data.install'
--- debian/xkb-data.install 1970-01-01 00:00:00 +0000
+++ debian/xkb-data.install 2010-10-03 21:38:42 +0000
@@ -0,0 +1,1 @@
1usr/share/X11
02
=== renamed file 'debian/xkb-data.install' => 'debian/xkb-data.install.moved'
=== renamed file 'docs/Makefile.in' => 'docs/Makefile.in.THIS'
=== renamed file 'geometry/Makefile.in' => 'geometry/Makefile.in.THIS'
=== renamed file 'geometry/digital_vndr/Makefile.in' => 'geometry/digital_vndr/Makefile.in.THIS'
=== renamed file 'geometry/geometry.dir' => 'geometry/geometry.dir.THIS'
=== renamed file 'geometry/sgi_vndr/Makefile.in' => 'geometry/sgi_vndr/Makefile.in.THIS'
=== removed file 'install-sh'
--- install-sh 2009-01-28 06:40:24 +0000
+++ install-sh 1970-01-01 00:00:00 +0000
@@ -1,519 +0,0 @@
1#!/bin/sh
2# install - install a program, script, or datafile
3
4scriptversion=2006-12-25.00
5
6# This originates from X11R5 (mit/util/scripts/install.sh), which was
7# later released in X11R6 (xc/config/util/install.sh) with the
8# following copyright and license.
9#
10# Copyright (C) 1994 X Consortium
11#
12# Permission is hereby granted, free of charge, to any person obtaining a copy
13# of this software and associated documentation files (the "Software"), to
14# deal in the Software without restriction, including without limitation the
15# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
16# sell copies of the Software, and to permit persons to whom the Software is
17# furnished to do so, subject to the following conditions:
18#
19# The above copyright notice and this permission notice shall be included in
20# all copies or substantial portions of the Software.
21#
22# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
23# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
24# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
25# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
26# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
27# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
28#
29# Except as contained in this notice, the name of the X Consortium shall not
30# be used in advertising or otherwise to promote the sale, use or other deal-
31# ings in this Software without prior written authorization from the X Consor-
32# tium.
33#
34#
35# FSF changes to this file are in the public domain.
36#
37# Calling this script install-sh is preferred over install.sh, to prevent
38# `make' implicit rules from creating a file called install from it
39# when there is no Makefile.
40#
41# This script is compatible with the BSD install script, but was written
42# from scratch.
43
44nl='
45'
46IFS=" "" $nl"
47
48# set DOITPROG to echo to test this script
49
50# Don't use :- since 4.3BSD and earlier shells don't like it.
51doit=${DOITPROG-}
52if test -z "$doit"; then
53 doit_exec=exec
54else
55 doit_exec=$doit
56fi
57
58# Put in absolute file names if you don't have them in your path;
59# or use environment vars.
60
61chgrpprog=${CHGRPPROG-chgrp}
62chmodprog=${CHMODPROG-chmod}
63chownprog=${CHOWNPROG-chown}
64cmpprog=${CMPPROG-cmp}
65cpprog=${CPPROG-cp}
66mkdirprog=${MKDIRPROG-mkdir}
67mvprog=${MVPROG-mv}
68rmprog=${RMPROG-rm}
69stripprog=${STRIPPROG-strip}
70
71posix_glob='?'
72initialize_posix_glob='
73 test "$posix_glob" != "?" || {
74 if (set -f) 2>/dev/null; then
75 posix_glob=
76 else
77 posix_glob=:
78 fi
79 }
80'
81
82posix_mkdir=
83
84# Desired mode of installed file.
85mode=0755
86
87chgrpcmd=
88chmodcmd=$chmodprog
89chowncmd=
90mvcmd=$mvprog
91rmcmd="$rmprog -f"
92stripcmd=
93
94src=
95dst=
96dir_arg=
97dst_arg=
98
99copy_on_change=false
100no_target_directory=
101
102usage="\
103Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
104 or: $0 [OPTION]... SRCFILES... DIRECTORY
105 or: $0 [OPTION]... -t DIRECTORY SRCFILES...
106 or: $0 [OPTION]... -d DIRECTORIES...
107
108In the 1st form, copy SRCFILE to DSTFILE.
109In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
110In the 4th, create DIRECTORIES.
111
112Options:
113 --help display this help and exit.
114 --version display version info and exit.
115
116 -c (ignored)
117 -C install only if different (preserve the last data modification time)
118 -d create directories instead of installing files.
119 -g GROUP $chgrpprog installed files to GROUP.
120 -m MODE $chmodprog installed files to MODE.
121 -o USER $chownprog installed files to USER.
122 -s $stripprog installed files.
123 -t DIRECTORY install into DIRECTORY.
124 -T report an error if DSTFILE is a directory.
125
126Environment variables override the default commands:
127 CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
128 RMPROG STRIPPROG
129"
130
131while test $# -ne 0; do
132 case $1 in
133 -c) ;;
134
135 -C) copy_on_change=true;;
136
137 -d) dir_arg=true;;
138
139 -g) chgrpcmd="$chgrpprog $2"
140 shift;;
141
142 --help) echo "$usage"; exit $?;;
143
144 -m) mode=$2
145 case $mode in
146 *' '* | *' '* | *'
147'* | *'*'* | *'?'* | *'['*)
148 echo "$0: invalid mode: $mode" >&2
149 exit 1;;
150 esac
151 shift;;
152
153 -o) chowncmd="$chownprog $2"
154 shift;;
155
156 -s) stripcmd=$stripprog;;
157
158 -t) dst_arg=$2
159 shift;;
160
161 -T) no_target_directory=true;;
162
163 --version) echo "$0 $scriptversion"; exit $?;;
164
165 --) shift
166 break;;
167
168 -*) echo "$0: invalid option: $1" >&2
169 exit 1;;
170
171 *) break;;
172 esac
173 shift
174done
175
176if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
177 # When -d is used, all remaining arguments are directories to create.
178 # When -t is used, the destination is already specified.
179 # Otherwise, the last argument is the destination. Remove it from $@.
180 for arg
181 do
182 if test -n "$dst_arg"; then
183 # $@ is not empty: it contains at least $arg.
184 set fnord "$@" "$dst_arg"
185 shift # fnord
186 fi
187 shift # arg
188 dst_arg=$arg
189 done
190fi
191
192if test $# -eq 0; then
193 if test -z "$dir_arg"; then
194 echo "$0: no input file specified." >&2
195 exit 1
196 fi
197 # It's OK to call `install-sh -d' without argument.
198 # This can happen when creating conditional directories.
199 exit 0
200fi
201
202if test -z "$dir_arg"; then
203 trap '(exit $?); exit' 1 2 13 15
204
205 # Set umask so as not to create temps with too-generous modes.
206 # However, 'strip' requires both read and write access to temps.
207 case $mode in
208 # Optimize common cases.
209 *644) cp_umask=133;;
210 *755) cp_umask=22;;
211
212 *[0-7])
213 if test -z "$stripcmd"; then
214 u_plus_rw=
215 else
216 u_plus_rw='% 200'
217 fi
218 cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
219 *)
220 if test -z "$stripcmd"; then
221 u_plus_rw=
222 else
223 u_plus_rw=,u+rw
224 fi
225 cp_umask=$mode$u_plus_rw;;
226 esac
227fi
228
229for src
230do
231 # Protect names starting with `-'.
232 case $src in
233 -*) src=./$src;;
234 esac
235
236 if test -n "$dir_arg"; then
237 dst=$src
238 dstdir=$dst
239 test -d "$dstdir"
240 dstdir_status=$?
241 else
242
243 # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
244 # might cause directories to be created, which would be especially bad
245 # if $src (and thus $dsttmp) contains '*'.
246 if test ! -f "$src" && test ! -d "$src"; then
247 echo "$0: $src does not exist." >&2
248 exit 1
249 fi
250
251 if test -z "$dst_arg"; then
252 echo "$0: no destination specified." >&2
253 exit 1
254 fi
255
256 dst=$dst_arg
257 # Protect names starting with `-'.
258 case $dst in
259 -*) dst=./$dst;;
260 esac
261
262 # If destination is a directory, append the input filename; won't work
263 # if double slashes aren't ignored.
264 if test -d "$dst"; then
265 if test -n "$no_target_directory"; then
266 echo "$0: $dst_arg: Is a directory" >&2
267 exit 1
268 fi
269 dstdir=$dst
270 dst=$dstdir/`basename "$src"`
271 dstdir_status=0
272 else
273 # Prefer dirname, but fall back on a substitute if dirname fails.
274 dstdir=`
275 (dirname "$dst") 2>/dev/null ||
276 expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
277 X"$dst" : 'X\(//\)[^/]' \| \
278 X"$dst" : 'X\(//\)$' \| \
279 X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
280 echo X"$dst" |
281 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
282 s//\1/
283 q
284 }
285 /^X\(\/\/\)[^/].*/{
286 s//\1/
287 q
288 }
289 /^X\(\/\/\)$/{
290 s//\1/
291 q
292 }
293 /^X\(\/\).*/{
294 s//\1/
295 q
296 }
297 s/.*/./; q'
298 `
299
300 test -d "$dstdir"
301 dstdir_status=$?
302 fi
303 fi
304
305 obsolete_mkdir_used=false
306
307 if test $dstdir_status != 0; then
308 case $posix_mkdir in
309 '')
310 # Create intermediate dirs using mode 755 as modified by the umask.
311 # This is like FreeBSD 'install' as of 1997-10-28.
312 umask=`umask`
313 case $stripcmd.$umask in
314 # Optimize common cases.
315 *[2367][2367]) mkdir_umask=$umask;;
316 .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
317
318 *[0-7])
319 mkdir_umask=`expr $umask + 22 \
320 - $umask % 100 % 40 + $umask % 20 \
321 - $umask % 10 % 4 + $umask % 2
322 `;;
323 *) mkdir_umask=$umask,go-w;;
324 esac
325
326 # With -d, create the new directory with the user-specified mode.
327 # Otherwise, rely on $mkdir_umask.
328 if test -n "$dir_arg"; then
329 mkdir_mode=-m$mode
330 else
331 mkdir_mode=
332 fi
333
334 posix_mkdir=false
335 case $umask in
336 *[123567][0-7][0-7])
337 # POSIX mkdir -p sets u+wx bits regardless of umask, which
338 # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
339 ;;
340 *)
341 tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
342 trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
343
344 if (umask $mkdir_umask &&
345 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
346 then
347 if test -z "$dir_arg" || {
348 # Check for POSIX incompatibilities with -m.
349 # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
350 # other-writeable bit of parent directory when it shouldn't.
351 # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
352 ls_ld_tmpdir=`ls -ld "$tmpdir"`
353 case $ls_ld_tmpdir in
354 d????-?r-*) different_mode=700;;
355 d????-?--*) different_mode=755;;
356 *) false;;
357 esac &&
358 $mkdirprog -m$different_mode -p -- "$tmpdir" && {
359 ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
360 test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
361 }
362 }
363 then posix_mkdir=:
364 fi
365 rmdir "$tmpdir/d" "$tmpdir"
366 else
367 # Remove any dirs left behind by ancient mkdir implementations.
368 rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
369 fi
370 trap '' 0;;
371 esac;;
372 esac
373
374 if
375 $posix_mkdir && (
376 umask $mkdir_umask &&
377 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
378 )
379 then :
380 else
381
382 # The umask is ridiculous, or mkdir does not conform to POSIX,
383 # or it failed possibly due to a race condition. Create the
384 # directory the slow way, step by step, checking for races as we go.
385
386 case $dstdir in
387 /*) prefix='/';;
388 -*) prefix='./';;
389 *) prefix='';;
390 esac
391
392 eval "$initialize_posix_glob"
393
394 oIFS=$IFS
395 IFS=/
396 $posix_glob set -f
397 set fnord $dstdir
398 shift
399 $posix_glob set +f
400 IFS=$oIFS
401
402 prefixes=
403
404 for d
405 do
406 test -z "$d" && continue
407
408 prefix=$prefix$d
409 if test -d "$prefix"; then
410 prefixes=
411 else
412 if $posix_mkdir; then
413 (umask=$mkdir_umask &&
414 $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
415 # Don't fail if two instances are running concurrently.
416 test -d "$prefix" || exit 1
417 else
418 case $prefix in
419 *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
420 *) qprefix=$prefix;;
421 esac
422 prefixes="$prefixes '$qprefix'"
423 fi
424 fi
425 prefix=$prefix/
426 done
427
428 if test -n "$prefixes"; then
429 # Don't fail if two instances are running concurrently.
430 (umask $mkdir_umask &&
431 eval "\$doit_exec \$mkdirprog $prefixes") ||
432 test -d "$dstdir" || exit 1
433 obsolete_mkdir_used=true
434 fi
435 fi
436 fi
437
438 if test -n "$dir_arg"; then
439 { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
440 { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
441 { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
442 test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
443 else
444
445 # Make a couple of temp file names in the proper directory.
446 dsttmp=$dstdir/_inst.$$_
447 rmtmp=$dstdir/_rm.$$_
448
449 # Trap to clean up those temp files at exit.
450 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
451
452 # Copy the file name to the temp name.
453 (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
454
455 # and set any options; do chmod last to preserve setuid bits.
456 #
457 # If any of these fail, we abort the whole thing. If we want to
458 # ignore errors from any of these, just make sure not to ignore
459 # errors from the above "$doit $cpprog $src $dsttmp" command.
460 #
461 { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
462 { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
463 { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
464 { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
465
466 # If -C, don't bother to copy if it wouldn't change the file.
467 if $copy_on_change &&
468 old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
469 new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
470
471 eval "$initialize_posix_glob" &&
472 $posix_glob set -f &&
473 set X $old && old=:$2:$4:$5:$6 &&
474 set X $new && new=:$2:$4:$5:$6 &&
475 $posix_glob set +f &&
476
477 test "$old" = "$new" &&
478 $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
479 then
480 rm -f "$dsttmp"
481 else
482 # Rename the file to the real destination.
483 $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
484
485 # The rename failed, perhaps because mv can't rename something else
486 # to itself, or perhaps because mv is so ancient that it does not
487 # support -f.
488 {
489 # Now remove or move aside any old file at destination location.
490 # We try this two ways since rm can't unlink itself on some
491 # systems and the destination file might be busy for other
492 # reasons. In this case, the final cleanup might fail but the new
493 # file should still install successfully.
494 {
495 test ! -f "$dst" ||
496 $doit $rmcmd -f "$dst" 2>/dev/null ||
497 { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
498 { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
499 } ||
500 { echo "$0: cannot unlink or rename $dst" >&2
501 (exit 1); exit 1
502 }
503 } &&
504
505 # Now rename the file to the real destination.
506 $doit $mvcmd "$dsttmp" "$dst"
507 }
508 fi || exit 1
509
510 trap '' 0
511 fi
512done
513
514# Local variables:
515# eval: (add-hook 'write-file-hooks 'time-stamp)
516# time-stamp-start: "scriptversion="
517# time-stamp-format: "%:y-%02m-%02d.%02H"
518# time-stamp-end: "$"
519# End:
5200
=== removed file 'intltool-extract.in'
=== removed file 'intltool-merge.in'
=== removed file 'intltool-update.in'
=== renamed file 'keycodes/Makefile.in' => 'keycodes/Makefile.in.THIS'
=== renamed file 'keycodes/digital_vndr/Makefile.in' => 'keycodes/digital_vndr/Makefile.in.THIS'
=== renamed file 'keycodes/keycodes.dir' => 'keycodes/keycodes.dir.THIS'
=== renamed file 'keycodes/sgi_vndr/Makefile.in' => 'keycodes/sgi_vndr/Makefile.in.THIS'
=== renamed file 'keymap/Makefile.in' => 'keymap/Makefile.in.THIS'
=== renamed file 'keymap/digital_vndr/Makefile.in' => 'keymap/digital_vndr/Makefile.in.THIS'
=== renamed file 'keymap/keymap.dir' => 'keymap/keymap.dir.THIS'
=== renamed file 'keymap/sgi_vndr/Makefile.in' => 'keymap/sgi_vndr/Makefile.in.THIS'
=== renamed file 'keymap/sun_vndr/Makefile.in' => 'keymap/sun_vndr/Makefile.in.THIS'
=== removed file 'missing'
--- missing 2009-01-28 06:40:24 +0000
+++ missing 1970-01-01 00:00:00 +0000
@@ -1,367 +0,0 @@
1#! /bin/sh
2# Common stub for a few missing GNU programs while installing.
3
4scriptversion=2006-05-10.23
5
6# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
7# Free Software Foundation, Inc.
8# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
9
10# This program is free software; you can redistribute it and/or modify
11# it under the terms of the GNU General Public License as published by
12# the Free Software Foundation; either version 2, or (at your option)
13# any later version.
14
15# This program is distributed in the hope that it will be useful,
16# but WITHOUT ANY WARRANTY; without even the implied warranty of
17# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18# GNU General Public License for more details.
19
20# You should have received a copy of the GNU General Public License
21# along with this program; if not, write to the Free Software
22# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
23# 02110-1301, USA.
24
25# As a special exception to the GNU General Public License, if you
26# distribute this file as part of a program that contains a
27# configuration script generated by Autoconf, you may include it under
28# the same distribution terms that you use for the rest of that program.
29
30if test $# -eq 0; then
31 echo 1>&2 "Try \`$0 --help' for more information"
32 exit 1
33fi
34
35run=:
36sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
37sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
38
39# In the cases where this matters, `missing' is being run in the
40# srcdir already.
41if test -f configure.ac; then
42 configure_ac=configure.ac
43else
44 configure_ac=configure.in
45fi
46
47msg="missing on your system"
48
49case $1 in
50--run)
51 # Try to run requested program, and just exit if it succeeds.
52 run=
53 shift
54 "$@" && exit 0
55 # Exit code 63 means version mismatch. This often happens
56 # when the user try to use an ancient version of a tool on
57 # a file that requires a minimum version. In this case we
58 # we should proceed has if the program had been absent, or
59 # if --run hadn't been passed.
60 if test $? = 63; then
61 run=:
62 msg="probably too old"
63 fi
64 ;;
65
66 -h|--h|--he|--hel|--help)
67 echo "\
68$0 [OPTION]... PROGRAM [ARGUMENT]...
69
70Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
71error status if there is no known handling for PROGRAM.
72
73Options:
74 -h, --help display this help and exit
75 -v, --version output version information and exit
76 --run try to run the given command, and emulate it if it fails
77
78Supported PROGRAM values:
79 aclocal touch file \`aclocal.m4'
80 autoconf touch file \`configure'
81 autoheader touch file \`config.h.in'
82 autom4te touch the output file, or create a stub one
83 automake touch all \`Makefile.in' files
84 bison create \`y.tab.[ch]', if possible, from existing .[ch]
85 flex create \`lex.yy.c', if possible, from existing .c
86 help2man touch the output file
87 lex create \`lex.yy.c', if possible, from existing .c
88 makeinfo touch the output file
89 tar try tar, gnutar, gtar, then tar without non-portable flags
90 yacc create \`y.tab.[ch]', if possible, from existing .[ch]
91
92Send bug reports to <bug-automake@gnu.org>."
93 exit $?
94 ;;
95
96 -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
97 echo "missing $scriptversion (GNU Automake)"
98 exit $?
99 ;;
100
101 -*)
102 echo 1>&2 "$0: Unknown \`$1' option"
103 echo 1>&2 "Try \`$0 --help' for more information"
104 exit 1
105 ;;
106
107esac
108
109# Now exit if we have it, but it failed. Also exit now if we
110# don't have it and --version was passed (most likely to detect
111# the program).
112case $1 in
113 lex|yacc)
114 # Not GNU programs, they don't have --version.
115 ;;
116
117 tar)
118 if test -n "$run"; then
119 echo 1>&2 "ERROR: \`tar' requires --run"
120 exit 1
121 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
122 exit 1
123 fi
124 ;;
125
126 *)
127 if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
128 # We have it, but it failed.
129 exit 1
130 elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
131 # Could not run --version or --help. This is probably someone
132 # running `$TOOL --version' or `$TOOL --help' to check whether
133 # $TOOL exists and not knowing $TOOL uses missing.
134 exit 1
135 fi
136 ;;
137esac
138
139# If it does not exist, or fails to run (possibly an outdated version),
140# try to emulate it.
141case $1 in
142 aclocal*)
143 echo 1>&2 "\
144WARNING: \`$1' is $msg. You should only need it if
145 you modified \`acinclude.m4' or \`${configure_ac}'. You might want
146 to install the \`Automake' and \`Perl' packages. Grab them from
147 any GNU archive site."
148 touch aclocal.m4
149 ;;
150
151 autoconf)
152 echo 1>&2 "\
153WARNING: \`$1' is $msg. You should only need it if
154 you modified \`${configure_ac}'. You might want to install the
155 \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
156 archive site."
157 touch configure
158 ;;
159
160 autoheader)
161 echo 1>&2 "\
162WARNING: \`$1' is $msg. You should only need it if
163 you modified \`acconfig.h' or \`${configure_ac}'. You might want
164 to install the \`Autoconf' and \`GNU m4' packages. Grab them
165 from any GNU archive site."
166 files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
167 test -z "$files" && files="config.h"
168 touch_files=
169 for f in $files; do
170 case $f in
171 *:*) touch_files="$touch_files "`echo "$f" |
172 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
173 *) touch_files="$touch_files $f.in";;
174 esac
175 done
176 touch $touch_files
177 ;;
178
179 automake*)
180 echo 1>&2 "\
181WARNING: \`$1' is $msg. You should only need it if
182 you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
183 You might want to install the \`Automake' and \`Perl' packages.
184 Grab them from any GNU archive site."
185 find . -type f -name Makefile.am -print |
186 sed 's/\.am$/.in/' |
187 while read f; do touch "$f"; done
188 ;;
189
190 autom4te)
191 echo 1>&2 "\
192WARNING: \`$1' is needed, but is $msg.
193 You might have modified some files without having the
194 proper tools for further handling them.
195 You can get \`$1' as part of \`Autoconf' from any GNU
196 archive site."
197
198 file=`echo "$*" | sed -n "$sed_output"`
199 test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
200 if test -f "$file"; then
201 touch $file
202 else
203 test -z "$file" || exec >$file
204 echo "#! /bin/sh"
205 echo "# Created by GNU Automake missing as a replacement of"
206 echo "# $ $@"
207 echo "exit 0"
208 chmod +x $file
209 exit 1
210 fi
211 ;;
212
213 bison|yacc)
214 echo 1>&2 "\
215WARNING: \`$1' $msg. You should only need it if
216 you modified a \`.y' file. You may need the \`Bison' package
217 in order for those modifications to take effect. You can get
218 \`Bison' from any GNU archive site."
219 rm -f y.tab.c y.tab.h
220 if test $# -ne 1; then
221 eval LASTARG="\${$#}"
222 case $LASTARG in
223 *.y)
224 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
225 if test -f "$SRCFILE"; then
226 cp "$SRCFILE" y.tab.c
227 fi
228 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
229 if test -f "$SRCFILE"; then
230 cp "$SRCFILE" y.tab.h
231 fi
232 ;;
233 esac
234 fi
235 if test ! -f y.tab.h; then
236 echo >y.tab.h
237 fi
238 if test ! -f y.tab.c; then
239 echo 'main() { return 0; }' >y.tab.c
240 fi
241 ;;
242
243 lex|flex)
244 echo 1>&2 "\
245WARNING: \`$1' is $msg. You should only need it if
246 you modified a \`.l' file. You may need the \`Flex' package
247 in order for those modifications to take effect. You can get
248 \`Flex' from any GNU archive site."
249 rm -f lex.yy.c
250 if test $# -ne 1; then
251 eval LASTARG="\${$#}"
252 case $LASTARG in
253 *.l)
254 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
255 if test -f "$SRCFILE"; then
256 cp "$SRCFILE" lex.yy.c
257 fi
258 ;;
259 esac
260 fi
261 if test ! -f lex.yy.c; then
262 echo 'main() { return 0; }' >lex.yy.c
263 fi
264 ;;
265
266 help2man)
267 echo 1>&2 "\
268WARNING: \`$1' is $msg. You should only need it if
269 you modified a dependency of a manual page. You may need the
270 \`Help2man' package in order for those modifications to take
271 effect. You can get \`Help2man' from any GNU archive site."
272
273 file=`echo "$*" | sed -n "$sed_output"`
274 test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
275 if test -f "$file"; then
276 touch $file
277 else
278 test -z "$file" || exec >$file
279 echo ".ab help2man is required to generate this page"
280 exit 1
281 fi
282 ;;
283
284 makeinfo)
285 echo 1>&2 "\
286WARNING: \`$1' is $msg. You should only need it if
287 you modified a \`.texi' or \`.texinfo' file, or any other file
288 indirectly affecting the aspect of the manual. The spurious
289 call might also be the consequence of using a buggy \`make' (AIX,
290 DU, IRIX). You might want to install the \`Texinfo' package or
291 the \`GNU make' package. Grab either from any GNU archive site."
292 # The file to touch is that specified with -o ...
293 file=`echo "$*" | sed -n "$sed_output"`
294 test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
295 if test -z "$file"; then
296 # ... or it is the one specified with @setfilename ...
297 infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
298 file=`sed -n '
299 /^@setfilename/{
300 s/.* \([^ ]*\) *$/\1/
301 p
302 q
303 }' $infile`
304 # ... or it is derived from the source name (dir/f.texi becomes f.info)
305 test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
306 fi
307 # If the file does not exist, the user really needs makeinfo;
308 # let's fail without touching anything.
309 test -f $file || exit 1
310 touch $file
311 ;;
312
313 tar)
314 shift
315
316 # We have already tried tar in the generic part.
317 # Look for gnutar/gtar before invocation to avoid ugly error
318 # messages.
319 if (gnutar --version > /dev/null 2>&1); then
320 gnutar "$@" && exit 0
321 fi
322 if (gtar --version > /dev/null 2>&1); then
323 gtar "$@" && exit 0
324 fi
325 firstarg="$1"
326 if shift; then
327 case $firstarg in
328 *o*)
329 firstarg=`echo "$firstarg" | sed s/o//`
330 tar "$firstarg" "$@" && exit 0
331 ;;
332 esac
333 case $firstarg in
334 *h*)
335 firstarg=`echo "$firstarg" | sed s/h//`
336 tar "$firstarg" "$@" && exit 0
337 ;;
338 esac
339 fi
340
341 echo 1>&2 "\
342WARNING: I can't seem to be able to run \`tar' with the given arguments.
343 You may want to install GNU tar or Free paxutils, or check the
344 command line arguments."
345 exit 1
346 ;;
347
348 *)
349 echo 1>&2 "\
350WARNING: \`$1' is needed, and is $msg.
351 You might have modified some files without having the
352 proper tools for further handling them. Check the \`README' file,
353 it often tells you about the needed prerequisites for installing
354 this package. You may also peek at any GNU archive site, in case
355 some other package would contain this missing \`$1' program."
356 exit 1
357 ;;
358esac
359
360exit 0
361
362# Local variables:
363# eval: (add-hook 'write-file-hooks 'time-stamp)
364# time-stamp-start: "scriptversion="
365# time-stamp-format: "%:y-%02m-%02d.%02H"
366# time-stamp-end: "$"
367# End:
3680
=== renamed file 'po/Makefile.in.in' => 'po/Makefile.in.in.THIS'
=== renamed file 'rules/Makefile.in' => 'rules/Makefile.in.THIS'
=== renamed file 'rules/bin/Makefile.in' => 'rules/bin/Makefile.in.THIS'
=== renamed file 'rules/compat/Makefile.in' => 'rules/compat/Makefile.in.THIS'
=== renamed file 'rules/evdev.xml.in' => 'rules/evdev.xml.in.THIS'
=== renamed file 'rules/extras/Makefile.in' => 'rules/extras/Makefile.in.THIS'
=== renamed file 'semantics/Makefile.in' => 'semantics/Makefile.in.THIS'
=== removed file 'semantics/semantics.dir'
--- semantics/semantics.dir 2008-11-12 19:45:45 +0000
+++ semantics/semantics.dir 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1-d------ -------- xtest(xtest)
2-d------ -------- default(default)
3-d------ -------- complete(complete)
4-d------ -------- basic(basic)
50
=== renamed file 'symbols/Makefile.in' => 'symbols/Makefile.in.THIS'
=== renamed file 'symbols/digital_vndr/Makefile.in' => 'symbols/digital_vndr/Makefile.in.THIS'
=== renamed file 'symbols/extras/Makefile.in' => 'symbols/extras/Makefile.in.THIS'
=== renamed file 'symbols/fujitsu_vndr/Makefile.in' => 'symbols/fujitsu_vndr/Makefile.in.THIS'
=== renamed file 'symbols/hp_vndr/Makefile.in' => 'symbols/hp_vndr/Makefile.in.THIS'
=== renamed file 'symbols/macintosh_vndr/Makefile.in' => 'symbols/macintosh_vndr/Makefile.in.THIS'
=== renamed file 'symbols/nec_vndr/Makefile.in' => 'symbols/nec_vndr/Makefile.in.THIS'
=== renamed file 'symbols/sgi_vndr/Makefile.in' => 'symbols/sgi_vndr/Makefile.in.THIS'
=== renamed file 'symbols/sony_vndr/Makefile.in' => 'symbols/sony_vndr/Makefile.in.THIS'
=== renamed file 'symbols/sun_vndr/Makefile.in' => 'symbols/sun_vndr/Makefile.in.THIS'
=== renamed file 'symbols/symbols.dir' => 'symbols/symbols.dir.THIS'
=== renamed file 'symbols/xfree68_vndr/Makefile.in' => 'symbols/xfree68_vndr/Makefile.in.THIS'
=== renamed file 'types/Makefile.in' => 'types/Makefile.in.THIS'
=== renamed file 'types/types.dir' => 'types/types.dir.THIS'

Subscribers

People subscribed via source and target branches

to all changes: