ChangeLog | 93 +++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 2 -
configure.ac | 4 +-
debian/changelog | 6 +++
defs.ent | 22 +++++------
xorg-sgml-doctools.pc.in | 7 ++-
xorg.css | 16 +++++++-
xorg.xsl | 3 +
8 files changed, 135 insertions(+), 18 deletions(-)
New commits:
commit ccfa33e73abf1c15555469426e9dd826c2c4c559
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Nov 12 14:14:08 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index fbbfea3..56675d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xorg-sgml-doctools (1:1.5.99.901-1) UNRELEASED; urgency=low
+xorg-sgml-doctools (1:1.5.99.901-1) unstable; urgency=low
* New upstream release candidate.
- -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 14:11:58 +0100
+ -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 14:13:18 +0100
xorg-sgml-doctools (1:1.5-1) unstable; urgency=low
commit 2627773b94900e5f08adf71589bbb26e5094823a
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Nov 12 14:12:23 2010 +0100
Update changelogs.
diff --git a/ChangeLog b/ChangeLog
index 9993881..62b6e27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,96 @@
+commit e4638539f045f1095b25d3a68dc4256493852b9c
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Thu Nov 11 16:48:36 2010 -0800
+
+ 1.5.99.901 (1.6 RC 1) snapshot for X11R7.6 RC1 docs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit d0cec99095e0cdf01ff2695b1cc471214f2294ee
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Sun Nov 7 19:48:37 2010 -0500
+
+ Upgrade xorg-sgml-doctools to Autoconf 2.60 directory architecture
+
+ Currently the value of sgmlrootdir is hard coded relative to $prefix.
+ In Autoconf 2.60, $datarootdir has been added to define the architecture
+ independent data directory.
+
+ --datarootdir=DIR read-only arch.-independent data root
[PREFIX/share]
+
+ Relative to that location, a number of subdirectories have been defined:
+
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root
+ [DATAROOTDIR/doc/xorg-sgml-doctools]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
+
+ The sgmlrootdir should hang off datarootdir. If there is a need to specify
+ a different location, a new configure option should be added:
+
+ --sgmldir=DIR sgml stylesheets and entities [DATAROOTDIR/sgml]
+
+ An sgmlrootdir Automake variable is defined in configure.ac to provide
+ a unique value holder for the sgmlrootdir.
+
+ Variable PACKAGE_VERSION is preferred over the undocumented VERSION
variable.
+
+ Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
+
+commit 45ee22dd4a64d4a07d6f67d5bdb80d4f2394e222
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sat Nov 6 13:29:16 2010 -0700
+
+ xorg.css: center <othercredit> as well
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 0ccec393a557df0469794483f68eec0276a1faed
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Tue Nov 2 21:26:19 2010 -0700
+
+ defs.ent: Remove CDATA declarations from entities for xml compatibility
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit aafcb82452d58fafc3bd0ac013355c269ac9f7ee
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Sun Oct 31 16:20:11 2010 -0700
+
+ Update defs.ent for X11R7.6 RC1
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit e89183b682bd81a974f48f8f9177674020996562
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Oct 8 17:33:41 2010 -0700
+
+ xorg.xsl: make index links point to the indexterm location
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 251ae8ac450171ba9b868c9173e6cc0b50a569bc
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri Oct 8 17:33:04 2010 -0700
+
+ xorg.css: center more bits of title pages
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
+commit 3286e44b95a8de6c563fc136c71b5defd6ae530c
+Author: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Mon Jun 28 00:00:42 2010 -0700
+
+ Add style rules for <screen> output sections to xorg.css
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+
commit 54baef2c1d4dd6a99282530219f47bb4de0c6841
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Wed Jun 23 11:29:48 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 274ed0a..fbbfea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-sgml-doctools (1:1.5.99.901-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate.
+
+ -- Cyril Brulebois <k...@debian.org> Fri, 12 Nov 2010 14:11:58 +0100
+
xorg-sgml-doctools (1:1.5-1) unstable; urgency=low
[ Julien Cristau ]
commit e4638539f045f1095b25d3a68dc4256493852b9c
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu Nov 11 16:48:36 2010 -0800
1.5.99.901 (1.6 RC 1) snapshot for X11R7.6 RC1 docs
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index 9a05526..8c5e347 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
AC_INIT(xorg-sgml-doctools,
- [1.5],
+ [1.5.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xorg-sgml-doctools)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit d0cec99095e0cdf01ff2695b1cc471214f2294ee
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Nov 7 19:48:37 2010 -0500
Upgrade xorg-sgml-doctools to Autoconf 2.60 directory architecture
Currently the value of sgmlrootdir is hard coded relative to $prefix.
In Autoconf 2.60, $datarootdir has been added to define the architecture
independent data directory.
--datarootdir=DIR read-only arch.-independent data root
[PREFIX/share]
Relative to that location, a number of subdirectories have been defined:
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root
[DATAROOTDIR/doc/xorg-sgml-doctools]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
--psdir=DIR ps documentation [DOCDIR]
The sgmlrootdir should hang off datarootdir. If there is a need to specify
a different location, a new configure option should be added:
--sgmldir=DIR sgml stylesheets and entities [DATAROOTDIR/sgml]
An sgmlrootdir Automake variable is defined in configure.ac to provide
a unique value holder for the sgmlrootdir.
Variable PACKAGE_VERSION is preferred over the undocumented VERSION
variable.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 049abac..e3fcca5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
-sgmldir = $(prefix)/share/sgml/X11
+sgmldir = $(sgmlrootdir)/X11
dist_sgml_DATA = defs.ent xorg.css xorg.xsl
diff --git a/configure.ac b/configure.ac
index 6ca9198..9a05526 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,8 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
+AC_SUBST([sgmlrootdir],['${datarootdir}/sgml'])
+
AC_PROG_INSTALL
AC_OUTPUT([
diff --git a/xorg-sgml-doctools.pc.in b/xorg-sgml-doctools.pc.in
index ae1422a..9546fa7 100644
--- a/xorg-sgml-doctools.pc.in
+++ b/xorg-sgml-doctools.pc.in
@@ -1,6 +1,7 @@
pref...@prefix@
-sgmlrootdir=${prefix}/share/sgml
+datarootd...@datarootdir@
+sgmlrootd...@sgmlrootdir@
Name: xorg-sgml-doctools
-Description: SGML entities for X.Org documentation
-Version: @VERSION@
+Description: Stylesheets and entities for X.Org documentation
+Version: @PACKAGE_VERSION@
commit 45ee22dd4a64d4a07d6f67d5bdb80d4f2394e222
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Nov 6 13:29:16 2010 -0700
xorg.css: center <othercredit> as well
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/xorg.css b/xorg.css
index 9da859b..f779666 100644
--- a/xorg.css
+++ b/xorg.css
@@ -74,7 +74,8 @@ td {
padding-left: 0.5em;
}
-h1, .author, .pubdate, .abstract, .subtitle, .releaseinfo, .authorgroup {
+h1, .author, .pubdate, .abstract, .subtitle, .releaseinfo, .authorgroup,
+.othercredit {
text-align: center;
}
commit 0ccec393a557df0469794483f68eec0276a1faed
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Tue Nov 2 21:26:19 2010 -0700
defs.ent: Remove CDATA declarations from entities for xml compatibility
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/defs.ent b/defs.ent
index eb59068..864a5bf 100644
--- a/defs.ent
+++ b/defs.ent
@@ -3,18 +3,18 @@
<!-- X Window System katamari version string -->
<!-- since we don't do micro (7.x.y) releases of the katamari, *relvers
are now the same as *fullrelvers -->
-<!ENTITY majorvers CDATA "7">
-<!ENTITY reldate CDATA "November 2010">
-<!ENTITY relvers CDATA "7.6">
-<!ENTITY fullrelvers CDATA "7.6">
-<!ENTITY prevrelvers CDATA "7.5">
-<!ENTITY prevfullrelvers CDATA "7.5">
-<!ENTITY nextrelvers CDATA "7.7">
-<!ENTITY nextfullrelvers CDATA "7.7">
-<!ENTITY nextfullreldate CDATA "2011">
+<!ENTITY majorvers "7">
+<!ENTITY reldate "November 2010">
+<!ENTITY relvers "7.6">
+<!ENTITY fullrelvers "7.6">
+<!ENTITY prevrelvers "7.5">
+<!ENTITY prevfullrelvers "7.5">
+<!ENTITY nextrelvers "7.7">
+<!ENTITY nextfullrelvers "7.7">
+<!ENTITY nextfullreldate "2011">
-<!ENTITY whichfullrel CDATA "seventh">
-<!ENTITY rcnum CDATA "1">
+<!ENTITY whichfullrel "seventh">
+<!ENTITY rcnum "1">
<!-- These should be set according to which snapshot/release this is -->
<!ENTITY % firstsnap 'IGNORE'>
commit aafcb82452d58fafc3bd0ac013355c269ac9f7ee
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sun Oct 31 16:20:11 2010 -0700
Update defs.ent for X11R7.6 RC1
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/defs.ent b/defs.ent
index aa1c096..eb59068 100644
--- a/defs.ent
+++ b/defs.ent
@@ -4,17 +4,17 @@
<!-- since we don't do micro (7.x.y) releases of the katamari, *relvers
are now the same as *fullrelvers -->
<!ENTITY majorvers CDATA "7">
-<!ENTITY reldate CDATA "October 2009">
-<!ENTITY relvers CDATA "7.5">
-<!ENTITY fullrelvers CDATA "7.5">
-<!ENTITY prevrelvers CDATA "7.4">
-<!ENTITY prevfullrelvers CDATA "7.4">
-<!ENTITY nextrelvers CDATA "7.6">
-<!ENTITY nextfullrelvers CDATA "7.6">
-<!ENTITY nextfullreldate CDATA "2010">
+<!ENTITY reldate CDATA "November 2010">
+<!ENTITY relvers CDATA "7.6">
+<!ENTITY fullrelvers CDATA "7.6">
+<!ENTITY prevrelvers CDATA "7.5">
+<!ENTITY prevfullrelvers CDATA "7.5">
+<!ENTITY nextrelvers CDATA "7.7">
+<!ENTITY nextfullrelvers CDATA "7.7">
+<!ENTITY nextfullreldate CDATA "2011">
-<!ENTITY whichfullrel CDATA "sixth">
-<!ENTITY rcnum CDATA "0">
+<!ENTITY whichfullrel CDATA "seventh">
+<!ENTITY rcnum CDATA "1">
<!-- These should be set according to which snapshot/release this is -->
<!ENTITY % firstsnap 'IGNORE'>
commit e89183b682bd81a974f48f8f9177674020996562
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Oct 8 17:33:41 2010 -0700
xorg.xsl: make index links point to the indexterm location
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/xorg.xsl b/xorg.xsl
index eaa05dc..0adcdf1 100644
--- a/xorg.xsl
+++ b/xorg.xsl
@@ -37,4 +37,7 @@ DEALINGS IN THE SOFTWARE.
<xsl:param name="abstract.notitle.enabled" select="1"/>
<xsl:param name="variablelist.as.table" select="1"/>
<xsl:param name="use.svg" select="1"/>
+
+ <!-- Index links should point to indexterm location, not start of section -->
+ <xsl:param name="index.links.to.section" select="0"/>
</xsl:stylesheet>
commit 251ae8ac450171ba9b868c9173e6cc0b50a569bc
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Fri Oct 8 17:33:04 2010 -0700
xorg.css: center more bits of title pages
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/xorg.css b/xorg.css
index 8da74f0..9da859b 100644
--- a/xorg.css
+++ b/xorg.css
@@ -74,7 +74,7 @@ td {
padding-left: 0.5em;
}
-h1, .author, .pubdate, .abstract {
+h1, .author, .pubdate, .abstract, .subtitle, .releaseinfo, .authorgroup {
text-align: center;
}
commit 3286e44b95a8de6c563fc136c71b5defd6ae530c
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Mon Jun 28 00:00:42 2010 -0700
Add style rules for <screen> output sections to xorg.css
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/xorg.css b/xorg.css
index ea70099..8da74f0 100644
--- a/xorg.css
+++ b/xorg.css
@@ -34,7 +34,7 @@ div.sect1 {
}
.structname, .property, .errorname, .function, .parameter, .filename,
-.type, .symbol, .funcsynopsis, .synopsis {
+.type, .symbol, .funcsynopsis, .synopsis, .screen {
font-family: monospace;
}
@@ -51,6 +51,17 @@ div.sect1 {
padding-top: 0.5em;
}
+.screen {
+ background: #e0ffff;
+ margin: 0 1.0em;
+ padding: 0.5em;
+ border: 1px solid #B0C4DE;
+ -moz-border-radius: 1.0em;
+ -webkit-border-radius: 1.0em;
+ -khtml-border-radius: 1.0em;
+ border-radius: 1.0em;
+}
+
.funcsynopsis p, table p, .synopsis p, .figure p {
margin: 0;
}
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pgtvm-0003ze...@alioth.debian.org
