[APPLIED] [Maverick] replace xmldoclinks patch with upstream version

[Leann Ogasawara]

Applied to Maverick linux master.

Thanks,
Leann

On Thu, 2010-06-17 at 18:03 +0100, Andy Whitcroft wrote:
> We are carrying a patch to fix documentation generation in our tree.
> Having pushed this upstream the upstream fix as applied is somewhat
> different and will cause issues when that upstream fix comes back to us
> via mainline.  Therefore it seems appropriate to revert the patch we
> have and pull in the updated one from there.  This branch does that.
> 
> For Maverick.
> 
> The following changes since commit
> 5aa677ba666d3ef81594e7a21eb9505ed4871d64:
>   Leann Ogasawara (1):
>         UBUNTU: Ubuntu-2.6.35-4.5
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/apw/ubuntu-maverick xmldoclinks
> 
> Andy Whitcroft (1):
>       Revert "[Upstream] docbook: need xmldoclinks for all doc types"
> 
> Ben Hutchings (1):
>       docbook: need xmldoclinks for all doc types
> 
>  Documentation/DocBook/Makefile |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> -apw
> 
> commit 321e097aa09e8a69912b6126665bc124d442be79
> Author: Ben Hutchings <ben at decadent.org.uk>
> Date:   Thu Jun 17 18:00:59 2010 +0100
> 
>     docbook: need xmldoclinks for all doc types
>     
>     $ rm -rf build
>     $ mkdir build
>     $ cp .config build
>     $ make O=build htmldocs
>     ...
>     xmlto: linux-2.6/build/Documentation/DocBook/media.xml
>     does not validate (status 3)
>     xmlto: Fix document syntax or use --skip-validation option
>     linux-2.6/build/Documentation/DocBook/media.xml:4:
>     warning: failed to load external entity
>     "linux-2.6/build/Documentation/DocBook/media-entities.tmpl"
>     
>     We need the xmldoclinks built for any document types built from the
>     XML sources.
>     
>     Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
>     Acked-by: Andy Whitcroft <apw at canonical.com>
>     Cc: Randy Dunlap <randy.dunlap at oracle.com>
>     Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
>     Signed-off-by: Andy Whitcroft <apw at canonical.com>
> 
> diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
> index c7e5dc7..f8f0e4a 100644
> --- a/Documentation/DocBook/Makefile
> +++ b/Documentation/DocBook/Makefile
> @@ -35,7 +35,7 @@ PS_METHOD	= $(prefer-db2x)
>  PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
>  
>  BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
> -xmldocs: $(BOOKS) xmldoclinks
> +xmldocs: $(BOOKS)
>  sgmldocs: xmldocs
>  
>  PS := $(patsubst %.xml, %.ps, $(BOOKS))
> @@ -95,7 +95,7 @@ define rule_docproc
>          ) > $(dir $@).$(notdir $@).cmd
>  endef
>  
> -%.xml: %.tmpl FORCE
> +%.xml: %.tmpl xmldoclinks FORCE
>  	$(call if_changed_rule,docproc)
>  
>  ###
>