Merge lp:~peter-pearse/ubuntu/natty/xutils-dev/prop001 into lp:ubuntu/natty/xutils-dev

[Peter Pearse]

Test always fails with empty file.
I've added reduced text from the x11proto-scrnsaver .xml file
I expect some who speaks XML can come up with something better.

[Peter Pearse (peter-pearse)]

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=613674 raised

[Steve Langasek (vorlon)]

My understanding is that this doesn't affect the build of xutils-dev itself, it only matters to software which includes the xorg-macros.m4; and the vast majority of that software is going to get the macros from upstream, not from the Debian or Ubuntu package. So I think the bug you've raised in Debian is the right way to go, and we should wait for the upstream fix to make its way back to us.

review: Disapprove

Unmerged revisions

13. By Peter Pearse on 2011-02-16

XORG_WITH_XMLTO:: Add some content to the conftest.xml file used for testing whether conversion to text is available

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-08 22:50:19 +0000
+++ debian/changelog	2011-02-16 15:26:41 +0000
@@ -1,3 +1,10 @@
+xutils-dev (1:7.6+1ubuntu1) natty; urgency=low
+
+  * XORG_WITH_XMLTO:: Add some content to the conftest.xml file used for
+    testing whether conversion to text is available
+
+ -- Peter Pearse <[e-mail]>  Wed, 16 Feb 2011 15:21:41 +0000
+
 xutils-dev (1:7.6+1) unstable; urgency=low
 
   * xorg-cf-files 1.0.4.

=== modified file 'imake/aclocal.m4'
--- imake/aclocal.m4	2010-10-31 16:35:25 +0000
+++ imake/aclocal.m4	2011-02-16 15:26:41 +0000
@@ -1452,6 +1452,11 @@
 # Test for the ability of xmlto to generate a text target
 have_xmlto_text=no
 cat > conftest.xml << "EOF"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+<book id="saver">
+</book>
 EOF
 AS_IF([test "$have_xmlto" = yes],
       [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],

=== modified file 'lndir/aclocal.m4'
--- lndir/aclocal.m4	2010-10-31 16:35:25 +0000
+++ lndir/aclocal.m4	2011-02-16 15:26:41 +0000
@@ -1447,6 +1447,11 @@
 # Test for the ability of xmlto to generate a text target
 have_xmlto_text=no
 cat > conftest.xml << "EOF"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+<book id="saver">
+</book>
 EOF
 AS_IF([test "$have_xmlto" = yes],
       [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],

=== modified file 'makedepend/aclocal.m4'
--- makedepend/aclocal.m4	2010-10-31 16:35:25 +0000
+++ makedepend/aclocal.m4	2011-02-16 15:26:41 +0000
@@ -1412,6 +1412,11 @@
 # Test for the ability of xmlto to generate a text target
 have_xmlto_text=no
 cat > conftest.xml << "EOF"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+<book id="saver">
+</book>
 EOF
 AS_IF([test "$have_xmlto" = yes],
       [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],

=== modified file 'xorg-cf-files/aclocal.m4'
--- xorg-cf-files/aclocal.m4	2011-01-08 22:50:19 +0000
+++ xorg-cf-files/aclocal.m4	2011-02-16 15:26:41 +0000
@@ -1803,6 +1803,11 @@
 # Test for the ability of xmlto to generate a text target
 have_xmlto_text=no
 cat > conftest.xml << "EOF"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+
+<book id="saver">
+</book>
 EOF
 AS_IF([test "$have_xmlto" = yes],
       [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],