]>
Commit | Line | Data |
---|---|---|
e7bf16a1 | 1 | --- kdelibs-031105/kdoctools/customization/dtd/kdex.dtd.orig 2002-12-10 12:16:25.000000000 +0100 |
2 | +++ kdelibs-031105/kdoctools/customization/dtd/kdex.dtd 2003-11-06 00:21:35.000000000 +0100 | |
3 | @@ -97,7 +97,7 @@ | |
4 | ||
5 | <!ENTITY % DocBookDTD PUBLIC | |
6 | "-//OASIS//DTD DocBook XML V4.2//EN" | |
7 | - "../../docbook/xml-dtd-4.2/docbookx.dtd" > | |
8 | + "/usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd" > | |
9 | %DocBookDTD; | |
10 | ||
11 | ||
12 | --- kdelibs-031105/kdoctools/customization/kde-chunk.xsl.orig 2002-01-09 13:29:06.000000000 +0100 | |
13 | +++ kdelibs-031105/kdoctools/customization/kde-chunk.xsl 2003-11-05 22:58:50.000000000 +0100 | |
14 | @@ -1,8 +1,8 @@ | |
15 | <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | |
16 | version="1.0"> | |
17 | ||
18 | -<xsl:import href="../docbook/xsl/html/autoidx.xsl"/> | |
19 | -<xsl:import href="../docbook/xsl/html/chunk.xsl"/> | |
20 | +<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/autoidx.xsl"/> | |
21 | +<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/> | |
22 | <xsl:include href="kde-navig.xsl"/> | |
23 | <xsl:include href="kde-ttlpg.xsl"/> | |
24 | <xsl:include href="kde-style.xsl"/> | |
25 | --- kdelibs-031105/kdoctools/customization/kde-chunk-online.xsl.orig 2002-12-19 22:23:58.000000000 +0100 | |
26 | +++ kdelibs-031105/kdoctools/customization/kde-chunk-online.xsl 2003-11-06 13:06:54.000000000 +0100 | |
27 | @@ -1,8 +1,8 @@ | |
28 | <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | |
29 | version="1.0"> | |
30 | ||
31 | -<xsl:import href="../docbook/xsl/html/autoidx.xsl"/> | |
32 | -<xsl:import href="../docbook/xsl/html/chunk.xsl"/> | |
33 | +<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/autoidx.xsl"/> | |
34 | +<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/> | |
35 | <xsl:include href="kde-navig-online.xsl"/> | |
36 | <xsl:include href="kde-ttlpg.xsl"/> | |
37 | <xsl:include href="kde-style.xsl"/> | |
38 | --- kdelibs-031105/kdoctools/customization/kde-nochunk.xsl.orig 2002-03-30 14:19:21.000000000 +0100 | |
39 | +++ kdelibs-031105/kdoctools/customization/kde-nochunk.xsl 2003-11-06 11:41:43.000000000 +0100 | |
40 | @@ -1,8 +1,8 @@ | |
41 | <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | |
42 | version="1.0"> | |
43 | ||
44 | -<xsl:import href="../docbook/xsl/html/autoidx.xsl"/> | |
45 | -<xsl:import href="../docbook/xsl/html/docbook.xsl"/> | |
46 | +<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/autoidx.xsl"/> | |
47 | +<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl"/> | |
48 | <!-- <xsl:include href="kde-print-navig.xsl"/> --> | |
49 | <xsl:include href="kde-ttlpg.xsl"/> | |
50 | <xsl:include href="kde-style.xsl"/> | |
51 | --- kdelibs-031105/kdoctools/customization/kde-web.xsl.orig 2003-10-02 23:40:02.000000000 +0200 | |
52 | +++ kdelibs-031105/kdoctools/customization/kde-web.xsl 2003-11-06 11:41:19.000000000 +0100 | |
53 | @@ -1,8 +1,8 @@ | |
54 | <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" | |
55 | version="1.0"> | |
56 | ||
57 | -<xsl:import href="../docbook/xsl/html/autoidx.xsl"/> | |
58 | -<xsl:import href="../docbook/xsl/html/chunk.xsl"/> | |
59 | +<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/autoidx.xsl"/> | |
60 | +<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/> | |
61 | <xsl:include href="kde-web-navig.xsl"/> | |
62 | <xsl:include href="kde-ttlpg.xsl"/> | |
63 | <xsl:include href="kde-style.xsl"/> | |
64 | --- kdelibs-031105/kdoctools/customization/obsolete/kdex.dtd.orig 2002-12-11 16:10:26.000000000 +0100 | |
65 | +++ kdelibs-031105/kdoctools/customization/obsolete/kdex.dtd 2003-11-06 01:02:56.000000000 +0100 | |
66 | @@ -89,7 +89,7 @@ | |
67 | ||
68 | <!ENTITY % DocBookDTD PUBLIC | |
69 | "-//OASIS//DTD DocBook XML V4.1.2//EN" | |
70 | - "../../docbook/xml-dtd-4.1.2/docbookx.dtd" > | |
71 | + "/usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd" > | |
72 | %DocBookDTD; | |
73 | ||
74 | ||
75 | --- kdelibs-031105/kdoctools/customization/obsolete/kdex-412-10.dtd.orig 2002-12-13 15:01:55.000000000 +0100 | |
76 | +++ kdelibs-031105/kdoctools/customization/obsolete/kdex-412-10.dtd 2003-11-06 02:29:29.000000000 +0100 | |
77 | @@ -24,7 +24,7 @@ | |
78 | ||
79 | <!ENTITY % DocBookDTD PUBLIC | |
80 | "-//OASIS//DTD DocBook XML V4.1.2//EN" | |
81 | - "../../docbook/xml-dtd-4.1.2/docbookx.dtd" > | |
82 | + "/usr/share/sgml/docbook/xml-dtd-4.1.2/docbookx.dtd" > | |
83 | %DocBookDTD; | |
84 | ||
85 | <!-- The current obsolete version will do (see below) --> | |
e7bf16a1 | 86 | --- kdelibs-031105/kdoctools/meinproc.cpp.orig 2003-10-27 01:03:48.000000000 +0100 |
87 | +++ kdelibs-031105/kdoctools/meinproc.cpp 2003-11-05 22:46:59.000000000 +0100 | |
88 | @@ -142,7 +142,7 @@ | |
89 | QString catalogs; | |
90 | catalogs += locate( "dtd", "customization/catalog" ); | |
91 | catalogs += " "; | |
92 | - catalogs += locate( "dtd", "docbook/xml-dtd-4.1.2/docbook.cat" ); | |
93 | + catalogs += "/usr/share/sgml/docbook/xml-dtd-4.1.2/catalog"; | |
94 | ||
95 | setenv( "SGML_CATALOG_FILES", QFile::encodeName( catalogs ).data(), 1); | |
96 | QString exe; | |
97 | --- kdelibs-031105/kdoctools/xslt.cpp.orig 2003-10-19 23:31:11.000000000 +0200 | |
98 | +++ kdelibs-031105/kdoctools/xslt.cpp 2003-11-05 22:55:13.000000000 +0100 | |
99 | @@ -182,10 +182,10 @@ | |
100 | if ( srcdir.isEmpty() ) { | |
101 | catalogs += ins.dirs()->findResource("data", "ksgmltools2/customization/catalog"); | |
102 | catalogs += ':'; | |
103 | - catalogs += ins.dirs()->findResource("data", "ksgmltools2/docbook/xml-dtd-4.2/docbook.cat"); | |
104 | + catalogs += "/usr/share/sgml/docbook/xml-dtd-4.2/catalog"; | |
105 | ins.dirs()->addResourceType("dtd", KStandardDirs::kde_default("data") + "ksgmltools2"); | |
106 | } else { | |
107 | - catalogs += srcdir +"/customization/catalog:" + srcdir + "/docbook/xml-dtd-4.2/docbook.cat"; | |
108 | + catalogs += srcdir +"/customization/catalog:" + "/usr/share/sgml/docbook/xml-dtd-4.2/catalog"; | |
109 | ins.dirs()->addResourceDir("dtd", srcdir); | |
110 | } | |
111 | ||
327346ee AM |
112 | --- kdelibs/kdoctools/Makefile.am.orig 2005-06-20 14:12:01.000000000 +0200 |
113 | +++ kdelibs/kdoctools/Makefile.am 2005-06-20 15:14:29.000000000 +0200 | |
114 | @@ -45,7 +45,7 @@ | |
115 | $(XGETTEXT) *.cpp -o $(podir)/kio_help.pot | |
116 | ||
117 | install-data-local: | |
118 | - @(for subdir in customization docbook; do \ | |
119 | + @(for subdir in customization; do \ | |
120 | for dir in `( cd $(srcdir)/$$subdir && find . -type d ! -name CVS | grep -v '\.svn' )`; do \ | |
121 | $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/ksgmltools2/$$subdir/$$dir ;\ | |
122 | for file in `(cd $(srcdir)/$$subdir && ls -1 $$dir/*)`; do \ |