ChangeLog | 169 +++++++++++++++++++++++++++++++++++++ configure.ac | 13 +- debian/changelog | 12 ++ debian/control | 8 + debian/rules | 7 - debian/x11proto-xcmisc-dev.install | 6 - docbook.am | 105 ++++++++++++++++++++++ specs/.gitignore | 3 specs/Makefile.am | 63 +------------ specs/xc-misc.xml | 28 +++--- 10 files changed, 325 insertions(+), 89 deletions(-)
New commits: commit df50d77cefbb68ca35f89c6f66b9503f71229b7b Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 18:16:21 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 0cdefef..86f333e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-xcmisc (1.2.2-1) UNRELEASED; urgency=low +x11proto-xcmisc (1.2.2-1) unstable; urgency=low * New upstream release. * Set docdir directly in configure. @@ -8,7 +8,7 @@ x11proto-xcmisc (1.2.2-1) UNRELEASED; urgency=low * Bump build-deps on xutils-dev, xorg-sgml-doctools and xmlto per configure.ac. - -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 18:10:40 +0200 + -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 18:16:18 +0200 x11proto-xcmisc (1.2.1-2) unstable; urgency=low commit aeb80cdf8cd2976eef091314791e23f67ff84988 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 18:16:14 2012 +0200 Bump build-deps on xutils-dev, xorg-sgml-doctools and xmlto per configure.ac. diff --git a/debian/changelog b/debian/changelog index 63c976f..0cdefef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x11proto-xcmisc (1.2.2-1) UNRELEASED; urgency=low * Don't require (fake)root for debian/rules clean. * Install xcmiscproto.pc to /usr/share/pkgconfig. * Remove David Nusinow and Andres Salomon from Uploaders. + * Bump build-deps on xutils-dev, xorg-sgml-doctools and xmlto per + configure.ac. -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 18:10:40 +0200 diff --git a/debian/control b/debian/control index 1932dfd..caa77d2 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,12 @@ Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), automake, - xutils-dev (>= 1:7.5+4), + xutils-dev (>= 1:7.6+2), pkg-config, # specs: - xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, + xmlto (>= 0.0.22), + xorg-sgml-doctools (>= 1:1.8), + w3m, Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xcmisc Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xcmisc.git commit 4f4b718e3e52d750e62d8d8780eb3a8e176ba122 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 18:14:31 2012 +0200 Remove David Nusinow and Andres Salomon from Uploaders. diff --git a/debian/changelog b/debian/changelog index dbdd684..63c976f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x11proto-xcmisc (1.2.2-1) UNRELEASED; urgency=low * Set docdir directly in configure. * Don't require (fake)root for debian/rules clean. * Install xcmiscproto.pc to /usr/share/pkgconfig. + * Remove David Nusinow and Andres Salomon from Uploaders. -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 18:10:40 +0200 diff --git a/debian/control b/debian/control index 777eb23..1932dfd 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: x11proto-xcmisc Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Andres Salomon <dilin...@debian.org>, Cyril Brulebois <k...@debian.org> +Uploaders: Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 5.0.0), automake, commit e80fe1d900603a2280a6841a4192db4564521ff5 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 18:13:33 2012 +0200 Install xcmiscproto.pc to /usr/share/pkgconfig. diff --git a/debian/changelog b/debian/changelog index 9407914..dbdd684 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x11proto-xcmisc (1.2.2-1) UNRELEASED; urgency=low * New upstream release. * Set docdir directly in configure. * Don't require (fake)root for debian/rules clean. + * Install xcmiscproto.pc to /usr/share/pkgconfig. -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 18:10:40 +0200 diff --git a/debian/x11proto-xcmisc-dev.install b/debian/x11proto-xcmisc-dev.install index 21544e0..a51bc90 100644 --- a/debian/x11proto-xcmisc-dev.install +++ b/debian/x11proto-xcmisc-dev.install @@ -1,3 +1,3 @@ usr/include/X11/extensions/* -usr/lib/pkgconfig/xcmiscproto.pc +usr/lib/pkgconfig/xcmiscproto.pc usr/share/pkgconfig usr/share/doc/x11proto-xcmisc-dev/ commit d4138733df2cd0a9a4ec324fb0ff223a022620a7 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 18:13:02 2012 +0200 Don't require (fake)root for debian/rules clean. diff --git a/debian/changelog b/debian/changelog index 32b3c05..9407914 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x11proto-xcmisc (1.2.2-1) UNRELEASED; urgency=low * New upstream release. * Set docdir directly in configure. + * Don't require (fake)root for debian/rules clean. -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 18:10:40 +0200 diff --git a/debian/rules b/debian/rules index ada0ed3..bdf5e5b 100755 --- a/debian/rules +++ b/debian/rules @@ -48,9 +48,7 @@ build-stamp: clean: dh_testdir - dh_testroot rm -f build-stamp - rm -f config.cache config.log config.status rm -f */config.cache */config.log */config.status rm -f conftest* */conftest* @@ -59,7 +57,6 @@ clean: rm -f aclocal.m4 configure install-sh missing mkinstalldirs rm -f config.guess config.sub find -name Makefile.in -delete - dh_clean install: build commit 6b30336697e057cef692f96f22efb4e513529295 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 18:12:40 2012 +0200 Set docdir directly in configure. diff --git a/debian/changelog b/debian/changelog index 18dbbc4..32b3c05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x11proto-xcmisc (1.2.2-1) UNRELEASED; urgency=low * New upstream release. + * Set docdir directly in configure. -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 18:10:40 +0200 diff --git a/debian/rules b/debian/rules index 8359d94..ada0ed3 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,7 @@ build-stamp: cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ + --docdir=\$${datadir}/doc/$(PACKAGE) \ --with-xmlto --without-fop \ $(confflags) CFLAGS="$(CFLAGS)" cd build && $(MAKE) @@ -76,7 +77,8 @@ binary-indep: build install dh_installdocs dh_installman - find debian/tmp/usr/share/doc/xcmiscproto -name '*.xml' -delete + find debian/tmp/usr/share/doc/$(PACKAGE) -name '*.xml' -delete + find debian/tmp/usr/share/doc/$(PACKAGE) -name '*.db' -delete dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs dh_link diff --git a/debian/x11proto-xcmisc-dev.install b/debian/x11proto-xcmisc-dev.install index 45382a8..21544e0 100644 --- a/debian/x11proto-xcmisc-dev.install +++ b/debian/x11proto-xcmisc-dev.install @@ -1,5 +1,3 @@ usr/include/X11/extensions/* usr/lib/pkgconfig/xcmiscproto.pc -usr/share/doc/xcmiscproto/*.html usr/share/doc/x11proto-xcmisc-dev/ -usr/share/doc/xcmiscproto/*.css usr/share/doc/x11proto-xcmisc-dev/ -usr/share/doc/xcmiscproto/*.txt usr/share/doc/x11proto-xcmisc-dev/ +usr/share/doc/x11proto-xcmisc-dev/ commit 968dd8783b75b0ec9bb0318ea38e8b1ad749b6a3 Author: Julien Cristau <jcris...@debian.org> Date: Sun Apr 15 18:11:10 2012 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 294e127..daf5a46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,172 @@ +commit f18667046964759f1fe086ade26829f6ced4fea7 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Thu Mar 22 20:52:02 2012 -0700 + + xcmiscproto 1.2.2 + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 8bdaa79348896ecbf4f69df9773ec4681eb46410 +Author: Matt Dew <mar...@osource.org> +Date: Sun Oct 2 20:29:17 2011 -0600 + + 1 - fix the capitalization of the ID attriutes to match either the + <title> or <funcdef> string it goes with. + 2 - fix any <linkend>'s that were affected by 1. + 3 - any <function> in the docs that has an actual funcdef, + will become an olink. + + Signed-off-by: Matt Dew <mar...@osource.org> + +commit 7252c99f0bdfb560efe980f6f87786f4ccedeccd +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Sep 20 20:20:46 2011 -0400 + + specs: fix author affiliation + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 2d793cc635ca8a20a9ee0c99bcc0337c4f82bd7b +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Mon Sep 12 16:54:45 2011 -0400 + + docs: use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 4ecb4f1559d2ce1c74a1ff2763b1ad2746961d53 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Sep 11 19:49:54 2011 -0400 + + docs: remove <productnumber> which is not used by default + + This element is not rendered by default on the title. A template + customization is required to display it. + X Window System does not have a product number. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit e3affab380afc20a7d202ec40896ad43e65a477e +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Thu Sep 8 20:00:00 2011 -0400 + + docbook.am: embed css styles inside the HTML HEAD element + + Rather than referring to the external xorg.css stylesheet, embed the content + of the file in the html output produced. This is accomplished by using + version 1.10 of xorg-xhtml.xsl. + + This makes the whole html docs tree much more relocatable. + In addition, it eliminates xorg.css as a runtime file which makes + xorg-sgml-doctools a build time only package. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit d8e1aee8520fe74d921bef604f2acbb4c0899900 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Wed Sep 7 10:31:04 2011 -0400 + + docbook.am: global maintenance update - entities, images and olinking + + Adding support in libX11 for html chunking caused a reorg of docbook.am + as well as the xorg-sgml-doctools masterdb for olinking. + The parameter img.src.path is added for pdf images. + A searchpath to the root builddir is added for local entities, if present. + + The docbook.am makefile hides all the details and is identical for + all 22 modules having DocBook documentation. It is included by a thin + Makefile.am which requires no docbook knowledge. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 905336a989f14dbbcc0c8d1648a2a51724203a09 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Jun 12 17:54:50 2011 -0400 + + Install xml versions of specs even if HAVE_XMLTO is false + + DocBook/XML input source is also a usefull output format that can be viewed + with an XML viewer or editor and by some O/S help system. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 4179eb64ad35ab425cf00447bff334c387e23306 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Jun 5 16:27:37 2011 -0400 + + Install target dbs alongside generated documents + + This matches a change in xorg-sgml-docs whereby the masterdb will look for + the target dbs into the same location as the generated documents. + + The target dbs are now installed alongside the generated documents. + Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which + has the potential of installing outside the package prefix and cause + distcheck to fail when user does not have write permission in this package. + + Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 + +commit fd4973cb7986e69bf47264430fbd17c58be9d0cd +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Feb 27 15:06:18 2011 -0500 + + Documentation: add Docbook external references support + + When writing technical documentation, it is often necessary to cross + reference to other information. When that other information is not in the + current document, additional support is needed, namely <olink>. + + A new feature with version 1.7 of xorg-sgml-doctools adds references to + other documents within or outside this package. + + This patch adds technical support for this feature but does not change + the content of the documentation as seen by the end user. + + Each book or article must generate a database containing the href + of sections that can be referred to from another document. This database + is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that + the value of DATAROOTDIR for xorg-sgml-doctools and for the package + documentation is the same. This forms a virtual document tree. + + This database is consulted by other documents while they are being generated + in order to fulfill the missing information for linking. + Refer to the xorg-sgml-doctools for further technical information. + + Co-authored-by: Matt Dew <mar...@osource.org> + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 485c361562e986efa1cf05d2c70553e99c1b9382 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Fri Feb 25 08:44:47 2011 -0500 + + Docbook: change the book id to match the xml file basename + + This is required for the up-coming external references support. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 56424da60f0587a0fba8bcbf81536dd043412e87 +Author: Paulo Zanoni <pzan...@mandriva.com> +Date: Thu Dec 16 13:37:28 2010 -0200 + + Use docbookx.dtd version 4.3 for all docs + + Signed-off-by: Paulo Zanoni <pzan...@mandriva.com> + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 357c04268c4801fb17e4f1f495ec113d565b5be2 +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Tue Nov 9 15:19:09 2010 -0500 + + config: HTML file generation: use the installed copy of xorg.css + + Currenlty the xorg.css file is copied in each location + where a DocBook/XML file resides. This produces about + 70 copies in the $(docdir) install tree. + + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + commit bff39d1e68056ffdf83924e708e55730236655dd Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Sat Oct 30 00:04:11 2010 -0700 diff --git a/debian/changelog b/debian/changelog index 4699d95..18dbbc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-xcmisc (1.2.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau <jcris...@debian.org> Sun, 15 Apr 2012 18:10:40 +0200 + x11proto-xcmisc (1.2.1-2) unstable; urgency=low * Mark x11proto-xcmisc-dev Multi-Arch: foreign commit f18667046964759f1fe086ade26829f6ced4fea7 Author: Alan Coopersmith <alan.coopersm...@oracle.com> Date: Thu Mar 22 20:52:02 2012 -0700 xcmiscproto 1.2.2 Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/configure.ac b/configure.ac index 1ce26a3..b6301ee 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([XCMiscProto], [1.2.1], +AC_INIT([XCMiscProto], [1.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 8bdaa79348896ecbf4f69df9773ec4681eb46410 Author: Matt Dew <mar...@osource.org> Date: Sun Oct 2 20:29:17 2011 -0600 1 - fix the capitalization of the ID attriutes to match either the <title> or <funcdef> string it goes with. 2 - fix any <linkend>'s that were affected by 1. 3 - any <function> in the docs that has an actual funcdef, will become an olink. Signed-off-by: Matt Dew <mar...@osource.org> diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index 94c426f..f2dfec2 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -40,7 +40,7 @@ </bookinfo> -<chapter id='overview'> +<chapter id='Overview'> <title>Overview</title> <para>When an X client connects to an X server, it receives a fixed range of @@ -70,7 +70,7 @@ IDs. Xlib can use these extension requests behind the scenes when it has exhausted its current pool of resource IDs.</para> </chapter> -<chapter id='requests'> +<chapter id='Requests'> <title>Requests</title> <para> @@ -131,13 +131,13 @@ range.</para> The number returned may be smaller than the number requested.</para> </chapter> -<chapter id='events_and_errors'> +<chapter id='Events_and_Errors'> <title>Events and Errors</title> <para>No new events or errors are defined by this extension.</para> </chapter> -<chapter id='encoding'> +<chapter id='Encoding'> <title>Encoding</title> <para>Please refer to the X11 Protocol Encoding document as this document uses commit 7252c99f0bdfb560efe980f6f87786f4ccedeccd Author: Gaetan Nadon <mems...@videotron.ca> Date: Tue Sep 20 20:20:46 2011 -0400 specs: fix author affiliation Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index 5f81856..94c426f 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -11,19 +11,19 @@ <bookinfo> <title>XC-MISC Extension</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>Bob</firstname><surname>Scheifler</surname> + <affiliation><orgname>X Consortium</orgname></affiliation> </author> <author> - <firstname>David</firstname><surname>Wiggins</surname> + <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname> + <affiliation><orgname>X Consortium</orgname></affiliation> </author> - <corpauthor>X Consortium</corpauthor> </authorgroup> - <copyright><year>1994</year><holder>X Consortium</holder></copyright> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <releaseinfo>Version 1.1</releaseinfo> - <affiliation><orgname>X Consortium</orgname></affiliation> + <copyright><year>1994</year><holder>X Consortium</holder></copyright> <legalnotice> commit 2d793cc635ca8a20a9ee0c99bcc0337c4f82bd7b Author: Gaetan Nadon <mems...@videotron.ca> Date: Mon Sep 12 16:54:45 2011 -0400 docs: use the &fullrelvers; entity to set X11 release information Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index f643da6..5f81856 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" +[ +<!ENTITY % defs SYSTEM "defs.ent"> %defs; +]> <!-- lifted from troff+ms+XMan by doclifter --> <book id="xc-misc"> @@ -8,7 +11,7 @@ <bookinfo> <title>XC-MISC Extension</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>X Version 11, Release 6.9/7.0</releaseinfo> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <authorgroup> <author> <firstname>Bob</firstname><surname>Scheifler</surname> commit 4ecb4f1559d2ce1c74a1ff2763b1ad2746961d53 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Sep 11 19:49:54 2011 -0400 docs: remove <productnumber> which is not used by default This element is not rendered by default on the title. A template customization is required to display it. X Window System does not have a product number. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/specs/xc-misc.xml b/specs/xc-misc.xml index 7e5a46e..f643da6 100644 --- a/specs/xc-misc.xml +++ b/specs/xc-misc.xml @@ -21,7 +21,6 @@ <copyright><year>1994</year><holder>X Consortium</holder></copyright> <releaseinfo>Version 1.1</releaseinfo> <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 6.9/7.0</productnumber> <legalnotice> commit e3affab380afc20a7d202ec40896ad43e65a477e Author: Gaetan Nadon <mems...@videotron.ca> Date: Thu Sep 8 20:00:00 2011 -0400 docbook.am: embed css styles inside the HTML HEAD element Rather than referring to the external xorg.css stylesheet, embed the content of the file in the html output produced. This is accomplished by using version 1.10 of xorg-xhtml.xsl. This makes the whole html docs tree much more relocatable. In addition, it eliminates xorg.css as a runtime file which makes xorg-sgml-doctools a build time only package. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/docbook.am b/docbook.am index 9377f5b..bba4d54 100644 --- a/docbook.am +++ b/docbook.am @@ -30,11 +30,9 @@ XMLTO_HTML_OLINK_FLAGS = \ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ --stringparam current.docid="$(<:.xml=)" XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl -XMLTO_HTML_CSS_STYLESHEET_FLAGS = --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css XMLTO_HTML_FLAGS = \ $(XMLTO_SEARCHPATH_FLAGS) \ $(XMLTO_HTML_STYLESHEET_FLAGS) \ - $(XMLTO_HTML_CSS_STYLESHEET_FLAGS) \ $(XMLTO_HTML_OLINK_FLAGS) shelf_DATA += $(docbook:.xml=.html) commit d8e1aee8520fe74d921bef604f2acbb4c0899900 Author: Gaetan Nadon <mems...@videotron.ca> Date: Wed Sep 7 10:31:04 2011 -0400 docbook.am: global maintenance update - entities, images and olinking Adding support in libX11 for html chunking caused a reorg of docbook.am as well as the xorg-sgml-doctools masterdb for olinking. The parameter img.src.path is added for pdf images. A searchpath to the root builddir is added for local entities, if present. The docbook.am makefile hides all the details and is identical for all 22 modules having DocBook documentation. It is included by a thin Makefile.am which requires no docbook knowledge. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/docbook.am b/docbook.am index 2ffb7e6..9377f5b 100644 --- a/docbook.am +++ b/docbook.am @@ -21,74 +21,84 @@ shelf_DATA = dist_shelf_DATA = $(docbook) $(chapters) if HAVE_XMLTO -# -# Generate DocBook/XML output formats with or without stylesheets -# - -# Stylesheets are available if the package xorg-sgml-doctools is installed if HAVE_STYLESHEETS -# The location where all cross reference databases are installed -sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs -masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml" -XMLTO_FLAGS = \ - --searchpath "$(XORG_SGML_PATH)/X11" \ - --stringparam target.database.document=$(masterdb) \ - --stringparam current.docid="$(<:.xml=)" \ - --stringparam collect.xref.targets="no" - -XMLTO_XHTML_FLAGS = \ - -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \ - --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css - -XMLTO_FO_FLAGS = \ - -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -endif HAVE_STYLESHEETS +XMLTO_SEARCHPATH_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --searchpath "$(abs_top_builddir)" +XMLTO_HTML_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XMLTO_HTML_CSS_STYLESHEET_FLAGS = --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css +XMLTO_HTML_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_HTML_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_CSS_STYLESHEET_FLAGS) \ + $(XMLTO_HTML_OLINK_FLAGS) shelf_DATA += $(docbook:.xml=.html) -%.html: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< - -if HAVE_FOP -shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -%.pdf: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop pdf $< -%.ps: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_FO_FLAGS) --with-fop ps $< -endif HAVE_FOP +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< if HAVE_XMLTO_TEXT + shelf_DATA += $(docbook:.xml=.txt) %.txt: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $< + $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< endif HAVE_XMLTO_TEXT -# -# Generate documents cross-reference target databases -# +if HAVE_FOP +XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ +XMLTO_PDF_OLINK_FLAGS = \ + --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ + --stringparam current.docid="$(<:.xml=)" +XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +XMLTO_FO_FLAGS = \ + $(XMLTO_SEARCHPATH_FLAGS) \ + $(XMLTO_FO_STYLESHEET_FLAGS) \ + $(XMLTO_FO_IMAGEPATH_FLAGS) \ + $(XMLTO_PDF_OLINK_FLAGS) + +shelf_DATA += $(docbook:.xml=.pdf) +%.pdf: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< -# This is only possible if the xorg-sgml-doctools package is installed -if HAVE_STYLESHEETS -if HAVE_XSLTPROC +shelf_DATA += $(docbook:.xml=.ps) +%.ps: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< +endif HAVE_FOP -# DocBook/XML generated document cross-reference database -shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) +# Generate documents cross-reference target databases +if HAVE_XSLTPROC -# Generate DocBook/XML document cross-reference database -# Flags for the XSL Transformation processor generating xref target databases -XSLTPROC_FLAGS = \ +XSLT_SEARCHPATH_FLAGS = \ --path "$(XORG_SGML_PATH)/X11" \ - --stringparam targets.filename "$@" \ - --stringparam collect.xref.targets "only" \ - --nonet --xinclude - + --path "$(abs_top_builddir)" +XSLT_OLINK_FLAGS = \ + --stringparam targets.filename "$@" \ + --stringparam collect.xref.targets "only" \ + --stringparam olink.base.uri "$(@:.db=)" + +XSLT_HTML_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl +XSLT_PDF_FLAGS = \ + $(XSLT_SEARCHPATH_FLAGS) \ + $(XSLT_OLINK_FLAGS) \ + --nonet --xinclude \ + $(STYLESHEET_SRCDIR)/xorg-fo.xsl + +shelf_DATA += $(docbook:.xml=.html.db) %.html.db: %.xml $(chapters) - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ - http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $< + $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< -%.fo.db: %.xml $(chapters) - $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \ - http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< +shelf_DATA += $(docbook:.xml=.pdf.db) +%.pdf.db: %.xml $(chapters) + $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< endif HAVE_XSLTPROC endif HAVE_STYLESHEETS commit 905336a989f14dbbcc0c8d1648a2a51724203a09 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Jun 12 17:54:50 2011 -0400 Install xml versions of specs even if HAVE_XMLTO is false DocBook/XML input source is also a usefull output format that can be viewed with an XML viewer or editor and by some O/S help system. Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/docbook.am b/docbook.am index 5864c9e..2ffb7e6 100644 --- a/docbook.am +++ b/docbook.am @@ -20,6 +20,7 @@ shelf_DATA = # DocBook/XML file with chapters, appendix and images it includes dist_shelf_DATA = $(docbook) $(chapters) +if HAVE_XMLTO # # Generate DocBook/XML output formats with or without stylesheets # @@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS +endif HAVE_XMLTO CLEANFILES = $(shelf_DATA) diff --git a/specs/Makefile.am b/specs/Makefile.am index b31bfdb..69d3f7f 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = xc-misc.xml @@ -11,5 +10,4 @@ shelfdir = $(docdir) # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS commit 4179eb64ad35ab425cf00447bff334c387e23306 Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Jun 5 16:27:37 2011 -0400 Install target dbs alongside generated documents This matches a change in xorg-sgml-docs whereby the masterdb will look for the target dbs into the same location as the generated documents. The target dbs are now installed alongside the generated documents. Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which has the potential of installing outside the package prefix and cause distcheck to fail when user does not have write permission in this package. Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 diff --git a/configure.ac b/configure.ac index f344411..1ce26a3 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ XORG_ENABLE_SPECS XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP XORG_WITH_XSLTPROC -XORG_CHECK_SGML_DOCTOOLS(1.7) +XORG_CHECK_SGML_DOCTOOLS(1.8) AC_OUTPUT([Makefile specs/Makefile diff --git a/docbook.am b/docbook.am index 3cf21e8..5864c9e 100644 --- a/docbook.am +++ b/docbook.am @@ -71,7 +71,7 @@ if HAVE_STYLESHEETS if HAVE_XSLTPROC # DocBook/XML generated document cross-reference database -sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) +shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @@ -92,4 +92,4 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS -CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +CLEANFILES = $(shelf_DATA) commit fd4973cb7986e69bf47264430fbd17c58be9d0cd Author: Gaetan Nadon <mems...@videotron.ca> Date: Sun Feb 27 15:06:18 2011 -0500 Documentation: add Docbook external references support When writing technical documentation, it is often necessary to cross reference to other information. When that other information is not in the current document, additional support is needed, namely <olink>. A new feature with version 1.7 of xorg-sgml-doctools adds references to other documents within or outside this package. This patch adds technical support for this feature but does not change the content of the documentation as seen by the end user. Each book or article must generate a database containing the href of sections that can be referred to from another document. This database is installed in DATAROOTDIR/sgml/X11/dbs. There is a requirement that the value of DATAROOTDIR for xorg-sgml-doctools and for the package documentation is the same. This forms a virtual document tree. This database is consulted by other documents while they are being generated in order to fulfill the missing information for linking. Refer to the xorg-sgml-doctools for further technical information. Co-authored-by: Matt Dew <mar...@osource.org> Signed-off-by: Gaetan Nadon <mems...@videotron.ca> diff --git a/configure.ac b/configure.ac index 9bed793..f344411 100644 --- a/configure.ac +++ b/configure.ac @@ -4,15 +4,16 @@ AC_INIT([XCMiscProto], [1.2.1], AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE -# Require xorg-macros minimum of 1.10 for DocBook XML documentation +# Require xorg-macros minimum of 1.12 for DocBook external references m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.10 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.10) + [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.12) XORG_DEFAULT_OPTIONS XORG_ENABLE_SPECS -XORG_WITH_XMLTO(0.0.20) +XORG_WITH_XMLTO(0.0.22) XORG_WITH_FOP -XORG_CHECK_SGML_DOCTOOLS(1.5) +XORG_WITH_XSLTPROC +XORG_CHECK_SGML_DOCTOOLS(1.7) AC_OUTPUT([Makefile specs/Makefile diff --git a/docbook.am b/docbook.am new file mode 100644 index 0000000..3cf21e8 --- /dev/null +++ b/docbook.am @@ -0,0 +1,95 @@ +# +# Generate output formats for a single DocBook/XML with/without chapters +# +# Variables set by the calling Makefile: +# shelfdir: the location where the docs/specs are installed. Typically $(docdir) +# docbook: the main DocBook/XML file, no chapters, appendix or image files +# chapters: all files pulled in by an XInclude statement and images. +# + +# +# This makefile is intended for Users Documentation and Functional Specifications. +# Do not use for Developer Documentation which is not installed and does not require olink. +# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 +# for an explanation on documents classification. +# + +# DocBook/XML generated output formats to be installed +shelf_DATA = + +# DocBook/XML file with chapters, appendix and images it includes +dist_shelf_DATA = $(docbook) $(chapters) + +# +# Generate DocBook/XML output formats with or without stylesheets +# + +# Stylesheets are available if the package xorg-sgml-doctools is installed +if HAVE_STYLESHEETS + +# The location where all cross reference databases are installed +sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs +masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml" +XMLTO_FLAGS = \ + --searchpath "$(XORG_SGML_PATH)/X11" \ + --stringparam target.database.document=$(masterdb) \ + --stringparam current.docid="$(<:.xml=)" \ + --stringparam collect.xref.targets="no" + +XMLTO_XHTML_FLAGS = \ + -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \ + --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css + +XMLTO_FO_FLAGS = \ + -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl +endif HAVE_STYLESHEETS + +shelf_DATA += $(docbook:.xml=.html) +%.html: %.xml $(chapters) + $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< + +if HAVE_FOP +shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +%.pdf: %.xml $(chapters) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1sjsai-0003hn...@vasks.debian.org