xutils-dev: Changes to 'debian-unstable'
debian/changelog | 4 +-
util-macros/ChangeLog | 60 ++++++++++++++++++++++++++++++++++++++++++
util-macros/configure | 20 +++++++-------
util-macros/configure.ac | 2 -
util-macros/xorg-macros.m4.in | 47 ++++++++++++++++++++++++++++++++
5 files changed, 120 insertions(+), 13 deletions(-)
New commits:
commit 64b9379be29ba9a52d7c53342988cf37282509ee
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Sat Jul 3 18:00:48 2010 -0400
util-macros 1.10.0
diff --git a/debian/changelog b/debian/changelog
index d58572f..24276d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
xutils-dev (1:7.5+4) UNRELEASED; urgency=low
- * util-macros 1.8.0.
+ * util-macros 1.10.0.
- -- Robert Hooker <sarvatt@ubuntu.com> Fri, 28 May 2010 22:02:29 -0400
+ -- Robert Hooker <sarvatt@ubuntu.com> Sat, 03 Jul 2010 18:00:29 -0400
xutils-dev (1:7.5+3) unstable; urgency=low
diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog
index d8cd9dd..6a20723 100644
--- a/util-macros/ChangeLog
+++ b/util-macros/ChangeLog
@@ -1,3 +1,63 @@
+commit fbe66aedcf2165e43388894d3b2ee2f38e889f93
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jun 24 17:36:33 2010 -0400
+
+ Version bump: 1.10.0
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4eed3443945a9d1443ec688efd835f46ed9adfc9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 25 14:52:25 2010 -0400
+
+ XORG_CHECK_SGML_DOCTOOLS: add interface for xorg stylesheet
+
+ Add STYLESHEET_SRCDIR for directory location
+ and XSL_STLESHEET for the name of the xorg style sheet
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 01ef7c69d91259e5904f26b6b4630243d548232a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jun 24 18:12:45 2010 -0400
+
+ XORG_WITH_XMLTO: add HAVE_XMLTO_TEXT for text output format
+
+ The xmlto program has dependencies when converting docbook XML
+ to text format. It requires either lynx, links or w3m
+ text web browsers.
+
+ Users want to skip the text format to avoid having to install these.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit fe878c0ce0b9093c13714ec6662b0c99a9a2d1d4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 18 21:54:27 2010 -0400
+
+ Version bump: 1.9.0
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d4d18c07d7aa1005ad3d48dfdb19f245df2ebae0
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jun 18 20:32:13 2010 -0400
+
+ XORG_WITH_GROFF: add HAVE_GROFF_HTML Automake conditional
+
+ Groff uses grohtml to generate html output format. This program, in turn,
+ uses a number of pnm* commands from the netpbm package, psselect
+ from the psutils package and the ghostscript package.
+
+ These are independently installed, so they could be missing.
+ A check is made to ensure those dependencies are installed.
+ If not, the makefile can use the conditional to supress the target.
+
+ Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit f0590edffe21ac6b7a11eab7caf6c8aad7c8bc07
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu May 27 09:27:54 2010 -0400
diff --git a/util-macros/configure b/util-macros/configure
index e31c336..44e9186 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.63 for util-macros 1.8.0.
+# Generated by GNU Autoconf 2.63 for util-macros 1.10.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='util-macros'
PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.8.0'
-PACKAGE_STRING='util-macros 1.8.0'
+PACKAGE_VERSION='1.10.0'
+PACKAGE_STRING='util-macros 1.10.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1227,7 +1227,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.8.0 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.10.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1293,7 +1293,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of util-macros 1.8.0:";;
+ short | recursive ) echo "Configuration of util-macros 1.10.0:";;
esac
cat <<\_ACEOF
@@ -1367,7 +1367,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-util-macros configure 1.8.0
+util-macros configure 1.10.0
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1381,7 +1381,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.8.0, which was
+It was created by util-macros $as_me 1.10.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2098,7 +2098,7 @@ fi
# Define the identity of the package.
PACKAGE='util-macros'
- VERSION='1.8.0'
+ VERSION='1.10.0'
cat >>confdefs.h <<_ACEOF
@@ -2875,7 +2875,7 @@ exec 6>&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.8.0, which was
+This file was extended by util-macros $as_me 1.10.0, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2925,7 +2925,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-util-macros config.status 1.8.0
+util-macros config.status 1.10.0
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/util-macros/configure.ac b/util-macros/configure.ac
index 4aab44d..66dd89a 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.8.0],
+ [1.10.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 a8e12ed..0e84d5b 100644
--- a/util-macros/xorg-macros.m4.in
+++ b/util-macros/xorg-macros.m4.in
@@ -216,13 +216,20 @@ PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
fi])
])
+# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
+# the path and the name of the doc stylesheet
if test "x$XORG_SGML_PATH" != "x" ; then
AC_MSG_RESULT([$XORG_SGML_PATH])
+ STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
+ XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
else
AC_MSG_RESULT([no])
fi
AC_SUBST(XORG_SGML_PATH)
+AC_SUBST(STYLESHEET_SRCDIR)
+AC_SUBST(XSL_STYLESHEET)
+AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"])
]) # XORG_CHECK_SGML_DOCTOOLS
# XORG_CHECK_LINUXDOC
@@ -355,6 +362,10 @@ AC_SUBST(MAKE_HTML)
# --with-xmlto: 'yes' user instructs the module to use xmlto
# 'no' user instructs the module not to use xmlto
#
+# Added in version 1.10.0
+# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation
+# xmlto for text output requires either lynx, links, or w3m browsers
+#
# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_XMLTO],[
@@ -386,6 +397,8 @@ elif test "x$use_xmlto" = x"no" ; then
else
AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
fi
+
+# Test for a minimum version of xmlto, if provided.
m4_ifval([$1],
[if test "$have_xmlto" = yes; then
# scrape the xmlto version
@@ -400,6 +413,17 @@ m4_ifval([$1],
AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
fi])
fi])
+
+# Test for the ability of xmlto to generate a text target
+have_xmlto_text=no
+cat > conftest.xml << "EOF"
+EOF
+AS_IF([test "$have_xmlto" = yes],
+ [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+ [have_xmlto_text=yes],
+ [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
+rm -f conftest.xml
+AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
@@ -552,6 +576,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
# --with-groff: 'yes' user instructs the module to use groff
# 'no' user instructs the module not to use groff
#
+# Added in version 1.9.0:
+# HAVE_GROFF_HTML: groff has dependencies to output HTML format:
+# pnmcut pnmcrop pnmtopng pnmtops from the netpbm package.
+# psselect from the psutils package.
+# the ghostcript package. Refer to the grohtml man pages
+#
# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path.
#
# OS and distros often splits groff in a basic and full package, the former
@@ -591,6 +621,7 @@ elif test "x$use_groff" = x"no" ; then
else
AC_MSG_ERROR([--with-groff expects 'yes' or 'no'])
fi
+
# We have groff, test for the presence of the macro packages
if test "x$have_groff" = x"yes"; then
AC_MSG_CHECKING([for ${GROFF} -ms macros])
@@ -608,9 +639,25 @@ if test "x$have_groff" = x"yes"; then
fi
AC_MSG_RESULT([$groff_mm_works])
fi
+
+# We have groff, test for HTML dependencies, one command per package
+if test "x$have_groff" = x"yes"; then
+ AC_PATH_PROGS(GS_PATH, [gs gswin32c])
+ AC_PATH_PROG(PNMTOPNG_PATH, [pnmtopng])
+ AC_PATH_PROG(PSSELECT_PATH, [psselect])
+ if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then
+ have_groff_html=yes
+ else
+ have_groff_html=no
+ AC_MSG_WARN([grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages])
+ fi
+fi
+
+# Set Automake conditionals for Makefiles
AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes])
AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes])
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
Reply to: