libx11: Changes to 'debian-unstable'
ChangeLog | 50 ++++++++++++++++++++
configure.ac | 13 ++---
debian/changelog | 10 ++++
debian/control | 4 -
docbook.am | 95 +++++++++++++++++++++++++++++++++++++++
specs/.gitignore | 1
specs/XIM/Makefile.am | 39 ++++------------
specs/XKB/Makefile.am | 39 ++++------------
specs/i18n/framework/Makefile.am | 38 ++++-----------
specs/i18n/localedb/Makefile.am | 35 +++-----------
specs/i18n/trans/Makefile.am | 35 +++-----------
specs/libX11/Makefile.am | 80 +++++++++++++-------------------
src/KeyBind.c | 1
13 files changed, 253 insertions(+), 187 deletions(-)
New commits:
commit 692458b5035b24a1c22ecce1722e75745632ca11
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 5 23:42:14 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 1deda5c..8415cb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libx11 (2:1.4.3-1) UNRELEASED; urgency=low
+libx11 (2:1.4.3-1) unstable; urgency=low
* New upstream release:
- Add Sinhala support.
@@ -6,7 +6,7 @@ libx11 (2:1.4.3-1) UNRELEASED; urgency=low
* Bump x11proto-core-dev build-dep to make defining XK_SINHALA useful.
* Bump xutils-dev build-dep for newer macros.
- -- Cyril Brulebois <kibi@debian.org> Tue, 05 Apr 2011 23:37:51 +0200
+ -- Cyril Brulebois <kibi@debian.org> Tue, 05 Apr 2011 23:42:05 +0200
libx11 (2:1.4.2-1) unstable; urgency=low
commit 965d5626ccb2659995890b735e8636672e989c23
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 5 23:42:03 2011 +0200
Bump xutils-dev build-dep for newer macros.
diff --git a/debian/changelog b/debian/changelog
index fd6ccfb..1deda5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libx11 (2:1.4.3-1) UNRELEASED; urgency=low
- Add Sinhala support.
- Add Docbook external references support.
* Bump x11proto-core-dev build-dep to make defining XK_SINHALA useful.
+ * Bump xutils-dev build-dep for newer macros.
-- Cyril Brulebois <kibi@debian.org> Tue, 05 Apr 2011 23:37:51 +0200
diff --git a/debian/control b/debian/control
index 039de57..99e968a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends:
quilt,
automake,
libtool,
- xutils-dev (>= 1:7.5+5),
+ xutils-dev (>= 1:7.6+2),
# specs
xmlto,
xorg-sgml-doctools (>= 1:1.5),
commit 4806e67721c21c557fbe0a1e906e2b1a1247f8f9
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 5 23:40:59 2011 +0200
Bump x11proto-core-dev build-dep to make defining XK_SINHALA useful.
diff --git a/debian/changelog b/debian/changelog
index 8eef6fd..fd6ccfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libx11 (2:1.4.3-1) UNRELEASED; urgency=low
* New upstream release:
- Add Sinhala support.
- Add Docbook external references support.
+ * Bump x11proto-core-dev build-dep to make defining XK_SINHALA useful.
-- Cyril Brulebois <kibi@debian.org> Tue, 05 Apr 2011 23:37:51 +0200
diff --git a/debian/control b/debian/control
index a657c3d..039de57 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dpkg-dev (>= 1.15.3),
pkg-config,
xtrans-dev,
- x11proto-core-dev (>= 7.0.13),
+ x11proto-core-dev (>= 7.0.21),
x11proto-kb-dev,
x11proto-input-dev,
x11proto-xext-dev,
commit 2d43cdf71339463a86e0a76f985242b8f9594ad8
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Apr 5 23:38:40 2011 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 27a7160..250c7a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,53 @@
+commit a0ad0d5c99023bb9a8ce3944dbc3267f5265721e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Apr 5 13:29:04 2011 -0700
+
+ libX11 1.4.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e8c76407d2f6e3b11babdb84426e43e780c859c3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Feb 25 09:23:54 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 25eb76b3d2726f2f1de759901971ae53b2539dc4
+Author: Harshula Jayasuriya <harshula@gmail.com>
+Date: Mon Mar 21 14:49:37 2011 +0000
+
+ Add #define XK_SINHALA
+
+ Add #define XK_SINHALA so that the Sinhala keysyms can be used by
+ the lk xkb keymap.
+
+ Signed-off-by: Harshula Jayasuriya <harshula@gmail.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
commit db8b20b789112717ac0590b40f0b4dc2171797d0
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu Mar 17 16:15:00 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index 9413556..8eef6fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libx11 (2:1.4.3-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Add Sinhala support.
+ - Add Docbook external references support.
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 05 Apr 2011 23:37:51 +0200
+
libx11 (2:1.4.2-1) unstable; urgency=low
[ Timo Aaltonen ]
commit a0ad0d5c99023bb9a8ce3944dbc3267f5265721e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Apr 5 13:29:04 2011 -0700
libX11 1.4.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index f7e81f1..ce86c93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.4.2],
+AC_INIT([libX11], [1.4.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
commit e8c76407d2f6e3b11babdb84426e43e780c859c3
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Feb 25 09:23:54 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>
diff --git a/configure.ac b/configure.ac
index aa39b38..f7e81f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,15 +20,16 @@ AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
-# Require xorg-macros minimum of 1.11 for disabling fop by default
+# Require xorg-macros minimum of 1.12 for DocBook external references
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.11 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.11)
+ [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.12)
XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_XMLTO(0.0.22)
XORG_WITH_FOP([no])
-XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_WITH_XSLTPROC
+XORG_CHECK_SGML_DOCTOOLS(1.7)
XORG_PROG_RAWCPP
# Required when PKG_CHECK_MODULES called within an if statement
diff --git a/docbook.am b/docbook.am
new file mode 100644
index 0000000..3cf21e8
--- /dev/null
+++ b/docbook.am
@@ -0,0 +1,95 @@
+#
+# Generate output formats for a single DocBook/XML with/without chapters
+#
+# Variables set by the calling Makefile:
+# shelfdir: the location where the docs/specs are installed. Typically $(docdir)
+# docbook: the main DocBook/XML file, no chapters, appendix or image files
+# chapters: all files pulled in by an XInclude statement and images.
+#
+
+#
+# This makefile is intended for Users Documentation and Functional Specifications.
+# Do not use for Developer Documentation which is not installed and does not require olink.
+# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393
+# for an explanation on documents classification.
+#
+
+# DocBook/XML generated output formats to be installed
+shelf_DATA =
+
+# DocBook/XML file with chapters, appendix and images it includes
+dist_shelf_DATA = $(docbook) $(chapters)
+
+#
+# Generate DocBook/XML output formats with or without stylesheets
+#
+
+# Stylesheets are available if the package xorg-sgml-doctools is installed
+if HAVE_STYLESHEETS
+
+# The location where all cross reference databases are installed
+sgmldbsdir = $(XORG_SGML_PATH)/X11/dbs
+masterdb = "$(sgmldbsdir)/masterdb$(suffix $@).xml"
+XMLTO_FLAGS = \
+ --searchpath "$(XORG_SGML_PATH)/X11" \
+ --stringparam target.database.document=$(masterdb) \
+ --stringparam current.docid="$(<:.xml=)" \
+ --stringparam collect.xref.targets="no"
+
+XMLTO_XHTML_FLAGS = \
+ -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl \
+ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
+
+XMLTO_FO_FLAGS = \
+ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl
+endif HAVE_STYLESHEETS
+
+shelf_DATA += $(docbook:.xml=.html)
+%.html: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $<
+
+if HAVE_FOP
+shelf_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps)
+%.pdf: %.xml $(chapters)
+ $(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
+
+if HAVE_XMLTO_TEXT
+shelf_DATA += $(docbook:.xml=.txt)
+%.txt: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) txt $<
+endif HAVE_XMLTO_TEXT
+
+#
+# Generate documents cross-reference target databases
+#
+
+# This is only possible if the xorg-sgml-doctools package is installed
+if HAVE_STYLESHEETS
+if HAVE_XSLTPROC
+
+# DocBook/XML generated document cross-reference database
+sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db)
+
+# Generate DocBook/XML document cross-reference database
+# Flags for the XSL Transformation processor generating xref target databases
+XSLTPROC_FLAGS = \
+ --path "$(XORG_SGML_PATH)/X11" \
+ --stringparam targets.filename "$@" \
+ --stringparam collect.xref.targets "only" \
+ --nonet --xinclude
+
+%.html.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+ http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl $<
+
+%.fo.db: %.xml $(chapters)
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROC_FLAGS) \
+ http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $<
+
+endif HAVE_XSLTPROC
+endif HAVE_STYLESHEETS
+
+CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
diff --git a/specs/.gitignore b/specs/.gitignore
index 6fa5c31..92946c9 100644
--- a/specs/.gitignore
+++ b/specs/.gitignore
@@ -2,3 +2,4 @@
*.ps
*.pdf
*.txt
+*.db
diff --git a/specs/XIM/Makefile.am b/specs/XIM/Makefile.am
index 6c500a4..a1fa72d 100644
--- a/specs/XIM/Makefile.am
+++ b/specs/XIM/Makefile.am
@@ -1,32 +1,12 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-#
if ENABLE_SPECS
+if HAVE_XMLTO
-specdir = $(docdir)/$(subdir)
-doc_sources = xim.xml
-dist_spec_DATA = \
- $(doc_sources) \
+# Main DocBook/XML files (DOCTYPE book)
+docbook = xim.xml
+
+# Included chapters, appendix, images
+chapters = \
dynamicflowsampleseq.svg \
dynamicflow.svg \
eventflow.svg \
@@ -35,6 +15,11 @@ dist_spec_DATA = \
staticflowsampleseq.svg \
staticflow.svg
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/XIM
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/XKB/Makefile.am b/specs/XKB/Makefile.am
index e6a09cf..3939db6 100644
--- a/specs/XKB/Makefile.am
+++ b/specs/XKB/Makefile.am
@@ -1,32 +1,12 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-#
if ENABLE_SPECS
+if HAVE_XMLTO
-specdir = $(docdir)/$(subdir)
-doc_sources = xkblib.xml
-dist_spec_DATA = \
- $(doc_sources) \
+# Main DocBook/XML files (DOCTYPE book)
+docbook = xkblib.xml
+
+# Included chapters, appendix, images
+chapters = \
acknowledgement.xml \
ch01.xml \
ch02.xml \
@@ -73,6 +53,11 @@ dist_spec_DATA = \
XKBlib-20.svg \
XKBlib-21.svg
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/XKB
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am
index d2c86df..6e8b010 100644
--- a/specs/i18n/framework/Makefile.am
+++ b/specs/i18n/framework/Makefile.am
@@ -1,32 +1,18 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-#
if ENABLE_SPECS
+if HAVE_XMLTO
-specdir = $(docdir)/$(subdir)
-doc_sources = framework.xml
-dist_spec_DATA = $(doc_sources) framework.svg
+# Main DocBook/XML files (DOCTYPE book)
+docbook = framework.xml
-include $(top_srcdir)/specs/xmlrules.in
+# Included chapters, appendix, images
+chapters = framework.svg
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/framework
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am
index 2046e73..8db6a7b 100644
--- a/specs/i18n/localedb/Makefile.am
+++ b/specs/i18n/localedb/Makefile.am
@@ -1,32 +1,15 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-#
if ENABLE_SPECS
+if HAVE_XMLTO
-specdir = $(docdir)/$(subdir)
-doc_sources = localedb.xml
-dist_spec_DATA = $(doc_sources)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = localedb.xml
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/localedb
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am
index 456e59e..cdec750 100644
--- a/specs/i18n/trans/Makefile.am
+++ b/specs/i18n/trans/Makefile.am
@@ -1,32 +1,15 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-#
if ENABLE_SPECS
+if HAVE_XMLTO
-specdir = $(docdir)/$(subdir)
-doc_sources = trans.xml
-dist_spec_DATA = $(doc_sources)
+# Main DocBook/XML files (DOCTYPE book)
+docbook = trans.xml
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)/trans
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+
+endif HAVE_XMLTO
endif ENABLE_SPECS
diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am
index 756b85f..0e59ad8 100644
--- a/specs/libX11/Makefile.am
+++ b/specs/libX11/Makefile.am
@@ -1,54 +1,40 @@
-#
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# 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 AUTHORS OR COPYRIGHT HOLDERS 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.
-#
if ENABLE_SPECS
+if HAVE_XMLTO
-specdir = $(docdir)/$(subdir)
-doc_sources = libX11.xml
-dist_spec_DATA = $(doc_sources) \
- AppA.xml \
- AppB.xml \
- AppC.xml \
- AppD.xml \
- CH01.xml \
- CH02.xml \
- CH03.xml \
- CH04.xml \
- CH05.xml \
- CH06.xml \
- CH07.xml \
- CH08.xml \
- CH09.xml \
- CH10.xml \
- CH11.xml \
- CH12.xml \
- CH13.xml \
- CH14.xml \
- CH15.xml \
- CH16.xml \
- credits.xml \
+# Main DocBook/XML files (DOCTYPE book)
+docbook = libX11.xml
+
+# Included chapters, appendix, images
+chapters = \
+ AppA.xml \
+ AppB.xml \
+ AppC.xml \
+ AppD.xml \
+ CH01.xml \
+ CH02.xml \
+ CH03.xml \
+ CH04.xml \
+ CH05.xml \
+ CH06.xml \
+ CH07.xml \
+ CH08.xml \
+ CH09.xml \
+ CH10.xml \
+ CH11.xml \
+ CH12.xml \
+ CH13.xml \
+ CH14.xml \
+ CH15.xml \
+ CH16.xml \
+ credits.xml \
glossary.xml
-include $(top_srcdir)/specs/xmlrules.in
+# The location where the DocBook/XML files and their generated formats are installed
+shelfdir = $(docdir)
+
+# Generate DocBook/XML output formats with or without stylesheets
+include $(top_srcdir)/docbook.am
+endif HAVE_XMLTO
endif ENABLE_SPECS
commit 25eb76b3d2726f2f1de759901971ae53b2539dc4
Author: Harshula Jayasuriya <harshula@gmail.com>
Date: Mon Mar 21 14:49:37 2011 +0000
Add #define XK_SINHALA
Add #define XK_SINHALA so that the Sinhala keysyms can be used by
the lk xkb keymap.
Signed-off-by: Harshula Jayasuriya <harshula@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/KeyBind.c b/src/KeyBind.c
index ac25ce2..221cedd 100644
--- a/src/KeyBind.c
+++ b/src/KeyBind.c
@@ -44,6 +44,7 @@ in this Software without prior written authorization from The Open Group.
#define XK_CAUCASUS
#define XK_VIETNAMESE
#define XK_XKB_KEYS
+#define XK_SINHALA
#include <X11/keysymdef.h>
#include <stdio.h>
Reply to: