--- kdelibs-031105/kdoctools/customization/dtd/kdex.dtd.orig 2002-12-10 12:16:25.000000000 +0100 +++ kdelibs-031105/kdoctools/customization/dtd/kdex.dtd 2003-11-06 00:21:35.000000000 +0100 @@ -97,7 +97,7 @@ + "/usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd" > %DocBookDTD; --- kdelibs-031105/kdoctools/customization/kde-chunk.xsl.orig 2002-01-09 13:29:06.000000000 +0100 +++ kdelibs-031105/kdoctools/customization/kde-chunk.xsl 2003-11-05 22:58:50.000000000 +0100 @@ -1,8 +1,8 @@ - - + + --- kdelibs-031105/kdoctools/customization/kde-chunk-online.xsl.orig 2002-12-19 22:23:58.000000000 +0100 +++ kdelibs-031105/kdoctools/customization/kde-chunk-online.xsl 2003-11-06 13:06:54.000000000 +0100 @@ -1,8 +1,8 @@ - - + + --- kdelibs-031105/kdoctools/customization/kde-nochunk.xsl.orig 2002-03-30 14:19:21.000000000 +0100 +++ kdelibs-031105/kdoctools/customization/kde-nochunk.xsl 2003-11-06 11:41:43.000000000 +0100 @@ -1,8 +1,8 @@ - - + + --- kdelibs-031105/kdoctools/customization/kde-web.xsl.orig 2003-10-02 23:40:02.000000000 +0200 +++ kdelibs-031105/kdoctools/customization/kde-web.xsl 2003-11-06 11:41:19.000000000 +0100 @@ -1,8 +1,8 @@ - - + + --- kdelibs-031105/kdoctools/customization/obsolete/kdex.dtd.orig 2002-12-11 16:10:26.000000000 +0100 +++ kdelibs-031105/kdoctools/customization/obsolete/kdex.dtd 2003-11-06 01:02:56.000000000 +0100 @@ -89,7 +89,7 @@ + "/usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd" > %DocBookDTD; --- kdelibs-031105/kdoctools/customization/obsolete/kdex-412-10.dtd.orig 2002-12-13 15:01:55.000000000 +0100 +++ kdelibs-031105/kdoctools/customization/obsolete/kdex-412-10.dtd 2003-11-06 02:29:29.000000000 +0100 @@ -24,7 +24,7 @@ + "/usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd" > %DocBookDTD; --- kdelibs-031105/kdoctools/meinproc.cpp.orig 2003-10-27 01:03:48.000000000 +0100 +++ kdelibs-031105/kdoctools/meinproc.cpp 2003-11-05 22:46:59.000000000 +0100 @@ -142,7 +142,7 @@ QString catalogs; catalogs += locate( "dtd", "customization/catalog" ); catalogs += " "; - catalogs += locate( "dtd", "docbook/xml-dtd-4.1.2/docbook.cat" ); + catalogs += "/usr/share/sgml/docbook/xml-dtd-4.1.2/catalog"; setenv( "SGML_CATALOG_FILES", QFile::encodeName( catalogs ).data(), 1); QString exe; --- kdelibs-031105/kdoctools/xslt.cpp.orig 2003-10-19 23:31:11.000000000 +0200 +++ kdelibs-031105/kdoctools/xslt.cpp 2003-11-05 22:55:13.000000000 +0100 @@ -182,10 +182,10 @@ if ( srcdir.isEmpty() ) { catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog"); catalogs += ':'; - catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.2/docbook.cat"); + catalogs += "/usr/share/sgml/docbook/xml-dtd-4.2/catalog"; ins.dirs()->addResourceType("dtd", KStandardDirs::kde_default("data") + "ksgmltools2"); } else { - catalogs += srcdir +"/customization/catalog:" + srcdir + "/docbook/xml-dtd-4.2/docbook.cat"; + catalogs += srcdir +"/customization/catalog:" + "/usr/share/sgml/docbook/xml-dtd-4.2/catalog"; ins.dirs()->addResourceDir("dtd", srcdir); } --- kdelibs/kdoctools/Makefile.am.orig 2005-06-20 14:12:01.000000000 +0200 +++ kdelibs/kdoctools/Makefile.am 2005-06-20 15:14:29.000000000 +0200 @@ -45,7 +45,7 @@ $(XGETTEXT) *.cpp -o $(podir)/kio_help.pot install-data-local: - @(for subdir in customization docbook; do \ + @(for subdir in customization; do \ for dir in `( cd $(srcdir)/$$subdir && find . -type d ! -name CVS | grep -v '\.svn' )`; do \ $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/ksgmltools2/$$subdir/$$dir ;\ for file in `(cd $(srcdir)/$$subdir && ls -1 $$dir/*)`; do \