diff -ruNp w3c-dtd-xhtml-1.1.ubuntu/debian/changelog w3c-dtd-xhtml-1.1.work/debian/changelog --- w3c-dtd-xhtml-1.1.ubuntu/debian/changelog 2011-02-25 17:30:34.000000000 +0100 +++ w3c-dtd-xhtml-1.1.work/debian/changelog 2011-02-25 17:38:04.000000000 +0100 @@ -1,3 +1,9 @@ +w3c-dtd-xhtml (1.1-5ubuntu1.dmadore0) hardy; urgency=low + + * Fix /usr/share/xml/xhtml/schema/dtd/1.0/catalog + + -- David A. Madore Fri, 25 Feb 2011 17:33:08 +0100 + w3c-dtd-xhtml (1.1-5ubuntu1) hardy; urgency=low * debian/install-dtds diff -ruNp w3c-dtd-xhtml-1.1.ubuntu/debian/install-dtds w3c-dtd-xhtml-1.1.work/debian/install-dtds --- w3c-dtd-xhtml-1.1.ubuntu/debian/install-dtds 2011-02-25 17:30:34.000000000 +0100 +++ w3c-dtd-xhtml-1.1.work/debian/install-dtds 2011-02-25 17:35:59.000000000 +0100 @@ -22,8 +22,10 @@ dtddir=${xmldir}/xhtml/schema/dtd # DTD dir without the prefix dtddirrel=${dtddir#${prefix}} #entdir=${sgmldir}/html/entities/xhtml -entdir=${xmldir}/xhtml/schema/dtd/1.0/ +entdir=${xmldir}/xhtml/schema/dtd/1.0 entdirrel=${entdir#${prefix}} +entdir2=${xmldir}/entities/xhtml +entdir2rel=${entdir2#${prefix}} sgmlconfdir=${prefix}/etc/sgml/${package} docdir=${prefix}/usr/share/doc/${package} @@ -116,7 +118,7 @@ fi # If there is an catalog for the entities, otherwise install one if [ -f entities/catalog ]; then - echo entities/catalog ${entdirrel}/catalog >> debian/sgmlcatalogs + echo entities/catalog ${entdir2rel}/catalog >> debian/sgmlcatalogs # If there no XML catalog, generate it if [ ! -f entities/catalog.xml ]; then diff -ruNp w3c-dtd-xhtml-1.1.ubuntu/debian/rules w3c-dtd-xhtml-1.1.work/debian/rules --- w3c-dtd-xhtml-1.1.ubuntu/debian/rules 2011-02-25 17:30:34.000000000 +0100 +++ w3c-dtd-xhtml-1.1.work/debian/rules 2011-02-25 17:36:44.000000000 +0100 @@ -19,7 +19,7 @@ prefix := debian/$(package) xmldir := $(prefix)/usr/share/xml dtddir := $(xmldir)/xhtml/schema/dtd/ docdir := $(prefix)/usr/share/doc/$(package) -entdir := $(xmldir)/xhtml/schema/dtd/1.0/ +entdir := $(xmldir)/xhtml/schema/dtd/1.0 # No configuration directory needed at the moment #confdir := $(prefix)/etc/sgml/$(package)