When I update hal from CVS, I very often get conflicts in doc/spec/hal-spec.html. If this is a generated file, please don't put it into the repository.
This is a from xml generated file and we have this file in CVS to have always a up-to-date version available via a link from the project website (http://cvs. freedesktop.org/*checkout*/hal/hal/doc/spec/hal-spec.html) What kind of conflicts do you get?
(In reply to comment #1) > This is a from xml generated file and we have this file in CVS to have always a > up-to-date version available via a link from the project website (http://cvs. > freedesktop.org/*checkout*/hal/hal/doc/spec/hal-spec.html) I see. > What kind of conflicts do you get? I don't remember. As soon as one occurs again, I'll let you know the details.
Created attachment 5793 [details] [review] Conflicts in hal-spec.html Here we go. Conflicts I just got from updating to HEAD.
Created attachment 6293 [details] [review] patch to fix build hal-spec.html I already saw the problem (at least in Opera/Firefox/Epiphany and in the file while update the CVS) with invalid chars in the html file. IMO there is a problem with xmlto and build the hal-spec.html. This patch change the build process back to docbook2html and add xmllint to resolve the usage of xinclude. This should avoid the invalid chars.
commited to CVS HEAD: 2006-07-24 Danny Kukawka <danny.kukawka@web.de> Fixed build hal-spec.html to avoid invalid chars in the html page and closed fd.o bug #6986: * configure.in: replaced check for xmlto with old check for docbook2html and additional check for xmllint * doc/spec/Makefile.am: added xmllint to resolve xinclude for docbook, readded docbook2html command
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.