libx11: Changes to 'ubuntu'
ChangeLog | 773 +++
Makefile.am | 1
configure.ac | 21
debian/changelog | 23
debian/control | 6
debian/libx11-6.symbols | 1
debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff | 2
debian/rules | 18
docbook.am | 114
include/X11/Xlib.h | 1
include/X11/Xlibint.h | 101
include/X11/Xutil.h | 2
man/XGrabKey.man | 2
modules/im/ximcp/imDefFlt.c | 16
modules/im/ximcp/imDefIc.c | 4
modules/im/ximcp/imDefLkup.c | 12
modules/im/ximcp/imExten.c | 2
modules/im/ximcp/imRm.c | 18
modules/im/ximcp/imRmAttr.c | 7
modules/lc/gen/lcGenConv.c | 9
nls/Makefile.am | 98
nls/compose-chart.pl | 389 -
nls/compose.dir.pre | 135
nls/en_US.UTF-8/Compose.pre | 23
nls/iso8859-1/Compose.pre | 2
nls/iso8859-15/Compose.pre | 30
nls/locale.alias.pre | 54
nls/locale.dir.pre | 77
nls/pt_BR.UTF-8/Compose.pre | 4276 ++++++++++++++++++++-
nls/xmlrules.in | 59
specs/XIM/xim.xml | 84
specs/XKB/ch01.xml | 22
specs/XKB/ch02.xml | 16
specs/XKB/ch03.xml | 12
specs/XKB/ch04.xml | 12
specs/XKB/ch05.xml | 14
specs/XKB/ch06.xml | 10
specs/XKB/ch07.xml | 16
specs/XKB/ch08.xml | 40
specs/XKB/ch09.xml | 16
specs/XKB/ch10.xml | 78
specs/XKB/ch11.xml | 30
specs/XKB/ch12.xml | 12
specs/XKB/ch13.xml | 26
specs/XKB/ch14.xml | 26
specs/XKB/ch15.xml | 44
specs/XKB/ch16.xml | 56
specs/XKB/ch17.xml | 22
specs/XKB/ch18.xml | 16
specs/XKB/ch19.xml | 2
specs/XKB/ch20.xml | 10
specs/XKB/ch21.xml | 17
specs/XKB/ch22.xml | 2
specs/XKB/xkblib.xml | 19
specs/i18n/Makefile.am | 2
specs/i18n/compose/.gitignore | 2
specs/i18n/compose/Makefile.am | 20
specs/i18n/compose/compose-chart.pl | 388 +
specs/i18n/compose/docbook-nl.am | 128
specs/i18n/framework/framework.xml | 180
specs/i18n/localedb/localedb.xml | 24
specs/i18n/trans/trans.xml | 60
specs/libX11/AppA.xml | 986 ++--
specs/libX11/AppB.xml | 2
specs/libX11/AppC.xml | 334 -
specs/libX11/AppD.xml | 230 -
specs/libX11/CH01.xml | 20
specs/libX11/CH02.xml | 270 -
specs/libX11/CH03.xml | 393 -
specs/libX11/CH04.xml | 238 -
specs/libX11/CH05.xml | 88
specs/libX11/CH06.xml | 580 +-
specs/libX11/CH07.xml | 361 -
specs/libX11/CH08.xml | 552 +-
specs/libX11/CH09.xml | 284 -
specs/libX11/CH10.xml | 282 -
specs/libX11/CH11.xml | 396 -
specs/libX11/CH12.xml | 412 +-
specs/libX11/CH13.xml | 1160 ++---
specs/libX11/CH14.xml | 626 +--
specs/libX11/CH15.xml | 297 -
specs/libX11/CH16.xml | 486 +-
specs/libX11/credits.xml | 32
specs/libX11/glossary.xml | 30
specs/libX11/libX11.xml | 39
src/KeysymStr.c | 3
src/XlibInt.c | 31
src/Xresinternal.h | 4
src/util/Makefile.am | 3
src/util/makekeys.c | 5
src/xlibi18n/XimintP.h | 40
src/xlibi18n/XlcSL.c | 6
src/xlibi18n/lcFile.c | 2
93 files changed, 10348 insertions(+), 5526 deletions(-)
New commits:
commit 5cdeafd8373388cfa8695c2f664e6c117fe3091a
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Dec 21 18:20:44 2011 -0800
releasing version 2:1.4.99.1-0ubuntu1
diff --git a/debian/changelog b/debian/changelog
index 84b9978..1e6a96d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libx11 (2:1.4.99.1-0ubuntu1) UNRELEASED; urgency=low
+libx11 (2:1.4.99.1-0ubuntu1) precise; urgency=low
* New upstream release.
* Refreshed 006_tailor_pt_BR.UTF-8_Compose.diff
* Add _XGetRequest to symbols
- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 21 Dec 2011 18:09:01 -0800
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 21 Dec 2011 18:20:16 -0800
libx11 (2:1.4.4-5) UNRELEASED; urgency=low
commit 35a47a9aa996241ac7d33e973ae1c2644218220e
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Dec 21 18:09:35 2011 -0800
Add _XGetRequest to symbols
diff --git a/debian/changelog b/debian/changelog
index 861216e..84b9978 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libx11 (2:1.4.99.1-0ubuntu1) UNRELEASED; urgency=low
* New upstream release.
* Refreshed 006_tailor_pt_BR.UTF-8_Compose.diff
+ * Add _XGetRequest to symbols
- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 21 Dec 2011 17:59:32 -0800
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 21 Dec 2011 18:09:01 -0800
libx11 (2:1.4.4-5) UNRELEASED; urgency=low
diff --git a/debian/libx11-6.symbols b/debian/libx11-6.symbols
index 34e673c..c3e4186 100644
--- a/debian/libx11-6.symbols
+++ b/debian/libx11-6.symbols
@@ -823,6 +823,7 @@ libX11.so.6 libx11-6 #MINVER#
_XGetBitsPerPixel@Base 0
_XGetHostname@Base 0
(optional)_XGetLCValues@Base 0 1
+ _XGetRequest@Base 2:1.4.99.1
_XGetScanlinePad@Base 0
_XGetWindowAttributes@Base 0
(optional)_XHeadOfDisplayList@Base 0 1
commit c8f63ea26d013b13f7ce809fd3b9045d56db28d0
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Dec 21 18:00:02 2011 -0800
Refreshed 006_tailor_pt_BR.UTF-8_Compose.diff
diff --git a/debian/changelog b/debian/changelog
index 7a363e3..861216e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
libx11 (2:1.4.99.1-0ubuntu1) UNRELEASED; urgency=low
* New upstream release.
+ * Refreshed 006_tailor_pt_BR.UTF-8_Compose.diff
- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 21 Dec 2011 17:46:03 -0800
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 21 Dec 2011 17:59:32 -0800
libx11 (2:1.4.4-5) UNRELEASED; urgency=low
diff --git a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
index 65b8837..d6fa3df 100644
--- a/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
+++ b/debian/patches/006_tailor_pt_BR.UTF-8_Compose.diff
@@ -86,7 +86,7 @@ Not submitted upstream to X.Org.
-<Multi_key> <space> <minus> : "~" asciitilde
-
-XCOMM Spaces
--<Multi_key> <space> <space> : " " nobreakspace # NO-BREAK SPACE
+-<Multi_key> <space> <space> : "\240" nobreakspace # NO-BREAK SPACE
-<Multi_key> <space> <period>: " " U2008 # PUNCTUATION SPACE
-
-<Multi_key> <o> <c> : "©" copyright
commit b4088d5c8246c167d69befe8ff76a73a5b59ae17
Author: Chase Douglas <chase.douglas@canonical.com>
Date: Wed Dec 21 17:46:46 2011 -0800
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 205f216..3d07ab2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,776 @@
+commit bf2d7c8c6d70539c72560b1921e18df2610acf29
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Nov 11 14:56:36 2011 +1000
+
+ libX11 1.4.99.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 24283d40b1e4314c6647dda49d2a159833341a8b
+Author: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+Date: Thu Sep 22 18:44:13 2011 -0400
+
+ makekeys: Fix build/target word size mismatch when cross-compiling
+
+ Since makekeys is built using build environment's gcc and
+ runs natively, we have to make sure that the size of the
+ Signature type is the same on both the native environment
+ and the target, otherwise we get mismatches upon running X,
+ and some LSB test failures (xts5).
+
+ Use an unsigned 32-bit integer on all platforms. Also,
+ eliminate the redundant multiple typedefs for the
+ Signature type.
+
+ Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 1c41f3b9b86b5eeedfa3bff92e519d45aa097587
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Nov 9 21:00:36 2011 -0800
+
+ XlcSL.c: convert old-style function definitions to ANSI C89 style
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f6dad6aaa384bf836baa28ccb72b476a85c40eff
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 27 13:53:22 2011 +1000
+
+ Use GetReqSized for GetReq and GetReqExtra
+
+ GetEmptyReq and GetResReq cannot do this due to the final typecast -
+ typically requests that need either of those do not have their own typedef
+ in the protocol headers.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit c9c99058b9d98789c0b2d7e78a23443c2b57a047
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Oct 14 14:51:06 2011 +1000
+
+ include: Add GetReqSized() for request buffers of specific size
+
+ Some XI2 requests change in size over different versions and libXi would
+ need to hack around GetReq and GetReqExtra. Add a new GetReqSized so the
+ library can explicitly specify the size of the request in 4-byte units.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit ba8a7a19165e30d14bc165f43f67c19b6a115585
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 27 13:24:10 2011 +1000
+
+ Switch GetEmptyReq and GetResReq to call _XGetRequest
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit 4a060f993bf676cf21ad9784e010f54134da7b40
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 17 09:45:15 2011 +1000
+
+ Add _XGetRequest as substitute for GetReq/GetReqExtra
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
+
+commit d8956520deb79c1cbb5e974c175bf8493859b22b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Oct 14 17:53:00 2011 -0700
+
+ Fix "nomal" -> "normal" typo in several comments
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 002b36e308a26a152504f9b40aa08a0dce9a7991
+Author: Xue Wei <Wei.Xue@Sun.COM>
+Date: Fri Oct 14 17:39:21 2011 -0700
+
+ mbtocs should not truncate input
+
+ Fixes pasting more than 1024 bytes into xterm, as described in
+ https://bugs.freedesktop.org/show_bug.cgi?id=25209
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 9b8d8c9e5b27273e8856a3851ba9b68022bed3cd
+Author: Marko Myllynen <myllynen@redhat.com>
+Date: Mon Oct 10 09:41:13 2011 +0300
+
+ Add new compose sequences
+
+ This patch adds few new compose sequences to the en_US map, ligatures
+ common in typesetting and sequences already in use in the fi_FI map.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=30621
+ https://bugs.freedesktop.org/show_bug.cgi?id=34523
+
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 738f7b867341c1da87ee667d48815822715c3e75
+Author: Choe Hwanjin <choe.hwanjin@gmail.com>
+Date: Thu Oct 13 07:58:02 2011 +0900
+
+ XIM: Make Xim handle NEED_SYNC_REPLY flag
+
+ NEED_SYNC_REPLY flag should be in Xim not in Xic.
+ Because the focused Xic can be changed before sending sync reply.
+ After focused Xic changed, the new Xic doesn't have NEED_SYNC_REPLY
+ flag enabled, so libX11 doesn't send XIM_SYNC_REPLY packet.
+
+ This patch adds sync reply flag to Xim and removes sync reply
+ from Xic.
+
+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=7869
+
+ Signed-off-by: Choe Hwanjin <choe.hwanjin@gmail.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 50e15379331c436851abb194251cde96999e67b3
+Author: Bodo Graumann <mail@bodograumann.de>
+Date: Mon Oct 10 16:40:52 2011 +0200
+
+ libX11: Fixing modifier key range in Xutil.h (Bug #21910)
+
+ IsModifierKey, defined in include/X11/Xutil.h, is a macro determining,
+ which keys are regarded as modifiers. The constants ISO_Level5_Shift,
+ ISO_Level5_Latch and ISO_Level5_Lock where excluded previously, leaving
+ some Neo2 modifiers functionless in combination with compose.
+ This patch adjusts the range to include the correct, full range of
+ modifier constants.
+
+ Neo2 Bug 277 <http://wiki.neo-layout.org/ticket/277>
+
+ X.Org Bug 21910 <http://bugs.freedesktop.org/show_bug.cgi?id=21910>
+
+ Signed-off-by: Bodo Graumann <mail@bodograumann.de>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit b5a108624331fabf393223c0891914cc54d4caf4
+Author: Yann Droneaud <yann@droneaud.fr>
+Date: Tue Oct 11 17:27:59 2011 +0200
+
+ Return name instead of False in XSetICValues()
+
+ In case of error, XSetICValues() must return the first argument
+ that failed to be set.
+
+ But in some error paths, it returns False, which is converted to NULL,
+ so the function returns OK in case of error.
+
+ Signed-off-by: Yann Droneaud <yann@droneaud.fr>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 10992cb8dc5e4d938e7e5a633b68a81b5875f3ba
+Author: Yann Droneaud <yann@droneaud.fr>
+Date: Sun Oct 9 17:56:45 2011 +0200
+
+ Return name instead of value in XGetIMValues() and XSetIMValues()
+
+ As stated in man page (XOpenIM) and Xlib documentation (chapter 13.5.3),
+ XGetIMValues() and XSetImValues() "returns the name of the first argument
+ that could not be obtained."
+
+ But currently,
+
+ err = XGetIMValues(im, "invalid", &arg, NULL);
+
+ returns &arg instead of "invalid".
+
+ This patch fixes https://bugs.freedesktop.org/show_bug.cgi?id=12897
+
+ Signed-off-by: Yann Droneaud <yann@droneaud.fr>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit f2651e03f3295a453a2965c3749bc8b6e66f1c09
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Oct 10 14:09:17 2011 -0700
+
+ Mark XKeycodeToKeysym as _X_DEPRECATED
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 25d7bb9c705623ebbb3afba3b86d0ded5b6bb4fb
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 9 02:38:28 2011 -0700
+
+ Fix nobreakspace for pt_BR.UTF-8
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=31334
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 913603660c17ec59a4d39d3e3b9d60469ee5c060
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 9 02:26:45 2011 -0700
+
+ Fix potential uninitialized variable access in _XimMakeICAttrIDList
+
+ Found by clang static analysis
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 566ceaf5a92c721ac7155528e4d0d2e5cbef023f
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Oct 9 02:25:50 2011 -0700
+
+ Remove self-resolving aliases
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=30112
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 22ba43d198dcca86c88eb15a56fc7d8fc47c422e
+Author: Matt Dew <marcoz@osource.org>
+Date: Fri Oct 7 22:52:30 2011 -0600
+
+ Cleanup IDs and links in doc
+
+ 1 - fix the capitalization of the ID attributes to match either the
+ <title> or <funcdef> string it goes with.
+ 2 - fix any <linkend>'s that were affected by 1.
+ 3 - any <function> in the docs that has an actual funcdef,
+ will become an olink.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit f858f3326adbc0c5711669b92a64a84a9083a055
+Author: James Cloos <cloos@jhcloos.com>
+Date: Tue Oct 4 17:11:11 2011 -0400
+
+ [nls] Fix typo/synco.
+
+ The iso8859-1 Compose table includes an optional section which uses
+ Ctrl<T> as a substitute for <Multi_key>. In that section the sequence
+ to generate an @ (at) either was incorrectly copied from the Multi_key
+ section or was not kept in sync with the Multi_key section.
+
+ Fixing this eliminates the warning from compose-check.pl:
+
+ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+ ┃ Clash with existing sequence in iso8859-1/Compose.pre
+ ┃ on line 661: Ctrl<T> <A> <A>
+ ┃ line #661: Ctrl<T> <A> <A> : "\305" Aring
+ ┃ line #480: Ctrl<T> <A> <A> : "@" at
+ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit 7f35f7efc23234b3f8529fee31a802c21846d9ab
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Mon Sep 26 11:32:56 2011 -0700
+
+ Remove conflicting compose sequences for cent and colon
+
+ Regression from 4d78ad4bf6dcabca9bb5f84c770abfbb02d3f7a4
+ Found by tinderbox
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 4d78ad4bf6dcabca9bb5f84c770abfbb02d3f7a4
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sun Sep 25 16:29:17 2011 -0700
+
+ Add additional compose sequences for pound sterling, yen, and cent (mixed case)
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=1013
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0ca4153a373e2af7a9eb3cef003393ab332bc79e
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Sat Sep 24 16:44:04 2011 -0700
+
+ Use a configure check for seteuid
+
+ HP-UX doesn't have seteuid
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=1497
+
+ Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 79594b4d66344f248eb4314ecb78eb81f632c3ab
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 20 16:06:10 2011 -0400
+
+ localedb specs: use <copyright> for first holder of multi license
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 154430268cf004b06920edde2f1812dc16d71fae
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 20 16:01:52 2011 -0400
+
+ libX11 specs: use <copyright> for first holder of multi license
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 66e621f58dee804acb795ff2c79ce6dd38b34a3f
+Author: Tollef Fog Heen <tfheen@err.no>
+Date: Tue Sep 20 13:07:37 2011 -0400
+
+ NLS: Add more vulgar fractions
+
+ Add 1/7, 1/9, 1/10 and 0/3 vulgar fractions.
+
+ Signed-off-by: Tollef Fog Heen <tfheen@err.no>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit e37a6da814b5653be46000a9a76902729660a2e6
+Author: Alexander Polakov <polachok@gmail.com>
+Date: Sat Sep 17 20:54:58 2011 +0400
+
+ XGrabKey manual page: change XAllowAccess to XAllowEvents in See Also
+
+ There is no XAllowAccess man page to see.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a23f3323f269b33a43d16dce01395cd28bc41b45
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 15:27:44 2011 -0400
+
+ XKB: provide adequate quotes for the license text
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a9c7a5cad91d968f5536ef8fc735036e921832a3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 15:18:53 2011 -0400
+
+ XIM: refactor the multi licensing legal text
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c46f934ed89e7de79746a0387c9f998d91994ea6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 10:33:30 2011 -0400
+
+ xim trans: restore Fujitsu copyright legal text
+
+ Somehow lost during docbook conversion. text from x.org ftp R7.5.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 3d75f993382bfdc89d31668d7dfc71c91222e0d7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 10:11:46 2011 -0400
+
+ xtrans: restore X Consortium original legal text
+
+ Asking X Consortium permission to use The Open Group name makes no sense.
+ Even more so in 1994 before X Window System was passed on to the Open Group.
+
+ Using original text from xorg-docs/general/License
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 136a381585a4a9686c11bad1a6130837978e677f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 10:03:21 2011 -0400
+
+ Framework: restore X Consortium copyright
+
+ Somewhat dammaged during docbook conversion.
+ Also restore pasrt of the original license text
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 33f346878406762704a0c13cdc018111c666f3c1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 09:50:00 2011 -0400
+
+ localedb: restore X Consortium original legal text
+
+ Asking X Consortium permission to use The Open Group name makes no sense.
+ Even more so in 1994 before X Window System was passed on to the Open Group.
+
+ Using original text from xorg-docs/general/License
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e99c9338e413efca026210b9d830efb5c74d34e5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 08:23:18 2011 -0400
+
+ specs: support multi licensed copyright notice and license text
+
+ For documentation having multiple licenses, the copyright and legalnotice
+ elements sequence cannot instantiated multiple times.
+ The copyright notice and license text are therefore coded inside a
+ legalnotice element. The role attribute on the paragraph is used to allow
+ styling of the copyright notice text which should not be italicized.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b9dedc757e667333ce899115d618f25cdaa4dd5e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 08:17:50 2011 -0400
+
+ localedb: add release info to spec
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4519c89a87ddce01e599542737a27c26030fe4ff
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 08:05:32 2011 -0400
+
+ specs: fix The Open Group license text
+
+ The warranty referred to the X Consortium
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 08ac378423e7be72e340197ba5559a1a36f1783c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 19 08:03:39 2011 -0400
+
+ specs: The strandard name is still "X Consortium Standard"
+
+ This spec, and fsproto spec, are the only two docs with a different
+ standard name.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8dfbeb1b1b1e8aa17f69d0a373155419a5f6a172
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 18 13:22:34 2011 -0400
+
+ specs: support multi licensed copyright notice and license text
+
+ For documentation having multiple licenses, the copyright and legalnotice
+ elements sequence cannot instantiated multiple times.
+ The copyright notice and license text are therefore coded inside a legalnotice
+ element. The role attribute on the paragraph is used to allow styling of the
+ copyright notice text which should not be italicized.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 278ca8947c1dabb2b819527dca0fa6190c034f67
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Sep 16 11:45:56 2011 -0400
+
+ docs: merge copyright holder under the same copyright notice
+
+ As per the docbook markup dtd.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7ff012bb433109a622ac122ade71669e842ebdcf
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Sep 16 10:09:57 2011 -0400
+
+ specs: handle multiple sets of copyright notice/license/warranty
+
+ Docbook groups all the <copyright> elements together and all the
+ <legalnotice> elements together.
+
+ We cannot have a sequence:
+ <copyright> <legalnotice> <copyright> <legalnotice> [...]
+
+ A workaround, which was done in some documents, is to put the copyright
+ notice inside the legalnotice in plain text without the <copyright> element.
+ A formal paragraph title is added here which makes the copyright notice bold,
+ and makes it much easier to locate.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 4a550c71b8221c37b1a9378d5a170da9eaa03405
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 14 15:55:42 2011 -0400
+
+ specs: remove orphan affiliation.
+
+ Authors affiliation are correct.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 0cc02a6df65214560b7575e89cebee741d6d2469
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 13 17:39:02 2011 -0400
+
+ specs: use appropriate markup for Copyright statements
+
+ Also move <releaseinfo> to match order of appearance
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit afe13e19ebf0fc4e3460644164433af016f0add7
+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 22a2153282db13e9d94881022b8c979539841a2c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 19:49:53 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 719f16570d9fcfd15247813ee51fa51ac8a6ff4c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 17:40:21 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a6b2992f50b571d612ea9ade631c432c3099bc12
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 17:38:42 2011 -0400
+
+ docs: remove orphan <affiliation>
+
+ Somehow created during the conversion from roff. Unable to locate
+ the author to which it belongs.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c7420060b6e47b8467ba50c796ec3c1bab090bc7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 17:38:05 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 7d5b718c1edbc43c54b7001be548e515a49540ea
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Sep 9 14:46:39 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 24632d280491c465dfe208ef788815890892e326
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 5 12:53:12 2011 -0400
+
+ compose: upgrade makefile to support olinking on chunked html
+
+ The essential differences over the regular docbook.am are:
+ Adding root.filename parameter for naming of chapters html files.
+ Using xhtml xmlto format and xorg-chunk.xsl stylesheet
+ Set olink.base.uri for pdf but not for chunked html
+ Olink is not applicable to ps and txt formats.
+
+ Html chapters are added to shelf_DATA as they are also installed.
+ The xml is generated from a perl script and not distributed.
+
+ Requires version 1.10 of xorg-sgml-doctools.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 93ab0a1c9a4f9094cf0c8e1c686130673e681798
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Aug 31 19:46:20 2011 -0400
+
+ docbook.am: refactor common flags for xmlto and xsltproc
+
+ Maximize reuse and reduce risk of setting the wrong flag
+ at the wrong place.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 85b725aa9ef76aeb5e94d42e0cd60f896da7ab97
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Aug 31 10:46:59 2011 -0400
+
+ docbook.am: add search path for local entities
+
+ Currently, only $(XORG_SGML_PATH)/X11 is searched for xml entities.
+ A module may want to add entities that apply only to itself and
+ not to all modules, like the xserver does.
+
+ This feature may or may not be used in this module, but all modules
+ share a copy of docbook.am.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b5ed2d368d47f244d43d2513329fa2758bc4ef54
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Aug 25 14:39:20 2011 -0400
+
+ docbook.am: explicitly list xmlto flags for each target
+
+ Normal evolution of make targets make it impractical to factor out
+ common command flags for xmlto.
+
+ The targets now list each command option as its presence or absence
+ needs to be justified.
+
+ xorg.ss is only needed by xmlto for html.
+ masterdb is only needed by xmlto.
+ img.src.path must not be used by html.
+ xsltproc need to use customization layer xorg-*.xsl.
+ txt format is not required to search masterdb.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d5b3605f3b0639452e892e9ff3afb18bb7442069
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Aug 25 13:12:49 2011 -0400
+
+ docbook.am: do not generate docs if docbook customization layer is missing
+
+ The stylesheets used to be only about style, fonts or colors.
+ Complex features are now used like olink and chunked html which
+ may cause a build break when stylesheets are missing or lead to hard
+ to find problem.
+
+ Some modules may be built when stylesheets are present while others
+ are built without. There is no requirement to build crippled docs.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 7f23c72c94d9d14122426b0d8c66054f1402769a
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Aug 5 14:33:32 2011 -0400
+
+ libX11 specs: review doclifter generated tables
+
+ Many tables had a questionnable layout and some had information dropped.
+ Each table was cross-referenced with a pre-docbook version
+ to ensure semantic integrity.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1efdbeb8cd08f443188ac783cbab6ba0654a66d6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 20 15:28:47 2011 -0400
+
+ credits.xml: remove toc from Acknowledgments
+
+ There should be no toc for a simple preface with only one
+ Acknowledgments section.
+
+ Use <simplesect> markup rather than sect1.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 77cc17ed0817c1df3ac5feb9dc83a5ba5d021a4b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Aug 4 19:59:37 2011 -0400
+
+ libX11 specs: move </para> above <varaiablelist>
+
+ Many, but not all, function synopsis have a paragraph that
+ nests the variable list. The code was generated by doclifter
+ and there is no apprent reasons as to why it was done this way.
+ Found while investigating a spacing issue.
+
+ Before the patch:
+ <para>Some blurb about the function
+ <funcsynopsis>
+ </funcsynopsis>
+ <variablelist>
+ </variablelist>
+ </para>
+
+ After the patch:
+ <para>Some blurb about the function</para>
+ <funcsynopsis>
+ </funcsynopsis>
+ <variablelist>
+ </variablelist>
+
+ There are no noticable differences when reading the doc
+ other than than the removed few pixels of spacing between
+ the function sysnopsis and the variable list block.
+
+ In some cases, there are no "blurb about the fucntion"
+ and the empty paragraph is removed.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 18595f0d8f95ff1c12e7b9f73bd4b30dda5c7168
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jul 28 19:46:14 2011 -0400
+
+ compose specs: generate chunked html
+
+ For large 600 page documents such as this one, chunked html
+ provide faster browser load time and better navigation.
+
+ Simply click on the locale of your choice in the toc and
+ the browser loads just that one file. Being a DocBook,
+ it benefits from all of the usual features and can be
+ integrated with the rest of the documentation.
+
+ Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5cc8815b8a117cf0b6af37e7d55c5a420d9fff57
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jun 23 15:16:47 2011 -0400
+
+ specs: build compose keys tables in specs/i18n/compose
+
+ Build the tables article together with the rest of the specs.
+ Make it transparent that the source in generated in nls.
+ Reuse docbook.am and get all the features such as olink.
+
+ The docbook article file stem and id must be the same. The new name
+ for the main article is libX11-keys. The new installation location
+ is $docdir/libX11/i18n/compose.
+
+ The nls dir retains the role of generating the DocBook/XML source
+ but does not build neither installs output formats or generated source.
+
+ The tables article now has to specify that each included locale
+ section is a dependency. It did not matter before as they were web links.
+
+ The xorg-sgml-doctools masterdb shall be updated to include this new doc.
+ Install location moved from doc/libX11/Compose to doc/libX11/i18n/compose.
+
+ Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit adebbe3856b4aee39c0c7af902c1dea847dd6d7c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jun 23 14:43:31 2011 -0400
+
+ nls: restructure charts as a single article with sections
+
+ Looks more like a real article with a toc rather than individual
+ web pages. Looks nicer in pdf.
+
+ Each locale is a "section" rather than an "article".
+ Using XInclude to aggregate xml source files gets you the toc for free.
+
+ The single document is over 600 pages while there were 62 separate
+ documents previously. FOP version 1.0 is required to handle missing
+ character like capital sharp s.
+
+ Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit fc74dc12b1ff3c43e240e1a713316ce1bf525d61
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jul 28 19:32:40 2011 -0700
diff --git a/debian/changelog b/debian/changelog
index ce1e65d..7a363e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libx11 (2:1.4.99.1-0ubuntu1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 21 Dec 2011 17:46:03 -0800
+
libx11 (2:1.4.4-5) UNRELEASED; urgency=low
* Move xorg-sgml-doctools dependency from -dev to -doc.
commit b02ee0875f535c95e106f7d7d7ee4511c00951a7
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Nov 15 20:22:59 2011 +0100
Move libx11-doc from section libdevel to doc (closes: #648706).
diff --git a/debian/changelog b/debian/changelog
index f556167..ce1e65d 100644
--- a/debian/changelog
Reply to: