debian/changelog | 10 ++++ debian/control | 9 ++-- debian/versions | 1 util-macros/ChangeLog | 70 ++++++++++++++++++++++++++++++++ util-macros/configure | 20 ++++----- util-macros/configure.ac | 2 util-macros/xorg-macros.m4.in | 91 ++++++++++++++++++++++++++++++++++++------ 7 files changed, 178 insertions(+), 25 deletions(-)
New commits: commit d013926129f71505ef308b5b9c82dfc9df52e7b2 Author: Cyril Brulebois <k...@debian.org> Date: Fri Jun 24 11:36:31 2011 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index c6de6bc..863c65c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xutils-dev (1:7.6+5) UNRELEASED; urgency=low +xutils-dev (1:7.6+5) unstable; urgency=low * util-macros 1.15.0 * Update versions file accordingly. @@ -6,7 +6,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low * Update Uploaders list. Thanks, David, Andres & Brice! * Wrap Depends. - -- Cyril Brulebois <k...@debian.org> Fri, 24 Jun 2011 11:18:51 +0200 + -- Cyril Brulebois <k...@debian.org> Fri, 24 Jun 2011 11:36:28 +0200 xutils-dev (1:7.6+4) unstable; urgency=low commit 896574c3a7eeebd92b38de667a42c12cd78643b6 Author: Cyril Brulebois <k...@debian.org> Date: Fri Jun 24 11:36:25 2011 +0200 Wrap Depends. diff --git a/debian/changelog b/debian/changelog index 468ab60..c6de6bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low * Update versions file accordingly. * Bump Standards-Version to 3.9.2 (no changes). * Update Uploaders list. Thanks, David, Andres & Brice! + * Wrap Depends. -- Cyril Brulebois <k...@debian.org> Fri, 24 Jun 2011 11:18:51 +0200 diff --git a/debian/control b/debian/control index ac12209..6f32ff2 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git Package: xutils-dev Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, cpp +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + cpp, Description: X Window System utility programs for development xutils-dev provides a set of utility programs shipped with the X Window System that do not require the X libraries; many of these programs are useful commit 25876fd10d22a70b11bea6a8a619ae3bafc36763 Author: Cyril Brulebois <k...@debian.org> Date: Fri Jun 24 11:35:31 2011 +0200 Update Uploaders list. Thanks, David, Andres & Brice! diff --git a/debian/changelog b/debian/changelog index 7e78ee7..468ab60 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low * util-macros 1.15.0 * Update versions file accordingly. * Bump Standards-Version to 3.9.2 (no changes). + * Update Uploaders list. Thanks, David, Andres & Brice! -- Cyril Brulebois <k...@debian.org> Fri, 24 Jun 2011 11:18:51 +0200 diff --git a/debian/control b/debian/control index 3bd83ee..ac12209 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xutils-dev Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon <dilin...@debian.org>, Brice Goglin <bgog...@debian.org>, Cyril Brulebois <k...@debian.org> +Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), pkg-config, commit e7b7ae230cf8f3ad52b5f4cbdebe442f846f67cb Author: Cyril Brulebois <k...@debian.org> Date: Fri Jun 24 11:31:37 2011 +0200 Bump Standards-Version to 3.9.2 (no changes). diff --git a/debian/changelog b/debian/changelog index bd48a74..7e78ee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low * util-macros 1.15.0 * Update versions file accordingly. + * Bump Standards-Version to 3.9.2 (no changes). -- Cyril Brulebois <k...@debian.org> Fri, 24 Jun 2011 11:18:51 +0200 diff --git a/debian/control b/debian/control index 7f505fe..3bd83ee 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: pkg-config, quilt, x11proto-core-dev, -Standards-Version: 3.9.0 +Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-xorg/app/xutils-dev Vcs-Browser: http://git.debian.org/?p=pkg-xorg/app/xutils-dev.git commit 22821b05b9bc6f3d5d8bbbc465d7bd6387f16d30 Author: Cyril Brulebois <k...@debian.org> Date: Fri Jun 24 11:20:22 2011 +0200 Update versions file accordingly. diff --git a/debian/changelog b/debian/changelog index a6f4275..bd48a74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xutils-dev (1:7.6+5) UNRELEASED; urgency=low * util-macros 1.15.0 + * Update versions file accordingly. -- Cyril Brulebois <k...@debian.org> Fri, 24 Jun 2011 11:18:51 +0200 diff --git a/debian/versions b/debian/versions index 2540cf2..098bb03 100644 --- a/debian/versions +++ b/debian/versions @@ -9,6 +9,7 @@ squeeze. As the most useful, util-macros comes first. util-macros | Debian ------------------------ +1.15.0 | 1:7.6+5 1.14.0 | 1:7.6+4 1.13.0 | 1:7.6+3 1.12.0 | 1:7.6+2 commit 04c0abca2be5c1cb48b7064042fd4c448c69273c Author: Cyril Brulebois <k...@debian.org> Date: Fri Jun 24 11:19:49 2011 +0200 util-macros 1.15.0 diff --git a/debian/changelog b/debian/changelog index 67f02cb..a6f4275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xutils-dev (1:7.6+5) UNRELEASED; urgency=low + + * util-macros 1.15.0 + + -- Cyril Brulebois <k...@debian.org> Fri, 24 Jun 2011 11:18:51 +0200 + xutils-dev (1:7.6+4) unstable; urgency=low * util-macros 1.14.0 diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog index df0d1c6..2290e90 100644 --- a/util-macros/ChangeLog +++ b/util-macros/ChangeLog @@ -1,3 +1,73 @@ +commit 08dd5d30c137abe43d5b1673edc39eb569881d66 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Jun 23 08:03:13 2011 -0400 + + Version bump: 1.15.0 + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit b87c5e7f6c9e856cf82c3c531255adccbd9fae5c +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jun 22 12:42:30 2011 -0400 + + XORG_WITH_XSLTPROC: warn at development time rather than config time + + Catching up unimplemented features should be done earlier by the developer + during autoconf rather than during configure. + + Reviewed-by: Dan Nicholson <dbn.li...@gmail.com> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit f3332a7214af43878691b4f4876c39dc7d546266 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jun 22 10:02:28 2011 -0400 + + Add XORG_WITH_PERL macro + + Following the same pattern as XMLTO and friends. + Allows all modules to use the same interface, variables + and options to check for perl. + Perl is used in libX11 and xserver. + + Reviewed-by: Dan Nicholson <dbn.li...@gmail.com> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit b927af52e8a3384126bfe709b725f6c5bad4ba34 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jun 22 09:04:32 2011 -0400 + + XORG_WITH_FOP: add minimum version checking support + + Adding this feature is motivated by a bug in fop 0.95 where + fop crashes in the presence of some characters like the latin capital + sharp s. Fop version 1.0 works correctly. + + This is the same feature found in XMLTO and the likes. + In the macro public interface there is a shift in parameter position + for the DEFAULT parameter. Doing development on older libraries + (point releases on older versions) will still work the same way as + the "no" value will be interpreted as the minimum version. It won't + be found, so fop will be disabled anyway. + + Only libX11 has used XORG_WITH_FOP(no) and will be changed with a version + bump on util-macros. + + Reviewed-by: Dan Nicholson <dbn.li...@gmail.com> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 45c7d622657d295b2c02a46061765827ea37f00f +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Jun 1 08:59:53 2011 -0400 + + XORG_PROG_RAWCPP: use AC_LANG_SOURCE to prevent warnings + + The source for the AC_LANG_CONFTEST should be passed to AC_LANG_SOURCE + to satisfy the more stringent testing done by autoconf 2.68. + It is available in autoconf 2.60 where AC_LANG_DEFINES_PROVIDED is not. + + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + commit 10a865fa671382dce50f7e49624ca5a730372d08 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Fri May 27 19:01:13 2011 -0700 diff --git a/util-macros/configure b/util-macros/configure index 6895dcf..be072af 100755 --- a/util-macros/configure +++ b/util-macros/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for util-macros 1.14.0. +# Generated by GNU Autoconf 2.68 for util-macros 1.15.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='util-macros' PACKAGE_TARNAME='util-macros' -PACKAGE_VERSION='1.14.0' -PACKAGE_STRING='util-macros 1.14.0' +PACKAGE_VERSION='1.15.0' +PACKAGE_STRING='util-macros 1.15.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1183,7 +1183,7 @@ if test "$ac_init_help" = "long"; then # 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 util-macros 1.14.0 to adapt to many kinds of systems. +\`configure' configures util-macros 1.15.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1249,7 +1249,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-macros 1.14.0:";; + short | recursive ) echo "Configuration of util-macros 1.15.0:";; esac cat <<\_ACEOF @@ -1323,7 +1323,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-macros configure 1.14.0 +util-macros configure 1.15.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1340,7 +1340,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by util-macros $as_me 1.14.0, which was +It was created by util-macros $as_me 1.15.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2156,7 +2156,7 @@ fi # Define the identity of the package. PACKAGE='util-macros' - VERSION='1.14.0' + VERSION='1.15.0' cat >>confdefs.h <<_ACEOF @@ -2837,7 +2837,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by util-macros $as_me 1.14.0, which was +This file was extended by util-macros $as_me 1.15.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2890,7 +2890,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -util-macros config.status 1.14.0 +util-macros config.status 1.15.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/util-macros/configure.ac b/util-macros/configure.ac index 843a0e2..cfec46a 100644 --- a/util-macros/configure.ac +++ b/util-macros/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) AC_INIT([util-macros], - [1.14.0], + [1.15.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [util-macros]) AC_CONFIG_SRCDIR([Makefile.am]) diff --git a/util-macros/xorg-macros.m4.in b/util-macros/xorg-macros.m4.in index a21cf7e..0527dfe 100644 --- a/util-macros/xorg-macros.m4.in +++ b/util-macros/xorg-macros.m4.in @@ -64,8 +64,7 @@ AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], # which is not the best choice for supporting other OS'es, but covers most # of the ones we need for now. AC_MSG_CHECKING([if $RAWCPP requires -undef]) -AC_LANG_CONFTEST([Does cpp redefine unix ? - AC_LANG_DEFINES_PROVIDED]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -83,8 +82,7 @@ fi rm -f conftest.$ac_ext AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -AC_LANG_CONFTEST([Does cpp preserve "whitespace"? - AC_LANG_DEFINES_PROVIDED]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -459,6 +457,8 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) # AC_DEFUN([XORG_WITH_XSLTPROC],[ AC_ARG_VAR([XSLTPROC], [Path to xsltproc command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for xsltproc MIN-VERSION is not implemented])]) m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(xsltproc, AS_HELP_STRING([--with-xsltproc], @@ -489,13 +489,65 @@ else AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no']) fi -# Checking for minimum version is not implemented -# but we want to keep the interface consistent with other commands -m4_ifval([$1],[AC_MSG_WARN(Checking for MIN-VERSION is not implemented.)]) - AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes]) ]) # XORG_WITH_XSLTPROC +# XORG_WITH_PERL([MIN-VERSION], [DEFAULT]) +# ---------------------------------------- +# Minimum version: 1.15.0 +# +# PERL (Practical Extraction and Report Language) is a language optimized for +# scanning arbitrary text files, extracting information from those text files, +# and printing reports based on that information. +# +# When DEFAULT is not specified, --with-perl assumes 'auto'. +# +# Interface to module: +# HAVE_PERL: used in makefiles to conditionally scan text files +# PERL: returns the path of the perl program found +# returns the path set by the user in the environment +# --with-perl: 'yes' user instructs the module to use perl +# 'no' user instructs the module not to use perl +# have_perl: returns yes if perl found in PATH or no +# +# If the user sets the value of PERL, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PERL],[ +AC_ARG_VAR([PERL], [Path to perl command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for perl MIN-VERSION is not implemented])]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(perl, + AS_HELP_STRING([--with-perl], + [Use perl for extracting information from files (default: ]_defopt[)]), + [use_perl=$withval], [use_perl=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_perl" = x"auto"; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_WARN([perl not found - cannot extract information and report]) + have_perl=no + else + have_perl=yes + fi +elif test "x$use_perl" = x"yes" ; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_ERROR([--with-perl=yes specified but perl not found in PATH]) + fi + have_perl=yes +elif test "x$use_perl" = x"no" ; then + if test "x$PERL" != "x"; then + AC_MSG_WARN([ignoring PERL environment variable since --with-perl=no was specified]) + fi + have_perl=no +else + AC_MSG_ERROR([--with-perl expects 'yes' or 'no']) +fi + +AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) +]) # XORG_WITH_PERL # XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) # ---------------- @@ -742,10 +794,11 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) ]) # XORG_WITH_GROFF -# XORG_WITH_FOP([DEFAULT]) -# ---------------- +# XORG_WITH_FOP([MIN-VERSION], [DEFAULT]) +# --------------------------------------- # Minimum version: 1.6.0 # Minimum version for optional DEFAULT argument: 1.11.0 +# Minimum version for optional MIN-VERSION argument: 1.15.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the @@ -765,7 +818,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) # AC_DEFUN([XORG_WITH_FOP],[ AC_ARG_VAR([FOP], [Path to fop command]) -m4_define([_defopt], m4_default([$1], [auto])) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(fop, AS_HELP_STRING([--with-fop], [Use fop to regenerate documentation (default: ]_defopt[)]), @@ -794,6 +847,22 @@ elif test "x$use_fop" = x"no" ; then else AC_MSG_ERROR([--with-fop expects 'yes' or 'no']) fi + +# Test for a minimum version of fop, if provided. +m4_ifval([$1], +[if test "$have_fop" = yes; then + # scrape the fop version + AC_MSG_CHECKING([for fop minimum version]) + fop_version=`$FOP -version 2>/dev/null | cut -d' ' -f3` + AC_MSG_RESULT([$fop_version]) + AS_VERSION_COMPARE([$fop_version], [$1], + [if test "x$use_fop" = xauto; then + AC_MSG_WARN([fop version $fop_version found, but $1 needed]) + have_fop=no + else + AC_MSG_ERROR([fop version $fop_version found, but $1 needed]) + fi]) +fi]) AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qa2sf-0000r2...@vasks.debian.org