x11proto-scrnsaver: Changes to 'debian-unstable'
ChangeLog | 194 ++++++++++++++++++++++++++++++++++
configure.ac | 13 +-
debian/changelog | 12 ++
debian/control | 6 -
debian/rules | 7 -
debian/x11proto-scrnsaver-dev.install | 6 -
docbook.am | 105 ++++++++++++++++++
specs/.gitignore | 3
specs/Makefile.am | 63 +----------
specs/saver.xml | 162 ++++++++++++++--------------
10 files changed, 419 insertions(+), 152 deletions(-)
New commits:
commit a9f4818af16ad63301bf22e823a67c14e689c233
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:57:59 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 026d5a7..214b2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-scrnsaver (1.2.2-1) UNRELEASED; urgency=low
+x11proto-scrnsaver (1.2.2-1) unstable; urgency=low
* New upstream release.
* Install scrnsaverproto.pc to /usr/share/pkgconfig.
@@ -8,7 +8,7 @@ x11proto-scrnsaver (1.2.2-1) UNRELEASED; urgency=low
* Bump build-deps on xutils-dev, xmlto and xorg-sgml-doctools per
configure.ac.
- -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:51:27 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:57:57 +0200
x11proto-scrnsaver (1.2.1-2) unstable; urgency=low
commit a81c5327526e782a44bb8b1f8b724e3586e88568
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:57:54 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 03a6ed7..026d5a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ x11proto-scrnsaver (1.2.2-1) UNRELEASED; urgency=low
* Pass --docdir directly to configure.ac, adjust doc install for new
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:51:27 +0200
diff --git a/debian/control b/debian/control
index 1865700..02092c1 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-scrnsaver
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-scrnsaver.git
commit 7855c46db9ce3d7100417d9230ec51d1d1329393
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:56:20 2012 +0200
Don't require (fake)root for debian/rules clean.
diff --git a/debian/changelog b/debian/changelog
index c90e217..03a6ed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11proto-scrnsaver (1.2.2-1) UNRELEASED; urgency=low
* Install scrnsaverproto.pc to /usr/share/pkgconfig.
* Pass --docdir directly to configure.ac, adjust doc install for new
release.
+ * Don't require (fake)root for debian/rules clean.
-- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:51:27 +0200
diff --git a/debian/rules b/debian/rules
index 04ab34c..e3b8a0c 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 6feb7c97b2614d2f3bf079986bf5a8ca042a5883
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:54:16 2012 +0200
Pass --docdir directly to configure.ac, adjust doc install for new release.
diff --git a/debian/changelog b/debian/changelog
index 822d4d9..c90e217 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ x11proto-scrnsaver (1.2.2-1) UNRELEASED; urgency=low
* New upstream release.
* Install scrnsaverproto.pc to /usr/share/pkgconfig.
+ * Pass --docdir directly to configure.ac, adjust doc install for new
+ release.
-- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:51:27 +0200
diff --git a/debian/rules b/debian/rules
index 312b61a..04ab34c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,6 +39,7 @@ build-stamp:
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
+ --docdir=\$${datadir}/doc/$(PACKAGE) \
--infodir=\$${prefix}/share/info --with-xmlto --without-fop \
$(confflags) CFLAGS="$(CFLAGS)"
cd build && $(MAKE)
@@ -75,7 +76,8 @@ binary-indep: build install
dh_installdocs
dh_installman
- find debian/tmp/usr/share/doc/scrnsaverproto -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-scrnsaver-dev.install b/debian/x11proto-scrnsaver-dev.install
index d639877..282466a 100644
--- a/debian/x11proto-scrnsaver-dev.install
+++ b/debian/x11proto-scrnsaver-dev.install
@@ -1,5 +1,3 @@
usr/include/X11/extensions/*
usr/lib/pkgconfig/scrnsaverproto.pc usr/share/pkgconfig
-usr/share/doc/scrnsaverproto/*.html usr/share/doc/x11proto-scrnsaver-dev/
-usr/share/doc/scrnsaverproto/*.css usr/share/doc/x11proto-scrnsaver-dev/
-usr/share/doc/scrnsaverproto/*.txt usr/share/doc/x11proto-scrnsaver-dev/
+usr/share/doc/x11proto-scrnsaver-dev/
commit 2824dde417e50e87bc6733696e3ff07ad063f0c4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:52:35 2012 +0200
Install scrnsaverproto.pc to /usr/share/pkgconfig.
diff --git a/debian/changelog b/debian/changelog
index c76c9c8..822d4d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-scrnsaver (1.2.2-1) UNRELEASED; urgency=low
* New upstream release.
+ * Install scrnsaverproto.pc to /usr/share/pkgconfig.
-- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:51:27 +0200
diff --git a/debian/x11proto-scrnsaver-dev.install b/debian/x11proto-scrnsaver-dev.install
index d11eaf1..d639877 100644
--- a/debian/x11proto-scrnsaver-dev.install
+++ b/debian/x11proto-scrnsaver-dev.install
@@ -1,5 +1,5 @@
usr/include/X11/extensions/*
-usr/lib/pkgconfig/scrnsaverproto.pc
+usr/lib/pkgconfig/scrnsaverproto.pc usr/share/pkgconfig
usr/share/doc/scrnsaverproto/*.html usr/share/doc/x11proto-scrnsaver-dev/
usr/share/doc/scrnsaverproto/*.css usr/share/doc/x11proto-scrnsaver-dev/
usr/share/doc/scrnsaverproto/*.txt usr/share/doc/x11proto-scrnsaver-dev/
commit de8b67d35b891de9da6a55f5c1ed2f68481f3c4e
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 15 17:52:00 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index d77c417..5b3a31a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,197 @@
+commit c33f4368e85d976b112dda4a34ca254944cb354d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Mar 22 20:49:20 2012 -0700
+
+ scrnsaverproto 1.2.2
+
+commit 27cf3d03cdd502c1228e59ba560eab77d8393405
+Author: Matt Dew <marcoz@osource.org>
+Date: Sat Jan 14 22:21:00 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 ffbc319b69b1e3502a9b14195e7fa94f2beee3b6
+Author: Matt Dew <marcoz@osource.org>
+Date: Sat Sep 24 20:07:44 2011 -0600
+
+ Fix id attributes, linkend and olinks
+
+ #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 if external, xref if internal.
+
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4aa72b32c7707bd78fc8dd8e287e3030eeb85d05
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 20 20:17:40 2011 -0400
+
+ specs: fix markup for single license dual holder
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d9c42cb0ba35e1c5e5a36a8cbde81eb311350931
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 12 11:04:11 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 378e4e73352a6bc11589460fdb4e6ceead2e82dc
+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 feaac4aaccb25d79d29a6020e75fca5a9938bf8a
+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 25764e51ecdea56df02063ae3b9d625d41a1209d
+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 e80d85902dcd19edd9bdb5f574ca47d0811ac0aa
+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 8f407c9417ffe2c1e01b37e18c71469d2baee970
+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 2408165cb190a10e2d899bdc259866cbf7a8e125
+Author: Matt Dew <marcoz@osource.org>
+Date: Wed May 25 22:04:10 2011 -0600
+
+ add id attributes to funcsynopsis to allow other docs to olink to them.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 2cd4a9898644dde49a876eeb53037149c85a37f0
+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 9d7dc8242feae5690e7aef48a386555c04183e9f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:16:54 2010 -0800
+
+ specs: change othercredit tags to author tags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d50038590f72f02bc95712d8a4c37654f6d05a64
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Dec 16 23:15:19 2010 -0800
+
+ spec: Fix section titles/nesting
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f85ed94ac012675dff25afbd3161dbbd3f62882b
+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 b4899c5d6090efdf292f5686cc23ed90e3729e4b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 23:27:16 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 7523006..c76c9c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-scrnsaver (1.2.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 15 Apr 2012 17:51:27 +0200
+
x11proto-scrnsaver (1.2.1-2) unstable; urgency=low
* Mark x11proto-scrnsaver-dev Multi-Arch: foreign
commit c33f4368e85d976b112dda4a34ca254944cb354d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 22 20:49:20 2012 -0700
scrnsaverproto 1.2.2
diff --git a/configure.ac b/configure.ac
index f89bd7d..6a70989 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([ScrnSaverProto], [1.2.1],
+AC_INIT([ScrnSaverProto], [1.2.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 27cf3d03cdd502c1228e59ba560eab77d8393405
Author: Matt Dew <marcoz@osource.org>
Date: Sat Jan 14 22:21:00 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/saver.xml b/specs/saver.xml
index 5283290..2374218 100644
--- a/specs/saver.xml
+++ b/specs/saver.xml
@@ -149,18 +149,19 @@ In adition to the comon types described in the core protocol, the following
type is used in the request and event definitions in subsequent sections.
</para>
-<informaltable frame="none">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+<informaltable frame="topbot">
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="1.5*"/>
<thead>
- <row>
+ <row rowsep='1'>
<entry>Name</entry>
<entry>Value</entry>
</row>
</thead>
<tbody>
- <row rowsep="0">
+ <row>
<entry>SCREENSAVEREVENT</entry>
<entry><emphasis role="bold">ScreenSaverNotify</emphasis>,
<emphasis role="bold">ScreenSaverCycle</emphasis></entry>
@@ -236,11 +237,12 @@ active and how the <emphasis remap='I'>til-or-since</emphasis> value should be i
</para>
<informaltable frame="none">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="5.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Off</emphasis></entry>
<entry>
The screen is not currently being saved;
@@ -249,7 +251,7 @@ specifies the number of milliseconds until the screen saver is expected to
activate.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">On</emphasis></entry>
<entry>
The screen is currently being saved;
@@ -257,7 +259,7 @@ The screen is currently being saved;
the number of milliseconds since the screen saver activated.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Disabled</emphasis></entry>
<entry>
The screen saver is currently disabled;
@@ -274,21 +276,22 @@ used or would have been were the screen being saved:
</para>
<informaltable frame="none">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="5.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Blanked</emphasis></entry>
<entry>The video signal to the display monitor was disabled.</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Internal</emphasis></entry>
<entry>A server-dependent, built-in screen saver image was displayed; either no
client had set the screen saver window attributes or a different client
had the server grabbed when the screen saver activated.</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">External</emphasis></entry>
<entry>The screen saver window was mapped with attributes set by a
client using the <function>ScreenSaverSetAttributes</function> request.</entry>
@@ -332,18 +335,19 @@ Otherwise, any combination of the following bits may be set:
</para>
<informaltable frame="none">
- <tgroup cols='2' align='center'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="3.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">ScreenSaverNotify</emphasis></entry>
<entry>
If this bit is set, <emphasis role="bold">ScreenSaverNotify</emphasis> events are generated whenever
the screen saver is activated or deactivated.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">ScreenSaverCycle</emphasis></entry>
<entry>
If this bit is set, <emphasis role="bold">ScreenSaverNotify</emphasis> events are generated whenever
@@ -504,25 +508,26 @@ The <emphasis remap='I'>state</emphasis> field specifies the cause of the event:
</para>
<informaltable frame="none">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth="1.0*"/>
+ <colspec colname='c2' colwidth="5.0*"/>
<tbody>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Off</emphasis></entry>
<entry>
The screen saver deactivated; this event is sent if the client has set the
ScreenSaverNotify bit in its event mask.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">On</emphasis></entry>
<entry>
The screen saver activated. This event is sent if the client has set the
ScreenSaverNotify bit in its event mask.
</entry>
</row>
- <row rowsep="0">
+ <row>
<entry><emphasis role="bold">Cycle</emphasis></entry>
<entry>
The cycle interval passed and the client is expected to change the image on
commit ffbc319b69b1e3502a9b14195e7fa94f2beee3b6
Author: Matt Dew <marcoz@osource.org>
Date: Sat Sep 24 20:07:44 2011 -0600
Fix id attributes, linkend and olinks
#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 if external, xref if internal.
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/saver.xml b/specs/saver.xml
index 0fcd83f..5283290 100644
--- a/specs/saver.xml
+++ b/specs/saver.xml
@@ -45,7 +45,7 @@ implied warranty.
</legalnotice>
</bookinfo>
-<chapter id="Introduction_">
+<chapter id='Introduction'>
<title>Introduction</title>
<para>
The X Window System provides support for changing the image on a display screen
@@ -470,7 +470,7 @@ window attributes.
</para>
</sect1>
-<sect1 id="Events_">
+<sect1 id="Events">
<title>Events</title>
<para>
The Screen Saver extension adds one event:
@@ -655,7 +655,7 @@ SETofSCREENSAVEREVENT
</literallayout>
</sect1>
-<sect1 id="Events">
+<sect1 id="Events_2">
<title>Events</title>
<literallayout class="monospaced">
@@ -679,7 +679,7 @@ SETofSCREENSAVEREVENT
</sect1>
</chapter>
-<chapter id="Inter_Client_Communications_Conventions_">
+<chapter id='Inter_Client_Communications_Conventions'>
<title>Inter-Client Communications Conventions</title>
<para>
Screen saver clients should create at least one resource value whose
@@ -711,7 +711,7 @@ The include file for this extension is
</para>
-<funcsynopsis id='xscreensaverqueryextension'>
+<funcsynopsis id='XScreenSaverQueryExtension'>
<funcprototype>
<funcdef>Bool <function>XScreenSaverQueryExtension</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -734,7 +734,7 @@ no additional errors are defined by this extension, the results
of <emphasis remap='I'>error_base</emphasis> are not defined.
</para>
-<funcsynopsis id='xscreensaverqueryversion'>
+<funcsynopsis id='XScreenSaverQueryVersion'>
<funcprototype>
<funcdef>Status <function>XScreenSaverQueryVersion</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -759,14 +759,14 @@ set and 0 is returned.
<para>
This routine allocates and returns an
<emphasis role="bold">XScreenSaverInfo</emphasis> structure
-for use in calls to <function>XScreenSaverQueryInfo</function>.
+for use in calls to <xref linkend='XScreenSaverQueryInfo' xrefstyle='select: title'/>.
All fields in the
structure are initialized to zero. If insufficient memory is available,
NULL is returned. The results of this routine can be released
-using <emphasis remap='I'>XFree</emphasis>.
+using <olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink>.
</para>
-<funcsynopsis id='xscreensaverqueryinfo'>
+<funcsynopsis id='XScreenSaverQueryInfo'>
<funcprototype>
<funcdef>Status <function>XScreenSaverQueryInfo</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -801,7 +801,7 @@ description of the fields. If the extension is not supported,
is returned.
</para>
-<funcsynopsis id='xscreensaverselectinput'>
+<funcsynopsis id='XScreenSaverSelectInput'>
<funcprototype>
<funcdef>void <function>XScreenSaverSelectInput</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -838,7 +838,7 @@ See the definition of the
of the allowed event masks. <!-- xref ? -->
</para>
-<funcsynopsis id='xscreensaversetattributes'>
+<funcsynopsis id='XScreenSaverSetAttributes'>
<funcprototype>
<funcdef>void <function>XScreenSaverSetAttributes</function></funcdef>
<paramdef>Display <parameter>*dpy</parameter></paramdef>
@@ -864,7 +864,7 @@ of the <function>ScreenSaverSetAttributes</function> request for a
description of each of the arguments.
</para>
-<funcsynopsis id='xscreensaverunsetattributes'>
+<funcsynopsis id='XScreenSaverUnsetAttributes'>
<funcprototype>
<funcdef>void <function>XScreenSaverUnsetAttributes</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -878,7 +878,7 @@ extension, this routine instructs the server to discard
any previous screen saver window attributes set by this client.
</para>
-<funcsynopsis id='xscreensaverregister'>
+<funcsynopsis id='XScreenSaverRegister'>
<funcprototype>
<funcdef>Status <function>XScreenSaverRegister</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -897,7 +897,7 @@ is encountered and the property is not changed, otherwise it returns
non-zero.
</para>
-<funcsynopsis id='xscreensaverunregister'>
+<funcsynopsis id='XScreenSaverUnregister'>
<funcprototype>
<funcdef>Status <function>XScreenSaverUnregister</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -912,7 +912,7 @@ It returns zero if an error is encountered and the property is changed,
otherwise it returns non-zero.
</para>
-<funcsynopsis id='xscreensavergetregistered'>
+<funcsynopsis id='XScreenSaverGetRegistered'>
<funcprototype>
<funcdef>Status <function>XScreenSaverGetRegistered</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
commit 4aa72b32c7707bd78fc8dd8e287e3030eeb85d05
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Sep 20 20:17:40 2011 -0400
specs: fix markup for single license dual holder
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/saver.xml b/specs/saver.xml
index 9d81ed9..0fcd83f 100644
--- a/specs/saver.xml
+++ b/specs/saver.xml
@@ -25,7 +25,10 @@ X Consortium, Laboratory for Computer Science, Massachusetts Institute of Techno
</author>
</authorgroup>
- <copyright><year>1992</year><holder>Massachusetts Institute of Technology and Network Computing Devices, Inc</holder></copyright>
+ <copyright><year>1992</year>
+ <holder>Massachusetts Institute of Technology</holder>
+ <holder>Network Computing Devices, Inc</holder>
+ </copyright>
<legalnotice>
commit d9c42cb0ba35e1c5e5a36a8cbde81eb311350931
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 12 11:04:11 2011 -0400
docs: use the &fullrelvers; entity to set X11 release information
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/saver.xml b/specs/saver.xml
index 0c83a4b..9d81ed9 100644
--- a/specs/saver.xml
+++ b/specs/saver.xml
@@ -1,12 +1,16 @@
<?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;
+]>
<book id="saver">
<bookinfo>
<title>X11 Screen Saver Extension</title>
<subtitle>MIT X Consortium Proposed Standard</subtitle>
+ <releaseinfo>X Version 11, Release &fullrelvers;</releaseinfo>
<releaseinfo>Version 1.0</releaseinfo>
<authorgroup>
<author>
commit 378e4e73352a6bc11589460fdb4e6ceead2e82dc
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/saver.xml b/specs/saver.xml
index b1e6f95..0c83a4b 100644
--- a/specs/saver.xml
+++ b/specs/saver.xml
@@ -23,7 +23,6 @@ X Consortium, Laboratory for Computer Science, Massachusetts Institute of Techno
<copyright><year>1992</year><holder>Massachusetts Institute of Technology and Network Computing Devices, Inc</holder></copyright>
- <productnumber>X Version 11, Release 5</productnumber>
<legalnotice>
<para>
commit feaac4aaccb25d79d29a6020e75fca5a9938bf8a
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>
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 25764e51ecdea56df02063ae3b9d625d41a1209d
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>
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)"
Reply to: