Commit 0a13302d authored by Bruno Coudoin's avatar Bruno Coudoin

Updated by Ubuntu:

	* docs/C/texinfo.tex:
	* install-sh:

	3 New paintings:
	- Botticelli, Primavera - 1482
	- Caravage, Rest on the Flight into Egypt - 1597
	- Botticelli, The Birth of Venus - 1482–1486
	* src/paintings-activity/resources/paintings/Makefile.am:
	* src/paintings-activity/resources/paintings/board2_1.xml.in:
	* src/paintings-activity/resources/paintings/board2_2.xml.in:
	* src/paintings-activity/resources/paintings/board2_3.xml.in:


svn path=/branches/gcomprixogoo/; revision=3398
parent 06da5d4a
2008-05-03 Bruno Coudoin <bruno.coudoin@free.fr>
Updated by Ubuntu:
* docs/C/texinfo.tex:
* install-sh:
3 New paintings:
- Botticelli, Primavera - 1482
- Caravage, Rest on the Flight into Egypt - 1597
- Botticelli, The Birth of Venus - 14821486
* src/paintings-activity/resources/paintings/Makefile.am:
* src/paintings-activity/resources/paintings/board2_1.xml.in:
* src/paintings-activity/resources/paintings/board2_2.xml.in:
* src/paintings-activity/resources/paintings/board2_3.xml.in:
2008-04-20 Bruno Coudoin <bruno.coudoin@free.fr>
* src/billard-activity/billard.c: (minigolf_create_item): fixed random
......
This diff is collapsed.
#!/bin/sh
# install - install a program, script, or datafile
scriptversion=2006-10-14.15
scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
......@@ -48,7 +48,7 @@ IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
doit=${DOITPROG-}
if test -z "$doit"; then
doit_exec=exec
else
......@@ -58,34 +58,49 @@ fi
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
chmodprog="${CHMODPROG-chmod}"
chownprog="${CHOWNPROG-chown}"
chgrpprog="${CHGRPPROG-chgrp}"
stripprog="${STRIPPROG-strip}"
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
chgrpprog=${CHGRPPROG-chgrp}
chmodprog=${CHMODPROG-chmod}
chownprog=${CHOWNPROG-chown}
cmpprog=${CMPPROG-cmp}
cpprog=${CPPROG-cp}
mkdirprog=${MKDIRPROG-mkdir}
mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
posix_glob='?'
initialize_posix_glob='
test "$posix_glob" != "?" || {
if (set -f) 2>/dev/null; then
posix_glob=
else
posix_glob=:
fi
}
'
posix_glob=
posix_mkdir=
# Desired mode of installed file.
mode=0755
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
chgrpcmd=
stripcmd=
mvcmd=$mvprog
rmcmd="$rmprog -f"
mvcmd="$mvprog"
stripcmd=
src=
dst=
dir_arg=
dstarg=
dst_arg=
copy_on_change=false
no_target_directory=
usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
......@@ -95,65 +110,55 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
-c (ignored)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
-s $stripprog installed files.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
--help display this help and exit.
--version display version info and exit.
--help display this help and exit.
--version display version info and exit.
-c (ignored)
-C install only if different (preserve the last data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
-s $stripprog installed files.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
"
while test $# -ne 0; do
case $1 in
-c) shift
continue;;
-c) ;;
-C) copy_on_change=true;;
-d) dir_arg=true
shift
continue;;
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
shift
shift
continue;;
shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
shift
shift
case $mode in
*' '* | *' '* | *'
'* | *'*'* | *'?'* | *'['*)
echo "$0: invalid mode: $mode" >&2
exit 1;;
esac
continue;;
shift;;
-o) chowncmd="$chownprog $2"
shift
shift
continue;;
shift;;
-s) stripcmd=$stripprog
shift
continue;;
-s) stripcmd=$stripprog;;
-t) dstarg=$2
shift
shift
continue;;
-t) dst_arg=$2
shift;;
-T) no_target_directory=true
shift
continue;;
-T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
......@@ -165,21 +170,22 @@ while test $# -ne 0; do
*) break;;
esac
shift
done
if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; 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
if test -n "$dst_arg"; then
# $@ is not empty: it contains at least $arg.
set fnord "$@" "$dstarg"
set fnord "$@" "$dst_arg"
shift # fnord
fi
shift # arg
dstarg=$arg
dst_arg=$arg
done
fi
......@@ -224,7 +230,7 @@ for src
do
# Protect names starting with `-'.
case $src in
-*) src=./$src ;;
-*) src=./$src;;
esac
if test -n "$dir_arg"; then
......@@ -242,22 +248,22 @@ do
exit 1
fi
if test -z "$dstarg"; then
if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
dst=$dstarg
dst=$dst_arg
# Protect names starting with `-'.
case $dst in
-*) dst=./$dst ;;
-*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
echo "$0: $dstarg: Is a directory" >&2
echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
dstdir=$dst
......@@ -378,26 +384,19 @@ do
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
/*) prefix=/ ;;
-*) prefix=./ ;;
*) prefix= ;;
/*) prefix='/';;
-*) prefix='./';;
*) prefix='';;
esac
case $posix_glob in
'')
if (set -f) 2>/dev/null; then
posix_glob=true
else
posix_glob=false
fi ;;
esac
eval "$initialize_posix_glob"
oIFS=$IFS
IFS=/
$posix_glob && set -f
$posix_glob set -f
set fnord $dstdir
shift
$posix_glob && set +f
$posix_glob set +f
IFS=$oIFS
prefixes=
......@@ -459,41 +458,54 @@ do
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
{ 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"; } &&
# Now rename the file to the real destination.
{ $doit $mvcmd -f "$dsttmp" "$dst" 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
# support -f.
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
if 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; :; }; }\
|| {
echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
else
:
fi
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
}
} || exit 1
{ 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"; } &&
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
eval "$initialize_posix_glob" &&
$posix_glob set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
$posix_glob set +f &&
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
rm -f "$dsttmp"
else
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 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
# support -f.
{
# Now remove or move aside any old file at destination location.
# We try this two ways since rm can't unlink itself on some
# systems and the destination file might be busy for other
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
test ! -f "$dst" ||
$doit $rmcmd -f "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
}
} &&
# Now rename the file to the real destination.
$doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
trap '' 0
fi
......
......@@ -3,7 +3,11 @@ xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/paintings
xml_in_files = \
board1_0.xml.in \
board1_1.xml.in \
board2_0.xml.in \
board2_1.xml.in \
board2_2.xml.in \
board2_3.xml.in \
board3_0.xml.in \
board3_1.xml.in \
board4_0.xml.in \
......@@ -67,7 +71,63 @@ img_DATA = \
renoir-moulin_de_la_galette-3.png \
renoir-moulin_de_la_galette-4.png \
renoir-moulin_de_la_galette-5.png \
renoir-moulin_de_la_galette-6.png
renoir-moulin_de_la_galette-6.png \
Botticelli_Primaver_a1.png \
Botticelli_Primaver_a2.png \
Botticelli_Primaver_a3.png \
Botticelli_Primaver_a4.png \
Botticelli_Primaver_b1.png \
Botticelli_Primaver_b2.png \
Botticelli_Primaver_b3.png \
Botticelli_Primaver_b4.png \
Botticelli_Primaver_c1.png \
Botticelli_Primaver_c2.png \
Botticelli_Primaver_c3.png \
Botticelli_Primaver_c4.png \
Botticelli_Primaver_d1.png \
Botticelli_Primaver_d2.png \
Botticelli_Primaver_d3.png \
Botticelli_Primaver_d4.png \
Botticelli_Venus_a1.png \
Botticelli_Venus_a2.png \
Botticelli_Venus_a3.png \
Botticelli_Venus_a4.png \
Botticelli_Venus_b1.png \
Botticelli_Venus_b2.png \
Botticelli_Venus_b3.png \
Botticelli_Venus_b4.png \
Botticelli_Venus_c1.png \
Botticelli_Venus_c2.png \
Botticelli_Venus_c3.png \
Botticelli_Venus_c4.png \
Botticelli_Venus_d1.png \
Botticelli_Venus_d2.png \
Botticelli_Venus_d3.png \
Botticelli_Venus_d4.png \
Le_Caravage_Egypte_a1.png \
Le_Caravage_Egypte_a2.png \
Le_Caravage_Egypte_a3.png \
Le_Caravage_Egypte_a4.png \
Le_Caravage_Egypte_b1.png \
Le_Caravage_Egypte_b2.png \
Le_Caravage_Egypte_b3.png \
Le_Caravage_Egypte_b4.png \
Le_Caravage_Egypte_c1.png \
Le_Caravage_Egypte_c2.png \
Le_Caravage_Egypte_c3.png \
Le_Caravage_Egypte_c4.png \
Michelangelo_Pieta_a1.png \
Michelangelo_Pieta_a2.png \
Michelangelo_Pieta_a3.png \
Michelangelo_Pieta_a4.png \
Michelangelo_Pieta_b1.png \
Michelangelo_Pieta_b2.png \
Michelangelo_Pieta_b3.png \
Michelangelo_Pieta_b4.png \
Michelangelo_Pieta_c1.png \
Michelangelo_Pieta_c2.png \
Michelangelo_Pieta_c3.png \
Michelangelo_Pieta_c4.png
EXTRA_DIST = $(img_DATA) ${xml_in_files}
CLEANFILES = $(xml_DATA)
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame><!-- Created with GComprisShapegame gimp script -->
<title color_skin="gcompris/text button" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
<_name>Botticelli, Primavera - 1482</_name></title>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" position="0" type="SHAPE_BACKGROUND" x="405" y="495"/>
<shape name="A1" pixmapfile="paintings/Botticelli_Primaver_a1.png" position="0" x="159.5" y="103.5"/>
<shape name="B1" pixmapfile="paintings/Botticelli_Primaver_b1.png" position="0" x="331.0" y="103.5"/>
<shape name="C1" pixmapfile="paintings/Botticelli_Primaver_c1.png" position="0" x="506.0" y="103.5"/>
<shape name="D1" pixmapfile="paintings/Botticelli_Primaver_d1.png" position="0" x="659.0" y="91.5"/>
<shape name="A2" pixmapfile="paintings/Botticelli_Primaver_a2.png" position="0" x="141.5" y="203.0"/>
<shape name="B2" pixmapfile="paintings/Botticelli_Primaver_b2.png" position="0" x="295.5" y="215.0"/>
<shape name="C2" pixmapfile="paintings/Botticelli_Primaver_c2.png" position="0" x="470.5" y="215.0"/>
<shape name="D2" pixmapfile="paintings/Botticelli_Primaver_d2.png" position="0" x="641.5" y="192.0"/>
<shape name="A3" pixmapfile="paintings/Botticelli_Primaver_a3.png" position="0" x="141.5" y="306.0"/>
<shape name="B3" pixmapfile="paintings/Botticelli_Primaver_b3.png" position="0" x="313.5" y="329.0"/>
<shape name="C3" pixmapfile="paintings/Botticelli_Primaver_c3.png" position="0" x="488.0" y="317.0"/>
<shape name="D3" pixmapfile="paintings/Botticelli_Primaver_d3.png" position="0" x="641.5" y="306.0"/>
<shape name="A4" pixmapfile="paintings/Botticelli_Primaver_a4.png" position="0" x="159.5" y="417.5"/>
<shape name="B4" pixmapfile="paintings/Botticelli_Primaver_b4.png" position="0" x="313.0" y="428.5"/>
<shape name="C4" pixmapfile="paintings/Botticelli_Primaver_c4.png" position="0" x="488.5" y="417.5"/>
<shape name="D4" pixmapfile="paintings/Botticelli_Primaver_d4.png" position="0" x="659.0" y="417.5"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame><!-- Created with GComprisShapegame gimp script -->
<title color_skin="gcompris/text button" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
<_name>Caravage, Rest on the Flight into Egypt - 1597</_name></title>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" position="0" type="SHAPE_BACKGROUND" x="405" y="495"/>
<shape name="A1" pixmapfile="paintings/Le_Caravage_Egypte_a1.png" position="0" x="198.0" y="75.5"/>
<shape name="B1" pixmapfile="paintings/Le_Caravage_Egypte_b1.png" position="0" x="380.5" y="88.5"/>
<shape name="C1" pixmapfile="paintings/Le_Caravage_Egypte_c1.png" position="0" x="582.5" y="75.5"/>
<shape name="A2" pixmapfile="paintings/Le_Caravage_Egypte_a2.png" position="0" x="219.0" y="185.5"/>
<shape name="B2" pixmapfile="paintings/Le_Caravage_Egypte_b2.png" position="0" x="422.0" y="210.5"/>
<shape name="C2" pixmapfile="paintings/Le_Caravage_Egypte_c2.png" position="0" x="603.0" y="185.5"/>
<shape name="A3" pixmapfile="paintings/Le_Caravage_Egypte_a3.png" position="0" x="198.0" y="310.5"/>
<shape name="B3" pixmapfile="paintings/Le_Caravage_Egypte_b3.png" position="0" x="401.5" y="322.5"/>
<shape name="C3" pixmapfile="paintings/Le_Caravage_Egypte_c3.png" position="0" x="603.0" y="323.5"/>
<shape name="A4" pixmapfile="paintings/Le_Caravage_Egypte_a4.png" position="0" x="219.0" y="432.5"/>
<shape name="B4" pixmapfile="paintings/Le_Caravage_Egypte_b4.png" position="0" x="422.0" y="432.5"/>
<shape name="C4" pixmapfile="paintings/Le_Caravage_Egypte_c4.png" position="0" x="603.0" y="444.5"/>
</ShapeGame>
<?xml version="1.0" encoding="UTF-8"?>
<ShapeGame><!-- Created with GComprisShapegame gimp script -->
<title color_skin="gcompris/text button" justification="GTK_JUSTIFY_CENTER" x="405" y="495">
<_name>Botticelli, The Birth of Venus - 1482–1486</_name></title>
<Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" position="0" type="SHAPE_BACKGROUND" x="405" y="495"/>
<shape name="A1" pixmapfile="paintings/Botticelli_Venus_a1.png" position="0" x="141.5" y="98.5"/>
<shape name="B1" pixmapfile="paintings/Botticelli_Venus_b1.png" position="0" x="295.5" y="98.5"/>
<shape name="C1" pixmapfile="paintings/Botticelli_Venus_c1.png" position="0" x="488.5" y="98.5"/>
<shape name="D1" pixmapfile="paintings/Botticelli_Venus_d1.png" position="0" x="659.0" y="110.0"/>
<shape name="A2" pixmapfile="paintings/Botticelli_Venus_a2.png" position="0" x="159.5" y="207.0"/>
<shape name="B2" pixmapfile="paintings/Botticelli_Venus_b2.png" position="0" x="313.0" y="195.5"/>
<shape name="C2" pixmapfile="paintings/Botticelli_Venus_c2.png" position="0" x="470.5" y="207.0"/>
<shape name="D2" pixmapfile="paintings/Botticelli_Venus_d2.png" position="0" x="641.5" y="217.5"/>
<shape name="A3" pixmapfile="paintings/Botticelli_Venus_a3.png" position="0" x="159.5" y="315.5"/>
<shape name="B3" pixmapfile="paintings/Botticelli_Venus_b3.png" position="0" x="313.0" y="316.5"/>
<shape name="C3" pixmapfile="paintings/Botticelli_Venus_c3.png" position="0" x="488.5" y="315.5"/>
<shape name="D3" pixmapfile="paintings/Botticelli_Venus_d3.png" position="0" x="659.0" y="327.0"/>
<shape name="A4" pixmapfile="paintings/Botticelli_Venus_a4.png" position="0" x="141.5" y="411.5"/>
<shape name="B4" pixmapfile="paintings/Botticelli_Venus_b4.png" position="0" x="313.5" y="422.0"/>
<shape name="C4" pixmapfile="paintings/Botticelli_Venus_c4.png" position="0" x="506.0" y="411.5"/>
<shape name="D4" pixmapfile="paintings/Botticelli_Venus_d4.png" position="0" x="659.0" y="422.0"/>
</ShapeGame>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment