Hello community, here is the log from the commit of package xorg-x11-doc checked in at Mon Mar 5 00:22:35 CET 2007. -------- --- xorg-x11-doc/xorg-x11-doc.changes 2006-11-08 22:52:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/xorg-x11-doc/xorg-x11-doc.changes 2007-03-04 15:38:22.077489000 +0100 @@ -1,0 +2,10 @@ +Sun Mar 4 15:36:58 CET 2007 - sndirsch@suse.de + +- updated xorg-docs to release 1.4 + * Major re-organization of the sgml docs. They are now converted + from linuxdoc to docbook and rely on the docbook2x series of + tools, so your build environments need to be updated. +- updated xorg-sgml-doctools to release 1.2 + * Update definitions for the 7.2 katamari release + +------------------------------------------------------------------- Old: ---- xorg-docs-1.3.tar.bz2 xorg-sgml-doctools-1.1.1.tar.bz2 New: ---- xorg-docs-1.4.tar.bz2 xorg-sgml-doctools-1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-doc.spec ++++++ --- /var/tmp/diff_new_pack.d26912/_old 2007-03-05 00:22:16.000000000 +0100 +++ /var/tmp/diff_new_pack.d26912/_new 2007-03-05 00:22:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-doc (Version 7.2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -14,14 +14,14 @@ BuildRequires: xorg-x11-proto-devel URL: http://xorg.freedesktop.org/ Version: 7.2 -Release: 4 +Release: 17 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Documentation/Other Requires: xorg-x11-proto-devel Summary: X.Org documentation -Source: xorg-docs-1.3.tar.bz2 -Source1: xorg-sgml-doctools-1.1.1.tar.bz2 +Source: xorg-docs-1.4.tar.bz2 +Source1: xorg-sgml-doctools-1.2.tar.bz2 %description @@ -59,7 +59,14 @@ %doc %{_datadir}/X11/ %doc %{_datadir}/sgml/X11/defs.ent -%changelog -n xorg-x11-doc +%changelog +* Sun Mar 04 2007 - sndirsch@suse.de +- updated xorg-docs to release 1.4 + * Major re-organization of the sgml docs. They are now converted + from linuxdoc to docbook and rely on the docbook2x series of + tools, so your build environments need to be updated. +- updated xorg-sgml-doctools to release 1.2 + * Update definitions for the 7.2 katamari release * Wed Nov 08 2006 - sndirsch@suse.de - updated xorg-docs to release 1.3 * several updates contributed by Alan Coopersmith, David Nusinow, ++++++ xorg-docs-1.3.tar.bz2 -> xorg-docs-1.4.tar.bz2 ++++++ xorg-x11-doc/xorg-docs-1.3.tar.bz2 /mounts/work_src_done/STABLE/xorg-x11-doc/xorg-docs-1.4.tar.bz2 differ: byte 11, line 1 ++++++ xorg-sgml-doctools-1.1.1.tar.bz2 -> xorg-sgml-doctools-1.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-sgml-doctools-1.1.1/aclocal.m4 new/xorg-sgml-doctools-1.2/aclocal.m4 --- old/xorg-sgml-doctools-1.1.1/aclocal.m4 2006-11-08 18:10:41.000000000 +0100 +++ new/xorg-sgml-doctools-1.2/aclocal.m4 2007-03-03 19:13:09.000000000 +0100 @@ -40,7 +40,8 @@ # -------------------- # Adds --with/without-release-string and changes the PACKAGE and # PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If -# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. +# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also +# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use. AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, @@ -53,6 +54,23 @@ PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION" AC_MSG_NOTICE([Building with package name set to $PACKAGE]) fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], + [`echo $PACKAGE_VERSION | cut -d . -f 1`], + [Major version of this package]) + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + if test "x$PVM" = "x"; then + PVM="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [$PVM], + [Minor version of this package]) + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [$PVP], + [Patch version of this package]) ]) # Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. @@ -251,7 +269,6 @@ [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) -AC_REQUIRE([AM_PRETTY_CMDS]) ]) @@ -470,42 +487,6 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - - -# AM_PRETTY_CMDS -# ------------ -AC_DEFUN([AM_PRETTY_CMDS], -[AC_ARG_ENABLE(pretty-cmds, -[ --disable-pretty-cmds show all commands executed - --enable-pretty-cmds do not output the entire command lines]) -AMSHOWCMDSAT='' -AMDEPSHOWCMDSAT='' -AMPRETTYECHO=true -AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; -then - AMSHOWCMDSAT='@' - _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@' - AMPRETTYECHO=echo - AMCMDECHO=true - LT_QUIET='--quiet' -fi -AC_SUBST([AMSHOWCMDSAT]) -AC_SUBST([AMDEPSHOWCMDSAT]) -AC_SUBST([AMPRETTYECHO]) -AC_SUBST([AMCMDECHO]) -AC_SUBST([LT_QUIET]) -]) - # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-sgml-doctools-1.1.1/configure new/xorg-sgml-doctools-1.2/configure --- old/xorg-sgml-doctools-1.1.1/configure 2006-11-08 18:10:43.000000000 +0100 +++ new/xorg-sgml-doctools-1.2/configure 2007-03-03 19:13:10.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for xorg-sgml-doctools 1.1.1. +# Generated by GNU Autoconf 2.61 for xorg-sgml-doctools 1.2. # # Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg. # @@ -12,7 +12,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -21,10 +22,13 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -217,7 +221,7 @@ else as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -235,7 +239,6 @@ # Try only shells that exist, to save several forks. if { test -f "$as_shell" || test -f "$as_shell.exe"; } && { ("$as_shell") 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -244,10 +247,12 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : _ASEOF @@ -255,7 +260,6 @@ CONFIG_SHELL=$as_shell as_have_required=yes if { "$as_shell" 2> /dev/null <<\_ASEOF -# Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -264,10 +268,12 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + : (as_func_return () { @@ -514,19 +520,28 @@ as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -559,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='xorg-sgml-doctools' PACKAGE_TARNAME='xorg-sgml-doctools' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='xorg-sgml-doctools 1.1.1' +PACKAGE_VERSION='1.2' +PACKAGE_STRING='xorg-sgml-doctools 1.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_subst_vars='SHELL @@ -621,11 +636,6 @@ AMTAR am__tar am__untar -AMSHOWCMDSAT -AMDEPSHOWCMDSAT -AMPRETTYECHO -AMCMDECHO -LT_QUIET MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT @@ -740,10 +750,10 @@ -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=no ;; -docdir | --docdir | --docdi | --doc | --do) @@ -759,10 +769,10 @@ -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ @@ -956,19 +966,19 @@ -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` eval with_$ac_package=no ;; --x) @@ -1137,7 +1147,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-sgml-doctools 1.1.1 to adapt to many kinds of systems. +\`configure' configures xorg-sgml-doctools 1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1203,15 +1213,13 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-sgml-doctools 1.1.1:";; + short | recursive ) echo "Configuration of xorg-sgml-doctools 1.2:";; esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-pretty-cmds show all commands executed - --enable-pretty-cmds do not output the entire command lines --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -1282,8 +1290,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-sgml-doctools configure 1.1.1 -generated by GNU Autoconf 2.60 +xorg-sgml-doctools configure 1.2 +generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1296,8 +1304,8 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-sgml-doctools $as_me 1.1.1, which was -generated by GNU Autoconf 2.60. Invocation command line was +It was created by xorg-sgml-doctools $as_me 1.2, which was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1717,7 +1725,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -1883,7 +1891,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -1946,29 +1954,6 @@ fi rmdir .tst 2>/dev/null -# Check whether --enable-pretty-cmds was given. -if test "${enable_pretty_cmds+set}" = set; then - enableval=$enable_pretty_cmds; -fi - -AMSHOWCMDSAT='' -AMDEPSHOWCMDSAT='' -AMPRETTYECHO=true -AMCMDECHO=echo -if test "x$enable_pretty_cmds" == xyes; -then - AMSHOWCMDSAT='@' - test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@' - AMPRETTYECHO=echo - AMCMDECHO=true - LT_QUIET='--quiet' -fi - - - - - - # test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then @@ -1989,7 +1974,7 @@ # Define the identity of the package. PACKAGE='xorg-sgml-doctools' - VERSION='1.1.1' + VERSION='1.2' cat >>confdefs.h <<_ACEOF @@ -2041,7 +2026,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2081,7 +2066,7 @@ IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2135,7 +2120,6 @@ - { echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } # Check whether --enable-maintainer-mode was given. @@ -2197,7 +2181,7 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2258,6 +2242,29 @@ echo "$as_me: Building with package name set to $PACKAGE" >&6;} fi +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` +_ACEOF + + PVM=`echo $PACKAGE_VERSION | cut -d . -f 2` + if test "x$PVM" = "x"; then + PVM="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_MINOR $PVM +_ACEOF + + PVP=`echo $PACKAGE_VERSION | cut -d . -f 3` + if test "x$PVP" = "x"; then + PVP="0" + fi + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION_PATCHLEVEL $PVP +_ACEOF + + ac_config_files="$ac_config_files Makefile" @@ -2418,7 +2425,8 @@ ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: @@ -2427,10 +2435,13 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh + + # PATH needs CR @@ -2654,19 +2665,28 @@ as_mkdir_p=false fi -# Find out whether ``test -x'' works. Don't use a zero-byte file, as -# systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - as_executable_p="test -x" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' else - as_executable_p=: + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' fi -rm -f conf$$.file +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -2681,8 +2701,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-sgml-doctools $as_me 1.1.1, which was -generated by GNU Autoconf 2.60. Invocation command line was +This file was extended by xorg-sgml-doctools $as_me 1.2, which was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -2709,7 +2729,7 @@ Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -2724,8 +2744,8 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xorg-sgml-doctools config.status 1.1.1 -configured by $0, generated by GNU Autoconf 2.60, +xorg-sgml-doctools config.status 1.2 +configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2006 Free Software Foundation, Inc. @@ -2942,11 +2962,6 @@ AMTAR!$AMTAR$ac_delim am__tar!$am__tar$ac_delim am__untar!$am__untar$ac_delim -AMSHOWCMDSAT!$AMSHOWCMDSAT$ac_delim -AMDEPSHOWCMDSAT!$AMDEPSHOWCMDSAT$ac_delim -AMPRETTYECHO!$AMPRETTYECHO$ac_delim -AMCMDECHO!$AMCMDECHO$ac_delim -LT_QUIET!$LT_QUIET$ac_delim MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim MAINT!$MAINT$ac_delim @@ -2954,7 +2969,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 68; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-sgml-doctools-1.1.1/configure.ac new/xorg-sgml-doctools-1.2/configure.ac --- old/xorg-sgml-doctools-1.1.1/configure.ac 2006-11-08 18:10:32.000000000 +0100 +++ new/xorg-sgml-doctools-1.2/configure.ac 2007-03-03 19:11:33.000000000 +0100 @@ -21,7 +21,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(xorg-sgml-doctools,[1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xorg-sgml-doctools) +AC_INIT(xorg-sgml-doctools,[1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xorg-sgml-doctools) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-sgml-doctools-1.1.1/defs.ent new/xorg-sgml-doctools-1.2/defs.ent --- old/xorg-sgml-doctools-1.1.1/defs.ent 2006-11-08 18:09:39.000000000 +0100 +++ new/xorg-sgml-doctools-1.2/defs.ent 2007-03-03 19:11:33.000000000 +0100 @@ -4,24 +4,24 @@ <!-- Xorg version string --> <!ENTITY majorvers CDATA "7"> -<!ENTITY reldate CDATA "22 May 2006"> -<!ENTITY relvers CDATA "7.1"> -<!ENTITY prevrelvers CDATA "7.0"> -<!ENTITY fullrelvers CDATA "7.1.0"> -<!ENTITY prevfullrelvers CDATA "7.0.0"> -<!ENTITY nextrelvers CDATA "7.2"> -<!ENTITY nextfullrelvers CDATA "7.2.0"> -<!ENTITY nextfullreldate CDATA "late 2006"> -<!ENTITY nextupdrelvers CDATA "7.1.1"> +<!ENTITY reldate CDATA "15 February 2007"> +<!ENTITY relvers CDATA "7.2"> +<!ENTITY prevrelvers CDATA "7.1"> +<!ENTITY fullrelvers CDATA "7.2.0"> +<!ENTITY prevfullrelvers CDATA "7.1.0"> +<!ENTITY nextrelvers CDATA "7.3"> +<!ENTITY nextfullrelvers CDATA "7.3.0"> +<!ENTITY nextfullreldate CDATA "mid 2007"> +<!ENTITY nextupdrelvers CDATA "7.2.1"> <!ENTITY srcvers CDATA "440"> <!ENTITY prevsrcvers CDATA "660"> <!ENTITY fullsrcvers CDATA "440"> <!ENTITY prevfullsrcvers CDATA "660"> -<!ENTITY whichfullrel CDATA "ninth"> +<!ENTITY whichfullrel CDATA "tenth"> <!ENTITY whichupdaterel CDATA "none"> -<!ENTITY reltag CDATA "XORG-7_1"> -<!ENTITY relbranchtag CDATA "XORG-7_1-branch"> +<!ENTITY reltag CDATA "XORG-7_2"> +<!ENTITY relbranchtag CDATA "XORG-7_2-branch"> <!ENTITY rcnum CDATA "0"> <!-- Version of the most recent 3.3.x release --> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-sgml-doctools-1.1.1/Makefile.in new/xorg-sgml-doctools-1.2/Makefile.in --- old/xorg-sgml-doctools-1.1.1/Makefile.in 2006-11-08 18:10:47.000000000 +0100 +++ new/xorg-sgml-doctools-1.2/Makefile.in 2007-03-03 19:13:11.000000000 +0100 @@ -90,10 +90,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ -AMCMDECHO = @AMCMDECHO@ -AMDEPSHOWCMDSAT = @AMDEPSHOWCMDSAT@ -AMPRETTYECHO = @AMPRETTYECHO@ -AMSHOWCMDSAT = @AMSHOWCMDSAT@ AMTAR = @AMTAR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -111,7 +107,6 @@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LTLIBOBJS = @LTLIBOBJS@ -LT_QUIET = @LT_QUIET@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ @@ -168,50 +163,41 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - @AMPRETTYECHO@ ' [AUTOMAKE ] rebuild all'; \ - @AMCMDECHO@ ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ cd $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - @AMPRETTYECHO@ ' [AUTOMAKE ] Makefile'; \ - @AMCMDECHO@ ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ - @AMPRETTYECHO@ ' [SH ] config.status'; \ - @AMCMDECHO@ ' $(SHELL) ./config.status'; \ + echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - @AMPRETTYECHO@ ' [SH ] config.status $@'; \ - @AMCMDECHO@ ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - @@AMPRETTYECHO@ ' [SH ] config.status' - @AMSHOWCMDSAT@$(SHELL) ./config.status --recheck + $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - @@AMPRETTYECHO@ ' [AUTOCONF ] Regenerate' - @AMSHOWCMDSAT@cd $(srcdir) && $(AUTOCONF) + cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - @@AMPRETTYECHO@ ' [ACLOCAL ] Regenerate' - @AMSHOWCMDSAT@cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) uninstall-info-am: install-dist_sgmlentDATA: $(dist_sgmlent_DATA) @$(NORMAL_INSTALL) - @@AMPRETTYECHO@ ' [MKDIR ] $(DESTDIR)$(sgmlentdir)' - @AMSHOWCMDSAT@test -z "$(sgmlentdir)" || $(mkdir_p) "$(DESTDIR)$(sgmlentdir)" + test -z "$(sgmlentdir)" || $(mkdir_p) "$(DESTDIR)$(sgmlentdir)" @list='$(dist_sgmlent_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - @AMPRETTYECHO@ " [INSTALL ] '$$d$$p' -> '$(DESTDIR)$(sgmlentdir)/$$f'"; \ - @AMCMDECHO@ " $(dist_sgmlentDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmlentdir)/$$f'"; \ + echo " $(dist_sgmlentDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmlentdir)/$$f'"; \ $(dist_sgmlentDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmlentdir)/$$f"; \ done @@ -219,8 +205,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_sgmlent_DATA)'; for p in $$list; do \ f=$(am__strip_dir) \ - @AMPRETTYECHO@ " [RM ] $(DESTDIR)$(sgmlentdir)/$$f"; \ - @AMCMDECHO@ " rm -f '$(DESTDIR)$(sgmlentdir)/$$f'"; \ + echo " rm -f '$(DESTDIR)$(sgmlentdir)/$$f'"; \ rm -f "$(DESTDIR)$(sgmlentdir)/$$f"; \ done tags: TAGS @@ -231,10 +216,8 @@ distdir: $(DISTFILES) - @AMSHOWCMDSAT@$(am__remove_distdir) - @@AMPRETTYECHO@ ' [MKDIR ] $(distdir)' - @AMSHOWCMDSAT@mkdir $(distdir) - @@AMPRETTYECHO@ ' [MKDIR ] ' + $(am__remove_distdir) + mkdir $(distdir) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -261,68 +244,56 @@ || exit 1; \ fi; \ done - @AMSHOWCMDSAT@-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ - || ( @AMPRETTYECHO@ ' [CHMOD ] a+r $(distdir)'; chmod -R a+r $(distdir) ) + || chmod -R a+r $(distdir) dist-gzip: distdir - @@AMPRETTYECHO@ ' [TAR.GZ ] $(distdir).tar.gz' - @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - @AMSHOWCMDSAT@$(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) dist-bzip2: distdir - @@AMPRETTYECHO@ ' [TAR.BZ2 ] $(distdir).tar.bz2' - @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - @AMSHOWCMDSAT@$(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) dist-tarZ: distdir - @@AMPRETTYECHO@ ' [TAR.Z ] $(distdir).tar.Z' - @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - @AMSHOWCMDSAT@$(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) dist-shar: distdir - @@AMPRETTYECHO@ ' [SHAR.GZ ] $(distdir).shar.gz' - @AMSHOWCMDSAT@shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - @AMSHOWCMDSAT@$(am__remove_distdir) + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) dist-zip: distdir - @@AMPRETTYECHO@ ' [ZIP ] $(distdir).zip' - @AMSHOWCMDSAT@-rm -f $(distdir).zip - @AMSHOWCMDSAT@zip -rq $(distdir).zip $(distdir) - @AMSHOWCMDSAT@$(am__remove_distdir) + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) dist dist-all: distdir - @@AMPRETTYECHO@ ' [TAR.GZ ] $(distdir).tar.gz' - @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - @@AMPRETTYECHO@ ' [TAR.BZ2 ] $(distdir).tar.bz2' - @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - @AMSHOWCMDSAT@$(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - @AMSHOWCMDSAT@case '$(DIST_ARCHIVES)' in \ + case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - @AMPRETTYECHO@ ' [UNTAR.GZ ] $(distdir).tar.gz'; \ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - @AMPRETTYECHO@ ' [UNTAR.BZ2 ] $(distdir).tar.bz2'; \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.Z*) \ - @AMPRETTYECHO@ ' [UNTAR.Z ] $(distdir).tar.Z'; \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - @AMPRETTYECHO@ ' [UNSHAR.GZ ] $(distdir).shar.gz'; \ GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ *.zip*) \ - @AMPRETTYECHO@ ' [UNZIP ] $(distdir).zip'; \ unzip $(distdir).zip ;;\ esac - @AMSHOWCMDSAT@chmod -R a-w $(distdir); chmod a+w $(distdir) - @AMSHOWCMDSAT@mkdir $(distdir)/_build - @AMSHOWCMDSAT@mkdir $(distdir)/_inst - @AMSHOWCMDSAT@chmod a-w $(distdir) + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && cd $(distdir)/_build \ @@ -374,8 +345,8 @@ check: check-am all-am: Makefile $(DATA) installdirs: - @AMSHOWCMDSAT@for dir in "$(DESTDIR)$(sgmlentdir)"; do \ - test -z "$$dir" || ( @AMPRETTYECHO@ " [MKDIR ] $$dir"; $(mkdir_p) "$$dir" ); \ + for dir in "$(DESTDIR)$(sgmlentdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am install-exec: install-exec-am @@ -387,7 +358,7 @@ installcheck: installcheck-am install-strip: - @AMSHOWCMDSAT@$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install @@ -396,8 +367,7 @@ clean-generic: distclean-generic: - @@AMPRETTYECHO@ ' [RM ] $(CONFIG_CLEAN_FILES)' - @AMSHOWCMDSAT@-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -407,10 +377,8 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am - @@AMPRETTYECHO@ ' [RM ] $(am__CONFIG_DISTCLEAN_FILES)' - @AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES) - @@AMPRETTYECHO@ ' [RM ] Makefile' - @AMSHOWCMDSAT@-rm -f Makefile + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile distclean-am: clean-am distclean-generic dvi: dvi-am @@ -434,12 +402,9 @@ installcheck-am: maintainer-clean: maintainer-clean-am - @@AMPRETTYECHO@ ' [RM ] $(am__CONFIG_DISTCLEAN_FILES)' - @AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES) - @@AMPRETTYECHO@ ' [RM ] autom4te.cache/' - @AMSHOWCMDSAT@-rm -rf $(top_srcdir)/autom4te.cache - @@AMPRETTYECHO@ ' [RM ] Makefile' - @AMSHOWCMDSAT@-rm -f Makefile + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org