w3c-dtd-xhtml versus w3c-sgml-lib

Daniel,

http://download.periapt.co.uk/w3c-sgml-lib/w3c-sgml-lib_1.1.orig.tar.gz
http://download.periapt.co.uk/w3c-sgml-lib/w3c-sgml-lib_1.1-1.debian.tar.gz
http://download.periapt.co.uk/w3c-sgml-lib/w3c-sgml-lib_1.1-1.dsc

I have built w3c-sgml-lib which is based upon the files provided  
w3.org for the W3C markup validator. I have tested this with the  
latest version of w3c-markup-validator (although that package itself  
is definitely not ready yet. ) One particularly good thing is that I  
wrote a script to generate the xmlcatalogs file required by  
dh_installxmlcatlogs. I am however still not sure if this is the right  
course of action.

* It conflicts with w3c-dtd-xhtml which used to do the job because  
they both attempt to register the same public ids in the XML catalog.
* w3c-dtd-xhtml is IMHO broken because it is manually maintained and  
installs its files into locations that do not scale as upstream is  
upgraded.
* w3c-dtd-xhtml itself probably cannot be simply got rid of as there  
are a few other dependencies.

Ways I could solve this are:
1.) I take over w3c-dtd-xhtml, incorporate my work and use a series of  
patches and symlinks to provide backwards compatibility.
2.) Arguably backwards compatibility does not matter because the  
catalogs resolve to the right path anyway. So take over w3c-dtd-xhtml  
but blow away what is already there.
3.) Create a w3c-dtd-xhtml virtual package. This seems overkill since  
ultimately w3c-sgml-lib is likely to win out.
4.) Upload the package as it is.

Also I need clarification on how to check stuff in. I have these  
instructions for the perl group but they may not be the same for  
SGML/XML. http://pkg-perl.alioth.debian.org/subversion.html.

Nicholas