x11proto-record: Changes to 'debian-unstable'
ChangeLog | 185 ++++++++++++++++++++++++++
configure.ac | 13 +
debian/changelog | 10 +
debian/control | 6
debian/rules | 7 -
debian/x11proto-record-dev.install | 4
docbook.am | 105 +++++++++++++++
specs/.gitignore | 2
specs/Makefile.am | 63 ---------
specs/record.xml | 259 +++++++++++++++++++------------------
10 files changed, 456 insertions(+), 198 deletions(-)
New commits:
commit 05141937d142805da9203d34d872908fd78fdfd8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:34:43 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 525f686..936bfde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-record (1.14.2-1) UNRELEASED; urgency=low
+x11proto-record (1.14.2-1) unstable; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
@@ -6,7 +6,7 @@ x11proto-record (1.14.2-1) UNRELEASED; urgency=low
configure.ac.
* Update docs installation for new release.
- -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:26:01 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:34:36 +0200
x11proto-record (1.14.1-2) unstable; urgency=low
commit 5e06df3facc54909acb82c3492928152be9b42f1
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:33:26 2012 +0200
Update docs installation for new release.
Set docdir directly in configure, exclude .db files.
diff --git a/debian/changelog b/debian/changelog
index 28e0246..525f686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11proto-record (1.14.2-1) UNRELEASED; urgency=low
* Don't require (fake)root for debian/rules clean.
* Bump build-deps on xutils-dev, xmlto and xorg-sgml-doctools per
configure.ac.
+ * Update docs installation for new release.
-- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:26:01 +0200
diff --git a/debian/rules b/debian/rules
index a56c481..05e4a83 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)
@@ -73,7 +74,8 @@ binary-indep: build install
dh_installdocs
dh_installman
- find debian/tmp/usr/share/doc/recordproto -name '*.xml' -delete
+ find debian/tmp/usr/share/doc/$(PACKAGE) -name '*.db' -delete
+ find debian/tmp/usr/share/doc/$(PACKAGE) -name '*.xml' -delete
dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs
dh_link
diff --git a/debian/x11proto-record-dev.install b/debian/x11proto-record-dev.install
index cd26366..42960a5 100644
--- a/debian/x11proto-record-dev.install
+++ b/debian/x11proto-record-dev.install
@@ -1,5 +1,3 @@
usr/include/X11/extensions/*
usr/lib/pkgconfig/recordproto.pc /usr/share/pkgconfig
-usr/share/doc/recordproto/*.html usr/share/doc/x11proto-record-dev/
-usr/share/doc/recordproto/*.css usr/share/doc/x11proto-record-dev/
-usr/share/doc/recordproto/*.txt usr/share/doc/x11proto-record-dev/
+usr/share/doc/x11proto-record-dev
commit da6b7a504e1ac0e441cc648cae58fd1609e93ee7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:29:28 2012 +0200
Bump build-deps on xutils-dev, xmlto and xorg-sgml-doctools per configure.ac.
diff --git a/debian/changelog b/debian/changelog
index eefb57e..28e0246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ x11proto-record (1.14.2-1) UNRELEASED; urgency=low
* New upstream release.
* Don't require (fake)root for debian/rules clean.
+ * Bump build-deps on xutils-dev, xmlto and xorg-sgml-doctools per
+ configure.ac.
-- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:26:01 +0200
diff --git a/debian/control b/debian/control
index cc97f90..ba561ee 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,12 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.
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-record
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-record.git
commit fd5fb1bc56414b1ec455275354202173c0087f7a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:27:58 2012 +0200
Don't require (fake)root for debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index 730a4a7..eefb57e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-record (1.14.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Don't require (fake)root for debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:26:01 +0200
diff --git a/debian/rules b/debian/rules
index 762f873..a56c481 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 d3810714dc91f33b9b671a14bf8715d0460e72e7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:27:11 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index ed8cf12..ef2839e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,188 @@
+commit 32236c56b7015a98d845bb1836817328a307edce
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Mar 22 20:46:36 2012 -0700
+
+ recordproto 1.14.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 10028272314500dd2e17e5ae7efa0a2d4d118c13
+Author: Matt Dew <marcoz@osource.org>
+Date: Fri Jan 13 23:20:09 2012 -0700
+
+ informaltable cleanup
+
+ On certain tables, add top and bottom borders to table
+ header and a bottom border to the table. This matches
+ what those tables in the old pdfs looked like.
+
+ the <?dbfo keep-together='always'> prevents tables from
+ splitting across pages. Useful for tiny tables.
+
+ Converting the colwidth to a floating point,
+ IE, 1* -> 1.0* cleans up these build errors:
+ WARNING: table-layout="fixed" and column-width unspecified
+ => falling back to proportional-column-width(1)
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit 5a7a2820665a495df32694d90b6f5192dd53547e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 20 20:12:54 2011 -0400
+
+ specs: refactor copyright license text for multi licening
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 233ed0eef7526ae02223359851be51e43240652b
+Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
+
+commit 9ecf07de57da54009c5bb4567655996f69ba8deb
+Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
+
+commit c8d4e3eddc07889f0bc493884f120e741226c28b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 08:51:02 2011 -0400
+
+ specs: use more appropriate docbook element to get "Edited by"
+
+ The proper element to use is <editor>.
+ The <contrib> was a hack to insert text and showed up in the wrong location
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1950143424ea47973613bc1dbec805e8a32aa97b
+Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
+
+commit d1011e878c92be804fe896f9adf2b686c01f2172
+Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
+
+commit cbba0d1e4665b585804b5de33c5ed1a4c3b19727
+Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
+
+commit b045d4c13967bd061f6a104136152e841bc432b5
+Author: Gaetan Nadon <memsize@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 dcc64434a3e79931b05fc807906189dfa3a9ddd0
+Author: Gaetan Nadon <memsize@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 <marcoz@osource.org>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit f5813bffb2b642d8b515306caff555eac32b9b43
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:12:58 2010 -0800
+
+ specs/record.xml: Pair copyright notices with matching license notices
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3011b8527ba7370e7e29758ecba0231e7e25bda8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:10:06 2010 -0800
+
+ specs/record.xml: Fix section titles/nesting
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2c1cabffad2903867fd352c19f0157d07adde232
+Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
+
commit 396cdde0242256976fbacec64839e48dfc56d639
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 23:20:43 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index dc73a0d..730a4a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-record (1.14.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:26:01 +0200
+
x11proto-record (1.14.1-2) unstable; urgency=low
* Mark x11proto-record-dev Multi-Arch: foreign
commit 32236c56b7015a98d845bb1836817328a307edce
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 22 20:46:36 2012 -0700
recordproto 1.14.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index c96a87e..e037f2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([RecordProto], [1.14.1],
+AC_INIT([RecordProto], [1.14.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 10028272314500dd2e17e5ae7efa0a2d4d118c13
Author: Matt Dew <marcoz@osource.org>
Date: Fri Jan 13 23:20:09 2012 -0700
informaltable cleanup
On certain tables, add top and bottom borders to table
header and a bottom border to the table. This matches
what those tables in the old pdfs looked like.
the <?dbfo keep-together='always'> prevents tables from
splitting across pages. Useful for tiny tables.
Converting the colwidth to a floating point,
IE, 1* -> 1.0* cleans up these build errors:
WARNING: table-layout="fixed" and column-width unspecified
=> falling back to proportional-column-width(1)
Signed-off-by: Matt Dew <marcoz@osource.org>
diff --git a/specs/record.xml b/specs/record.xml
index 8d7bd0a..842a5d6 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -461,27 +461,28 @@ type is a resource identifier for a server record context.
</para>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="4.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>RANGE8:</entry>
<entry>[first, last:</entry>
<entry>CARD8]</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>RANGE16:</entry>
<entry>[first, last:</entry>
<entry>CARD16]</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>EXTRANGE:</entry>
<entry>[major:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>minor:</entry>
<entry>RANGE16]</entry>
@@ -491,52 +492,53 @@ type is a resource identifier for a server record context.
</informaltable>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.5*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="4.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>RECORDRANGE:</entry>
<entry>[core-requests:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>core-replies:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>ext-requests:</entry>
<entry>EXTRANGE</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>ext-replies:</entry>
<entry>EXTRANGE</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>delivered-events:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>device-events:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>errors:</entry>
<entry>RANGE8</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>client-started:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>client-died:</entry>
<entry>BOOL]</entry>
@@ -692,22 +694,23 @@ this RECORDRANGE.
</itemizedlist>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="2.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>ELEMENT_HEADER:</entry>
<entry>[from-server-time:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>from-client-time:</entry>
<entry>BOOL</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>from-client-sequence:</entry>
<entry>BOOL]</entry>
@@ -844,17 +847,18 @@ It is an error to explicitly register the data connection.
</para>
<informaltable frame="none">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
- <colspec colname='c2' colsep="0" colwidth="1*"/>
- <colspec colname='c3' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.0*"/>
+ <colspec colname='c3' colwidth="3.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>CLIENT_INFO:</entry>
<entry>[client-resource:</entry>
<entry>CLIENTSPEC</entry>
</row>
- <row rowsep="0">
+ <row>
<entry></entry>
<entry>intercepted-protocol:</entry>
<entry>LISTofRECORDRANGE]</entry>
@@ -946,30 +950,31 @@ minor version thirteen (13).
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>ranges</emphasis>: LISTofRECORDRANGE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1064,30 +1069,31 @@ resources.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>ranges</emphasis>: LISTofRECORDRANGE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1190,20 +1196,21 @@ resources.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-specifiers</emphasis>: LISTofCLIENTSPEC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match ,</function>
@@ -1283,40 +1290,41 @@ A client is unregistered automatically when it disconnects.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
->
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>enabled</emphasis>: BOOL
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>intercepted-clients</emphasis>: LISTofCLIENT_INFO
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<function>RecordContext</function>
</entry>
@@ -1366,20 +1374,20 @@ error results.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
->+
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>category</emphasis>:
{<function>FromServer</function>, <function>FromClient</function>,
@@ -1389,37 +1397,37 @@ error results.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>element-header</emphasis>: ELEMENT_HEADER
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>client-swapped</emphasis>: BOOL
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>id-base</emphasis>: XIDBASE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>server-time</emphasis>: TIMESTAMP
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>recorded-sequence-number</emphasis>: CARD32
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>data</emphasis>: LISTofBYTE
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>Match</function>,
@@ -1600,15 +1608,16 @@ error results.
</para>
<informaltable frame="none">
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0" colwidth="1*"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry>
<emphasis remap='I'>context</emphasis>: RC
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>
Errors:
<function>RecordContext</function>
commit 5a7a2820665a495df32694d90b6f5192dd53547e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Sep 20 20:12:54 2011 -0400
specs: refactor copyright license text for multi licening
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/record.xml b/specs/record.xml
index 00a0d6b..8d7bd0a 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -22,29 +22,24 @@
<affiliation><orgname>X Consortium</orgname></affiliation>
</editor>
</authorgroup>
- <corpname>X Consortium Standard</corpname>
- <affiliation><orgname>X Consortium</orgname></affiliation>
- <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
+ <copyright><year>1994</year><holder>Network Computing Devices, Inc.</holder>
+ </copyright>
<legalnotice>
<para>
-Copyright © 1994 Network Computing Devices, Inc.
-</para>
-<para>
Permission to use, copy, modify, distribute, and sell this
documentation for any purpose is hereby granted without fee,
provided that the above copyright notice and this permission
notice appear in all copies. Network Computing Devices, Inc.
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.
+provided “as is” without express or implied warranty.
</para>
</legalnotice>
<legalnotice>
-<para>
-Copyright © 1994, 1995 X Consortium
-</para>
+<para role="multiLicensing">Copyright © 1994, 1995 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
@@ -61,7 +56,7 @@ in all copies or substantial portions of the Software.
</para>
<para>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+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
@@ -76,6 +71,7 @@ shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from the X Consortium.
</para>
+<para>X Window System is a trademark of The Open Group.</para>
</legalnotice>
</bookinfo>
commit 233ed0eef7526ae02223359851be51e43240652b
Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
diff --git a/specs/record.xml b/specs/record.xml
index ea88356..00a0d6b 100644
--- a/specs/record.xml
+++ b/specs/record.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 -->
@@ -21,7 +24,7 @@
</authorgroup>
<corpname>X Consortium Standard</corpname>
<affiliation><orgname>X Consortium</orgname></affiliation>
- <releaseinfo>X Version 11, Release 6.7</releaseinfo>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<legalnotice>
<para>
commit 9ecf07de57da54009c5bb4567655996f69ba8deb
Author: Gaetan Nadon <memsize@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 <memsize@videotron.ca>
diff --git a/specs/record.xml b/specs/record.xml
index c1d5d32..ea88356 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -21,7 +21,6 @@
</authorgroup>
<corpname>X Consortium Standard</corpname>
<affiliation><orgname>X Consortium</orgname></affiliation>
- <productnumber>Version 1.13</productnumber>
<releaseinfo>X Version 11, Release 6.7</releaseinfo>
<legalnotice>
commit c8d4e3eddc07889f0bc493884f120e741226c28b
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Sep 11 08:51:02 2011 -0400
specs: use more appropriate docbook element to get "Edited by"
The proper element to use is <editor>.
The <contrib> was a hack to insert text and showed up in the wrong location
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/record.xml b/specs/record.xml
index 89cfd72..c1d5d32 100644
--- a/specs/record.xml
+++ b/specs/record.xml
@@ -14,11 +14,10 @@
<firstname>Martha</firstname><surname>Zimet</surname>
<affiliation><orgname>Network Computing Devices, Inc.</orgname></affiliation>
</author>
- <othercredit>
- <contrib>edited by</contrib>
+ <editor>
<firstname>Stephen</firstname><surname>Gildea</surname>
<affiliation><orgname>X Consortium</orgname></affiliation>
- </othercredit>
+ </editor>
</authorgroup>
<corpname>X Consortium Standard</corpname>
<affiliation><orgname>X Consortium</orgname></affiliation>
commit 1950143424ea47973613bc1dbec805e8a32aa97b
Author: Gaetan Nadon <memsize@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
Reply to: