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

Proposed by Peter Pearse
Status: Needs review
Proposed branch: lp://qastaging/~peter-pearse/ubuntu/natty/xutils-dev/prop001
Merge into: lp://qastaging/ubuntu/natty/xutils-dev
Diff against target: 78 lines (+27/-0)
5 files modified
debian/changelog (+7/-0)
imake/aclocal.m4 (+5/-0)
lndir/aclocal.m4 (+5/-0)
makedepend/aclocal.m4 (+5/-0)
xorg-cf-files/aclocal.m4 (+5/-0)
To merge this branch: bzr merge lp://qastaging/~peter-pearse/ubuntu/natty/xutils-dev/prop001
Reviewer Review Type Date Requested Status
Steve Langasek Disapprove
Review via email: mp+49987@code.qastaging.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Peter Pearse (peter-pearse) wrote :
Revision history for this message
Steve Langasek (vorlon) wrote :

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: