ChangeLog | 197 ++++++++++++++++++++++++++++++++++++++ configure.ac | 13 +- debian/changelog | 10 + debian/rules | 11 +- debian/x11proto-fonts-dev.install | 3 docbook.am | 105 ++++++++++++++++++++ specs/.gitignore | 2 specs/Makefile.am | 63 +----------- specs/fsproto.xml | 72 ++++++------- 9 files changed, 367 insertions(+), 109 deletions(-)
New commits: commit e04c3affd50a1d9d868cbc2d2cd2983d2ca6eb32 Author: Julien Cristau <[email protected]> Date: Sun Apr 15 15:17:22 2012 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 3e8fbfb..a8303aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x11proto-fonts (2.1.2-1) UNRELEASED; urgency=low +x11proto-fonts (2.1.2-1) unstable; urgency=low * New upstream release. * Move fontsproto.pc to /usr/share/pkgconfig. @@ -6,7 +6,7 @@ x11proto-fonts (2.1.2-1) UNRELEASED; urgency=low * Add build-{arch,indep} debian/rules targets. * We no longer install xorg.css, and exclude *.db. - -- Julien Cristau <[email protected]> Sun, 15 Apr 2012 13:04:11 +0200 + -- Julien Cristau <[email protected]> Sun, 15 Apr 2012 15:17:12 +0200 x11proto-fonts (2.1.1-3) unstable; urgency=low commit fc21a1a20cb4f7719070fd3636673f6253f05f6d Author: Julien Cristau <[email protected]> Date: Sun Apr 15 13:45:57 2012 +0200 Exclude *.db for dh_install diff --git a/debian/changelog b/debian/changelog index acbd3ef..3e8fbfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ x11proto-fonts (2.1.2-1) UNRELEASED; urgency=low * Move fontsproto.pc to /usr/share/pkgconfig. * Don't require (fake)root for debian/rules clean. * Add build-{arch,indep} debian/rules targets. - * We no longer install xorg.css. + * We no longer install xorg.css, and exclude *.db. -- Julien Cristau <[email protected]> Sun, 15 Apr 2012 13:04:11 +0200 diff --git a/debian/rules b/debian/rules index 09901c3..e8e8834 100755 --- a/debian/rules +++ b/debian/rules @@ -77,7 +77,7 @@ binary-indep: build install dh_installdocs dh_installman find debian/tmp/usr/share/doc/fontsproto -name '*.xml' -delete - dh_install --sourcedir=debian/tmp --fail-missing + dh_install --sourcedir=debian/tmp --fail-missing --exclude .db dh_installchangelogs dh_link dh_strip commit 81fa9a32e7c4434fb0f55dbebbb7b59e8893dc9e Author: Julien Cristau <[email protected]> Date: Sun Apr 15 13:43:41 2012 +0200 We no longer install xorg.css. diff --git a/debian/changelog b/debian/changelog index 9391dea..acbd3ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ x11proto-fonts (2.1.2-1) UNRELEASED; urgency=low * Move fontsproto.pc to /usr/share/pkgconfig. * Don't require (fake)root for debian/rules clean. * Add build-{arch,indep} debian/rules targets. + * We no longer install xorg.css. -- Julien Cristau <[email protected]> Sun, 15 Apr 2012 13:04:11 +0200 diff --git a/debian/x11proto-fonts-dev.install b/debian/x11proto-fonts-dev.install index 8f19347..6567db6 100644 --- a/debian/x11proto-fonts-dev.install +++ b/debian/x11proto-fonts-dev.install @@ -1,5 +1,4 @@ usr/include/X11/fonts/* usr/lib/pkgconfig/fontsproto.pc usr/share/pkgconfig usr/share/doc/fontsproto/*.html usr/share/doc/x11proto-fonts-dev/ -usr/share/doc/fontsproto/*.css usr/share/doc/x11proto-fonts-dev/ usr/share/doc/fontsproto/*.txt usr/share/doc/x11proto-fonts-dev/ commit a8a674ed9b77d59bded4175af727b9e7e2fd6c03 Author: Julien Cristau <[email protected]> Date: Sun Apr 15 13:40:46 2012 +0200 Add build-{arch,indep} debian/rules targets. diff --git a/debian/changelog b/debian/changelog index 923a86c..9391dea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ x11proto-fonts (2.1.2-1) UNRELEASED; urgency=low * New upstream release. * Move fontsproto.pc to /usr/share/pkgconfig. * Don't require (fake)root for debian/rules clean. + * Add build-{arch,indep} debian/rules targets. -- Julien Cristau <[email protected]> Sun, 15 Apr 2012 13:04:11 +0200 diff --git a/debian/rules b/debian/rules index 17954dd..09901c3 100755 --- a/debian/rules +++ b/debian/rules @@ -32,7 +32,10 @@ else endif -build: build-stamp +build: build-indep +build-arch: + # Nothing to do +build-indep: build-stamp build-stamp: dh_testdir autoreconf -vfi @@ -92,3 +95,4 @@ binary-arch: build install binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install +.PHONY: build-arch build-indep commit 0189f317ef401297045b3ddc87225abaedd465e7 Author: Julien Cristau <[email protected]> Date: Sun Apr 15 13:35:49 2012 +0200 Don't require (fake)root for debian/rules clean. diff --git a/debian/changelog b/debian/changelog index 9483b27..923a86c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x11proto-fonts (2.1.2-1) UNRELEASED; urgency=low * New upstream release. * Move fontsproto.pc to /usr/share/pkgconfig. + * Don't require (fake)root for debian/rules clean. -- Julien Cristau <[email protected]> Sun, 15 Apr 2012 13:04:11 +0200 diff --git a/debian/rules b/debian/rules index 4903ade..17954dd 100755 --- a/debian/rules +++ b/debian/rules @@ -47,9 +47,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* @@ -58,7 +56,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 813b6ba10b18ba215cc354d7736cba87774f2b0b Author: Julien Cristau <[email protected]> Date: Sun Apr 15 13:21:45 2012 +0200 Move fontsproto.pc to /usr/share/pkgconfig. diff --git a/debian/changelog b/debian/changelog index d75dc0a..9483b27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ x11proto-fonts (2.1.2-1) UNRELEASED; urgency=low * New upstream release. + * Move fontsproto.pc to /usr/share/pkgconfig. -- Julien Cristau <[email protected]> Sun, 15 Apr 2012 13:04:11 +0200 diff --git a/debian/x11proto-fonts-dev.install b/debian/x11proto-fonts-dev.install index 4080411..8f19347 100644 --- a/debian/x11proto-fonts-dev.install +++ b/debian/x11proto-fonts-dev.install @@ -1,5 +1,5 @@ usr/include/X11/fonts/* -usr/lib/pkgconfig/fontsproto.pc +usr/lib/pkgconfig/fontsproto.pc usr/share/pkgconfig usr/share/doc/fontsproto/*.html usr/share/doc/x11proto-fonts-dev/ usr/share/doc/fontsproto/*.css usr/share/doc/x11proto-fonts-dev/ usr/share/doc/fontsproto/*.txt usr/share/doc/x11proto-fonts-dev/ commit 448fcfd30dee97193c6283d3fb73d8ffe20b80be Author: Julien Cristau <[email protected]> Date: Sun Apr 15 13:04:30 2012 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 10e7cfa..4dcb602 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,200 @@ +commit 607784e2ad522b7dff32da82480acf6934dc4a23 +Author: Alan Coopersmith <[email protected]> +Date: Thu Mar 22 20:40:21 2012 -0700 + + fontsproto 2.1.2 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 419c6b31ffc3a87caf2861b6eec546cfc661d113 +Author: Matt Dew <[email protected]> +Date: Sun Oct 2 20:15:53 2011 -0600 + + 1 - fix the capitolization 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 <[email protected]> + +commit 5073454c1a2510c6e33b7847c8e6f83d38ad03f4 +Author: Gaetan Nadon <[email protected]> +Date: Tue Sep 20 19:48:46 2011 -0400 + + specs: use <copyright> for the first holder in multi licensing + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 5026754b2310858642a50eeab3b01927b937ab8e +Author: Gaetan Nadon <[email protected]> +Date: Mon Sep 19 07:56:51 2011 -0400 + + specs: The strandard name is still "X Consortium Standard" + + This spec, and libX11 spec, are the only two docs with a different + standard name. + + http://cgit.freedesktop.org/xorg/doc/xorg-docs/commit/specs/FSProtocol + ?h=XORG-RELEASE-1&id=0f51a88d2cf4a4d1394c79faa3339e5151e5f682 + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 6817307590e4dec36111bdbb16970d98f8a8889e +Author: Gaetan Nadon <[email protected]> +Date: Sun Sep 18 10:28:19 2011 -0400 + + specs: fix multi licensed copyright notice and license text + + For documentation having multiple licenses, the copyright and legalnotice + elements sequence cannot instantiated multiple times. + The copyright notice and license text are therefore coded inside a legalnotice + element. The role attribute on the paragraph is used to allow styling of the + copyright notice text which should not be italicized. + + To view the change in the html format, obtain xorg-sgml-doctools + at version 1.10.1 or later and rebuild the html version of the spec. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit aaf34e37a1a64f9b89c849edc6760c51ad2368d7 +Author: Gaetan Nadon <[email protected]> +Date: Sat Sep 17 20:43:00 2011 -0400 + + specs: fix author affiliation markup + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit ddb83dcf2d4cf3f6f1218240f45983bf086ee001 +Author: Gaetan Nadon <[email protected]> +Date: Mon Sep 12 20:42:31 2011 -0400 + + docs: use the &fullrelvers; entity to set X11 release information + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit a82382dd66ca300750449f19fcd29f23fe10641d +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit 1be097307ad7eeb54708467a21295cacb101830b +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit 0192fbcab2810c7b172388d74d19fce35698ae2a +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit e4372971363bd8a897cfdc62b84704f339645f45 +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + +commit c045479c5dad6e50ee711ed18f0f7ed4de84fd88 +Author: Gaetan Nadon <[email protected]> +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 ea8af5fe7fb284f3dc5fb4df972624d8c190399f +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 74a10bb2f4626072b76dcf54b5ef6c933d63be15 +Author: Alan Coopersmith <[email protected]> +Date: Thu Dec 16 17:45:23 2010 -0800 + + spec: Fix section titles/nesting + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 043885855c2e8312a75a106cee5460b694299afe +Author: Gaetan Nadon <[email protected]> +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 <[email protected]> + commit 2fce721a9a0c0ff820f2cbbf7309990c25852f02 Author: Alan Coopersmith <[email protected]> Date: Fri Oct 29 21:29:15 2010 -0700 diff --git a/debian/changelog b/debian/changelog index 0e0a4b8..d75dc0a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x11proto-fonts (2.1.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau <[email protected]> Sun, 15 Apr 2012 13:04:11 +0200 + x11proto-fonts (2.1.1-3) unstable; urgency=low * *Really* mark the package Multi-Arch: foreign, since I seem to have commit 607784e2ad522b7dff32da82480acf6934dc4a23 Author: Alan Coopersmith <[email protected]> Date: Thu Mar 22 20:40:21 2012 -0700 fontsproto 2.1.2 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index cc5a760..ff737f0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([FontsProto], [2.1.1], +AC_INIT([FontsProto], [2.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 419c6b31ffc3a87caf2861b6eec546cfc661d113 Author: Matt Dew <[email protected]> Date: Sun Oct 2 20:15:53 2011 -0600 1 - fix the capitolization 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 <[email protected]> diff --git a/specs/fsproto.xml b/specs/fsproto.xml index 9a0c5c8..d5a538e 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -64,7 +64,7 @@ in this Software without prior written authorization from the X Consortium. </legalnotice> </articleinfo> -<sect1 id="introduction"> +<sect1 id='Introduction'> <title>Introduction</title> <para> The management of fonts in large, heterogeneous environments is one of the @@ -118,7 +118,7 @@ implement a variety of strategies for fine-grained demand-loading of glyphs. </para> </sect1> -<sect1 id="architectural_model"> +<sect1 id='Architectural_Model'> <title>Architectural Model</title> <!-- .XS --> <!-- (SN Architectural Model --> @@ -237,7 +237,7 @@ Consortium. </para> </sect1> -<sect1 id="font_server_naming"> +<sect1 id='Font_Server_Naming'> <title>Font Server Naming</title> <!-- .XS --> <!-- (SN Font Server Naming --> @@ -252,7 +252,7 @@ described below. Formats for additional transports may be registered with the X Consortium. </para> -<sect2 id="tcpip_names"> +<sect2 id='TCPIP_Names'> <title>TCP/IP Names</title> <!-- .XS --> <!-- (SN TCP/IP Names --> @@ -279,7 +279,7 @@ that may be requested. For example: </literallayout> </sect2> -<sect2 id="decnet_names"> +<sect2 id='DECnet_Names'> <title>DECnet Names</title> <!-- .XS --> <!-- (SN DECnet Names --> @@ -309,7 +309,7 @@ requested. For example: </sect2> </sect1> -<sect1 id="protocol"> +<sect1 id='Protocol'> <title>Protocol</title> <!-- .XS --> <!-- (SN Protocol --> @@ -377,7 +377,7 @@ A type with a prefix "LISTof" represents a counted list of elements of that type, as in: LISTofCARD8 </para> -<sect2 id="data_types"> +<sect2 id='Data_Types'> <title>Data Types</title> <!-- .XS --> <!-- (SN Data Types --> @@ -1104,7 +1104,7 @@ This structure is padded to 32-bit alignment. </blockquote> </sect2> -<sect2 id="requests"> +<sect2 id='Requests'> <title>Requests</title> <!-- .XS --> <!-- (SN Requests --> @@ -2650,7 +2650,7 @@ the client that made the connection. </blockquote> </sect2> -<sect2 id="errors"> +<sect2 id='Errors'> <title>Errors</title> <!-- .XS --> <!-- (SN Errors --> @@ -2977,7 +2977,7 @@ Additional errors may be defined by extensions. </blockquote> </sect2> -<sect2 id="events"> +<sect2 id='Events'> <title>Events</title> <!-- .XS --> <!-- (SN Events --> @@ -3116,7 +3116,7 @@ Additional events may be defined by extensions. </sect2> </sect1> -<sect1 id="protocol_encoding"> +<sect1 id='Protocol_Encoding'> <title>Protocol Encoding</title> <!-- .XS --> <!-- (SN Protocol Encoding --> @@ -3164,7 +3164,7 @@ multiple of four: pad(e) = (4 - (e mod 4)) mod 4 </literallayout> -<sect2 id="data_types_2"> +<sect2 id='Data_Types_2'> <title>Data Types</title> <!-- .XS --> <!-- (SN Data Types --> @@ -3363,7 +3363,7 @@ n PROPINFO property data </literallayout> </sect2> -<sect2 id="requests_2"> +<sect2 id='Requests_2'> <title>Requests</title> <para><emphasis role="bold">open connection</emphasis></para> <literallayout class="monospaced"> @@ -3760,7 +3760,7 @@ p unused, p=pad(m) </literallayout> </sect2> -<sect2 id="errors_2"> +<sect2 id='Errors_2'> <title>Errors</title> <literallayout class="monospaced"> @@ -3894,7 +3894,7 @@ p unused, p=pad(m) </literallayout> </sect2> -<sect2 id="events_2"> +<sect2 id='Events_2'> <title>Events</title> <literallayout class="monospaced"> <emphasis role="bold">KeepAlive</emphasis> @@ -3928,7 +3928,7 @@ p unused, p=pad(m) </sect2> </sect1> -<sect1 id="acknowledgements"> +<sect1 id='Acknowledgements'> <title>Acknowledgements</title> <!-- .XS --> <!-- (SN Acknowledgements --> commit 5073454c1a2510c6e33b7847c8e6f83d38ad03f4 Author: Gaetan Nadon <[email protected]> Date: Tue Sep 20 19:48:46 2011 -0400 specs: use <copyright> for the first holder in multi licensing Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/specs/fsproto.xml b/specs/fsproto.xml index 7525665..9a0c5c8 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -20,10 +20,9 @@ </author> </authorgroup> <edition>Revised May 2, 1994</edition> + <copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright> <legalnotice> - -<para role="multiLicensing">Copyright © 1991 Network Computing Devices, Inc.</para> <para> Permission to use, copy, modify, distribute, and sell this documentation for any purpose is hereby granted without fee, @@ -33,6 +32,9 @@ makes no representations about the suitability for any purpose of the information in this document. This documentation is provided "as is" without express or implied warranty. </para> +</legalnotice> + +<legalnotice> <para role="multiLicensing">Copyright © 1994 X Consortium</para> <para> Permission is hereby granted, free of charge, to any person obtaining a copy @@ -46,16 +48,14 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. </para> - <para> -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </para> - <para> Except as contained in this notice, the name of the X Consortium shall not be used in advertising or otherwise to promote the sale, use or other dealings commit 5026754b2310858642a50eeab3b01927b937ab8e Author: Gaetan Nadon <[email protected]> Date: Mon Sep 19 07:56:51 2011 -0400 specs: The strandard name is still "X Consortium Standard" This spec, and libX11 spec, are the only two docs with a different standard name. http://cgit.freedesktop.org/xorg/doc/xorg-docs/commit/specs/FSProtocol ?h=XORG-RELEASE-1&id=0f51a88d2cf4a4d1394c79faa3339e5151e5f682 Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/specs/fsproto.xml b/specs/fsproto.xml index baaca83..7525665 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -10,7 +10,7 @@ <articleinfo> <title>The X Font Service Protocol</title> - <subtitle>X Window System Standard</subtitle> + <subtitle>X Consortium Standard</subtitle> <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <releaseinfo>Version 2.0</releaseinfo> <authorgroup> commit 6817307590e4dec36111bdbb16970d98f8a8889e Author: Gaetan Nadon <[email protected]> Date: Sun Sep 18 10:28:19 2011 -0400 specs: fix multi licensed copyright notice and license text For documentation having multiple licenses, the copyright and legalnotice elements sequence cannot instantiated multiple times. The copyright notice and license text are therefore coded inside a legalnotice element. The role attribute on the paragraph is used to allow styling of the copyright notice text which should not be italicized. To view the change in the html format, obtain xorg-sgml-doctools at version 1.10.1 or later and rebuild the html version of the spec. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/specs/fsproto.xml b/specs/fsproto.xml index f9b7bef..baaca83 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -19,12 +19,11 @@ <affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation> </author> </authorgroup> - <copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright> - <copyright><year>1994</year><holder>X Consortium</holder></copyright> <edition>Revised May 2, 1994</edition> <legalnotice> +<para role="multiLicensing">Copyright © 1991 Network Computing Devices, Inc.</para> <para> Permission to use, copy, modify, distribute, and sell this documentation for any purpose is hereby granted without fee, @@ -34,6 +33,7 @@ makes no representations about the suitability for any purpose of the information in this document. This documentation is provided "as is" without express or implied warranty. </para> +<para role="multiLicensing">Copyright © 1994 X Consortium</para> <para> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal commit aaf34e37a1a64f9b89c849edc6760c51ad2368d7 Author: Gaetan Nadon <[email protected]> Date: Sat Sep 17 20:43:00 2011 -0400 specs: fix author affiliation markup Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/specs/fsproto.xml b/specs/fsproto.xml index a3f4fcb..f9b7bef 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -16,15 +16,11 @@ <authorgroup> <author> <firstname>Jim</firstname><surname>Fulton</surname> - <affiliation><orgname> -Network Computing Devices, Inc. - </orgname></affiliation> + <affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation> </author> </authorgroup> - <corpname>X Consortium Standard</corpname> <copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright> <copyright><year>1994</year><holder>X Consortium</holder></copyright> - <affiliation><orgname>X Consortium</orgname></affiliation> <edition>Revised May 2, 1994</edition> <legalnotice> commit ddb83dcf2d4cf3f6f1218240f45983bf086ee001 Author: Gaetan Nadon <[email protected]> Date: Mon Sep 12 20:42:31 2011 -0400 docs: use the &fullrelvers; entity to set X11 release information Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/specs/fsproto.xml b/specs/fsproto.xml index 9db5dbd..a3f4fcb 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE article 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; +]> <article id="fsproto"> @@ -8,6 +11,7 @@ <articleinfo> <title>The X Font Service Protocol</title> <subtitle>X Window System Standard</subtitle> + <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo> <releaseinfo>Version 2.0</releaseinfo> <authorgroup> <author> commit a82382dd66ca300750449f19fcd29f23fe10641d Author: Gaetan Nadon <[email protected]> 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 <[email protected]> diff --git a/specs/fsproto.xml b/specs/fsproto.xml index 5f119c5..9db5dbd 100644 --- a/specs/fsproto.xml +++ b/specs/fsproto.xml @@ -21,7 +21,6 @@ Network Computing Devices, Inc. <copyright><year>1991</year><holder>Network Computing Devices, Inc.</holder></copyright> <copyright><year>1994</year><holder>X Consortium</holder></copyright> <affiliation><orgname>X Consortium</orgname></affiliation> - <productnumber>X Version 11, Release 6.8</productnumber> <edition>Revised May 2, 1994</edition> <legalnotice> commit 1be097307ad7eeb54708467a21295cacb101830b Author: Gaetan Nadon <[email protected]> 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 <[email protected]> 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 0192fbcab2810c7b172388d74d19fce35698ae2a Author: Gaetan Nadon <[email protected]> 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 <[email protected]> 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 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
