xorg-docs: Changes to 'debian-unstable'
.gitignore | 1
ChangeLog | 630 ++++++
MAINTAINERS | 137 -
configure.ac | 13
debian/README.source | 2
debian/changelog | 15
debian/compat | 2
debian/control | 10
debian/patches/01-disable-ps-generation.diff | 42
debian/patches/02-disable-automatic-size-detection.diff | 25
debian/patches/03-tell-xmlto-to-be-quiet.diff | 20
debian/rules | 31
debian/xorg-docs.install | 30
debian/xsfbs/xsfbs.mk | 35
docbook.am | 105 +
general/License.xml | 54
general/Makefile.am | 16
general/README.xml | 51
general/ReleaseNotes.xml | 962 +++++----
general/Versions.xml | 16
general/fonts/Makefile.am | 11
general/fonts/fonts.xml | 395 ++--
general/graphics/Makefile.am | 11
general/graphics/dps.xml | 4
general/input/Makefile.am | 11
general/input/XKB-Config.xml | 21
general/input/XKB-Enhancing.xml | 33
general/platforms/Darwin.xml | 11
general/platforms/Makefile.am | 13
general/platforms/Solaris.xml | 34
man/X.man | 16
specs/CTEXT/Makefile.am | 12
specs/CTEXT/ctext.xml | 194 +-
specs/ICCCM/Makefile.am | 12
specs/ICCCM/icccm.xml | 1541 +++++++---------
specs/XLFD/Makefile.am | 12
specs/XLFD/xlfd.xml | 745 +++----
specs/Xext/Makefile.am | 12
specs/Xext/lbxalg.xml | 23
specs/Xserver/Makefile.am | 12
specs/Xserver/XACE-Spec.xml | 48
specs/Xserver/analysis.xml | 259 +-
specs/Xserver/appgroup.xml | 46
specs/Xserver/secint.xml | 77
xmlrules.in | 65
45 files changed, 3362 insertions(+), 2453 deletions(-)
New commits:
commit 05e73b1172fd465cb5e941b98e1f9b3a5ecf6964
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:56:40 2013 +0200
Ignore .db files
diff --git a/debian/rules b/debian/rules
index 0d2b315..d59fdf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,7 @@ binary-indep: build install
dh_installdocs
dh_installman
find debian/tmp -name '*.xml' -delete
+ find debian/tmp -name '*.db' -delete
dh_install --fail-missing \
-Xplatforms/Darwin \
-Xplatforms/Solaris
commit e073ed82b20f209d1f47efaaa5afdebe71f4e19a
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:48:09 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 0b67b0d..b1e118c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-docs (1:1.7-1) UNRELEASED; urgency=low
+xorg-docs (1:1.7-1) unstable; urgency=low
* New upstream release (X11R7.7).
* Bump debhelper compat to 7.
@@ -11,7 +11,7 @@ xorg-docs (1:1.7-1) UNRELEASED; urgency=low
* Update xsfbs to avoid re-running the build process in the binary target.
* Adjust xorg-docs.install due to moved specs (?)
- -- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 17 Sep 2013 00:48:01 +0200
xorg-docs (1:1.6-1) unstable; urgency=low
commit 2d17f3f4e85a37a02e169255f77d7f0bf741c796
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:36:51 2013 +0200
Drop pointless use of $(CURDIR)
diff --git a/debian/rules b/debian/rules
index fcefc5a..0d2b315 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,10 +54,10 @@ install: build
dh_prep
dh_installdirs
$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
- mv $(CURDIR)/debian/tmp/usr/share/man/man7/Standards.7 \
- $(CURDIR)/debian/tmp/usr/share/man/man7/XStandards.7
- mv $(CURDIR)/debian/tmp/usr/share/man/man7/Consortium.7 \
- $(CURDIR)/debian/tmp/usr/share/man/man7/XConsortium.7
+ mv debian/tmp/usr/share/man/man7/Standards.7 \
+ debian/tmp/usr/share/man/man7/XStandards.7
+ mv debian/tmp/usr/share/man/man7/Consortium.7 \
+ debian/tmp/usr/share/man/man7/XConsortium.7
# Build architecture-independent files here.
binary-indep: build install
commit dcb2a7c66bbb0b1578c0b313c489d44114dc2263
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:35:37 2013 +0200
Adjust xorg-docs.install due to moved specs (?)
diff --git a/debian/changelog b/debian/changelog
index 550bb0b..0b67b0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ xorg-docs (1:1.7-1) UNRELEASED; urgency=low
* Rebase all patches.
* Disable silent build rules.
* Update xsfbs to avoid re-running the build process in the binary target.
+ * Adjust xorg-docs.install due to moved specs (?)
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
diff --git a/debian/xorg-docs.install b/debian/xorg-docs.install
index 816bcac..13c9819 100644
--- a/debian/xorg-docs.install
+++ b/debian/xorg-docs.install
@@ -11,18 +11,18 @@ usr/share/doc/xorg-docs/fonts/*.pdf
usr/share/doc/xorg-docs/input/*.html
usr/share/doc/xorg-docs/input/*.txt
usr/share/doc/xorg-docs/input/*.pdf
-usr/share/doc/xorg-docs/specs/CTEXT/*.html
-usr/share/doc/xorg-docs/specs/CTEXT/*.txt
-usr/share/doc/xorg-docs/specs/CTEXT/*.pdf
-usr/share/doc/xorg-docs/specs/ICCCM/*.html
-usr/share/doc/xorg-docs/specs/ICCCM/*.txt
-usr/share/doc/xorg-docs/specs/ICCCM/*.pdf
-usr/share/doc/xorg-docs/specs/Xext/lbxalg.html
-usr/share/doc/xorg-docs/specs/Xext/lbxalg.txt
-usr/share/doc/xorg-docs/specs/Xext/lbxalg.pdf
-usr/share/doc/xorg-docs/specs/XLFD/*.html
-usr/share/doc/xorg-docs/specs/XLFD/*.txt
-usr/share/doc/xorg-docs/specs/XLFD/*.pdf
-usr/share/doc/xorg-docs/specs/Xserver/*.html
-usr/share/doc/xorg-docs/specs/Xserver/*.txt
-usr/share/doc/xorg-docs/specs/Xserver/*.pdf
+usr/share/doc/xorg-docs/ctext/*.html
+usr/share/doc/xorg-docs/ctext/*.txt
+usr/share/doc/xorg-docs/ctext/*.pdf
+usr/share/doc/xorg-docs/icccm/*.html
+usr/share/doc/xorg-docs/icccm/*.txt
+usr/share/doc/xorg-docs/icccm/*.pdf
+usr/share/doc/xorg-docs/xext/lbxalg.html
+usr/share/doc/xorg-docs/xext/lbxalg.txt
+usr/share/doc/xorg-docs/xext/lbxalg.pdf
+usr/share/doc/xorg-docs/xlfd/*.html
+usr/share/doc/xorg-docs/xlfd/*.txt
+usr/share/doc/xorg-docs/xlfd/*.pdf
+usr/share/doc/xorg-docs/Xserver/*.html
+usr/share/doc/xorg-docs/Xserver/*.txt
+usr/share/doc/xorg-docs/Xserver/*.pdf
commit 5790ef1fc2c4b2b91c21b494328d5f74486ea03e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:33:04 2013 +0200
Document xsfbs merge
diff --git a/debian/changelog b/debian/changelog
index ab4d036..550bb0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-docs (1:1.7-1) UNRELEASED; urgency=low
* Bump xorg-sgml-doctools, xutils-dev and xmlto build-deps per configure.ac.
* Rebase all patches.
* Disable silent build rules.
+ * Update xsfbs to avoid re-running the build process in the binary target.
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
commit b3dcb061485ff34fea5a1dca27380ba1cf09ec0f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:25:39 2013 +0200
Disable silent build rules.
diff --git a/debian/changelog b/debian/changelog
index f3f84db..ab4d036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg-docs (1:1.7-1) UNRELEASED; urgency=low
use dh_testroot in clean.
* Bump xorg-sgml-doctools, xutils-dev and xmlto build-deps per configure.ac.
* Rebase all patches.
+ * Disable silent build rules.
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
diff --git a/debian/rules b/debian/rules
index ed622e6..fcefc5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ build-stamp: $(STAMP_DIR)/patch
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
$(confflags) \
+ --disable-silent-rules \
--enable-docs \
--enable-specs \
--with-xmlto \
commit be9165e0c04744321b58ba94a771ce6bac552fa7
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:20:22 2013 +0200
Rebase all patches.
diff --git a/debian/changelog b/debian/changelog
index fb735f9..f3f84db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg-docs (1:1.7-1) UNRELEASED; urgency=low
* Stop setting CFLAGS in debian/rules (we don't build anything), and don't
use dh_testroot in clean.
* Bump xorg-sgml-doctools, xutils-dev and xmlto build-deps per configure.ac.
+ * Rebase all patches.
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
diff --git a/debian/patches/01-disable-ps-generation.diff b/debian/patches/01-disable-ps-generation.diff
index b0dc65d..8c670a5 100644
--- a/debian/patches/01-disable-ps-generation.diff
+++ b/debian/patches/01-disable-ps-generation.diff
@@ -1,31 +1,17 @@
Don't build *.ps, we're not shipping them.
---- a/xmlrules.in
-+++ b/xmlrules.in
-@@ -25,7 +25,7 @@ if HAVE_XMLTO
- xml_DATA = $(doc_sources:.xml=.html)
-
- if HAVE_FOP
--xml_DATA += $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf)
-+xml_DATA += $(doc_sources:.xml=.pdf)
- endif
-
- if HAVE_XMLTO_TEXT
-@@ -42,7 +42,7 @@ endif
-
- CLEANFILES = $(xml_DATA)
-
--SUFFIXES = .xml .ps .pdf .txt .html
-+SUFFIXES = .xml .pdf .txt .html
-
- %.txt: %.xml $(dist_xml_DATA)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $<
-@@ -53,9 +53,6 @@ SUFFIXES = .xml .ps .pdf .txt .html
- %.pdf: %.xml $(dist_xml_DATA)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-
--%.ps: %.xml $(dist_xml_DATA)
-- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop ps $<
+
+diff --git a/docbook.am b/docbook.am
+index bba4d54..776c465 100644
+--- a/docbook.am
++++ b/docbook.am
+@@ -62,10 +62,6 @@ XMLTO_FO_FLAGS = \
+ shelf_DATA += $(docbook:.xml=.pdf)
+ %.pdf: %.xml $(chapters)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
-
- chunked-html: $(doc_sources)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+-shelf_DATA += $(docbook:.xml=.ps)
+-%.ps: %.xml $(chapters)
+- $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $<
+ endif HAVE_FOP
+ # Generate documents cross-reference target databases
diff --git a/debian/patches/02-disable-automatic-size-detection.diff b/debian/patches/02-disable-automatic-size-detection.diff
index f80b21c..5274cbf 100644
--- a/debian/patches/02-disable-automatic-size-detection.diff
+++ b/debian/patches/02-disable-automatic-size-detection.diff
@@ -1,13 +1,16 @@
Don't use local settings (LC_PAPER), disable paper size autodetection.
---- a/xmlrules.in
-+++ b/xmlrules.in
-@@ -37,7 +37,8 @@ XMLTO_FLAGS = \
- -m $(XSL_STYLESHEET) \
- --searchpath $(XORG_SGML_PATH)/X11 \
- --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css \
-- --stringparam img.src.path=$(abs_builddir)/
-+ --stringparam img.src.path=$(abs_builddir)/ \
-+ --noautosize
- endif
+
+diff --git a/docbook.am b/docbook.am
+index bba4d54..7425a1c 100644
+--- a/docbook.am
++++ b/docbook.am
+@@ -47,7 +47,8 @@ shelf_DATA += $(docbook:.xml=.txt)
+ endif HAVE_XMLTO_TEXT
- CLEANFILES = $(xml_DATA)
+ if HAVE_FOP
+-XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/
++XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ \
++ --noautosize
+ XMLTO_PDF_OLINK_FLAGS = \
+ --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \
+ --stringparam current.docid="$(<:.xml=)"
diff --git a/debian/patches/03-tell-xmlto-to-be-quiet.diff b/debian/patches/03-tell-xmlto-to-be-quiet.diff
index c9e1afb..de47661 100644
--- a/debian/patches/03-tell-xmlto-to-be-quiet.diff
+++ b/debian/patches/03-tell-xmlto-to-be-quiet.diff
@@ -1,11 +1,13 @@
---- a/xmlrules.in
-+++ b/xmlrules.in
-@@ -52,7 +52,7 @@ SUFFIXES = .xml .pdf .txt .html
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
+Index: xorg-docs/docbook.am
+===================================================================
+--- xorg-docs.orig/docbook.am
++++ xorg-docs/docbook.am
+@@ -62,7 +62,7 @@ XMLTO_FO_FLAGS = \
- %.pdf: %.xml $(dist_xml_DATA)
-- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $<
-+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) --with-fop pdf $< >/dev/null 2>&1
+ shelf_DATA += $(docbook:.xml=.pdf)
+ %.pdf: %.xml $(chapters)
+- $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $<
++ $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< >/dev/null
+ endif HAVE_FOP
- chunked-html: $(doc_sources)
- $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+ # Generate documents cross-reference target databases
commit 3d0800d3eb3025f3cdd2daa38bf758736eff4761
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:05:04 2013 +0200
Bump xorg-sgml-doctools, xutils-dev and xmlto build-deps per configure.ac.
diff --git a/debian/changelog b/debian/changelog
index 6901b5e..fb735f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-docs (1:1.7-1) UNRELEASED; urgency=low
* Remove David from Uploaders.
* Stop setting CFLAGS in debian/rules (we don't build anything), and don't
use dh_testroot in clean.
+ * Bump xorg-sgml-doctools, xutils-dev and xmlto build-deps per configure.ac.
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
diff --git a/debian/control b/debian/control
index 951ca22..56454f9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,12 @@ Build-Depends:
debhelper (>= 7),
quilt,
pkg-config,
- xorg-sgml-doctools (>= 1:1.6),
+ xorg-sgml-doctools (>= 1:1.8),
docbook-xml,
automake,
autoconf,
- xutils-dev (>= 1:7.5+5),
- xmlto,
+ xutils-dev (>= 1:7.6+2),
+ xmlto (>= 0.0.22),
fop,
w3m,
Standards-Version: 3.8.3
commit 8e68c2b7097ad23f8b308907a02228daed6afb9a
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 17 00:02:06 2013 +0200
Some debian/rules simplification
Stop setting CFLAGS (we don't build anything), and don't use dh_testroot
in clean.
diff --git a/debian/changelog b/debian/changelog
index 8bd20cf..6901b5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-docs (1:1.7-1) UNRELEASED; urgency=low
* New upstream release (X11R7.7).
* Bump debhelper compat to 7.
* Remove David from Uploaders.
+ * Stop setting CFLAGS in debian/rules (we don't build anything), and don't
+ use dh_testroot in clean.
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
diff --git a/debian/rules b/debian/rules
index 303c418..ed622e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,17 +11,6 @@ PACKAGE = xorg-docs
include debian/xsfbs/xsfbs.mk
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-#ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-# NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-# MAKEFLAGS += -j$(NUMJOBS)
-#endif
-
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -44,14 +33,12 @@ build-stamp: $(STAMP_DIR)/patch
--enable-docs \
--enable-specs \
--with-xmlto \
- --with-fop \
- CFLAGS="$(CFLAGS)"
+ --with-fop
$(MAKE) -C build
>$@
clean: xsfclean
dh_testdir
- dh_testroot
rm -f build-stamp
rm -rf autom4te.cache */autom4te.cache
rm -rf build
@@ -65,7 +52,6 @@ install: build
dh_testroot
dh_prep
dh_installdirs
-
$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
mv $(CURDIR)/debian/tmp/usr/share/man/man7/Standards.7 \
$(CURDIR)/debian/tmp/usr/share/man/man7/XStandards.7
@@ -76,7 +62,6 @@ install: build
binary-indep: build install
dh_testdir
dh_testroot
-
dh_installdocs
dh_installman
find debian/tmp -name '*.xml' -delete
commit d73c84275a61aa54f779bd34fde9f74c51c02f16
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 16 20:40:35 2013 +0200
Remove David from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 4a4a44d..8bd20cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xorg-docs (1:1.7-1) UNRELEASED; urgency=low
* New upstream release (X11R7.7).
* Bump debhelper compat to 7.
+ * Remove David from Uploaders.
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
diff --git a/debian/control b/debian/control
index e42f58e..951ca22 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg-docs
Section: doc
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 7),
quilt,
commit 98f8d18ab91debcb369dec1da4555e6a9be67dec
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 16 20:40:18 2013 +0200
Bump debhelper compat to 7.
diff --git a/debian/changelog b/debian/changelog
index d03438f..4a4a44d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xorg-docs (1:1.7-1) UNRELEASED; urgency=low
* New upstream release (X11R7.7).
+ * Bump debhelper compat to 7.
-- Julien Cristau <jcristau@debian.org> Mon, 16 Sep 2013 20:36:22 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 1a3d760..e42f58e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 7),
quilt,
pkg-config,
xorg-sgml-doctools (>= 1:1.6),
diff --git a/debian/rules b/debian/rules
index f3e6e9e..303c418 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ clean: xsfclean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
@@ -80,7 +80,7 @@ binary-indep: build install
dh_installdocs
dh_installman
find debian/tmp -name '*.xml' -delete
- dh_install --sourcedir=debian/tmp --fail-missing \
+ dh_install --fail-missing \
-Xplatforms/Darwin \
-Xplatforms/Solaris
dh_installchangelogs ChangeLog
commit 9681304fdbf296ecef7d4556af2ebf42546b9383
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Sep 16 20:36:52 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 787b409..4ad9924 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,633 @@
+commit 4685143df66c83c0b7be67de013f3ab5b06a3b1d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jun 4 21:39:52 2012 -0700
+
+ xorg-docs 1.7 (X11R7.7)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1647916ff5e93243c7101b831b0a92a47ebefd9e
+Author: Guillem Jover <guillem@hadrons.org>
+Date: Mon Apr 2 00:47:53 2012 +0200
+
+ Release Notes: Add dummy and glide as included video drivers
+
+ Sync the list of video drivers with the ones included in the katamari.
+
+ Signed-off-by: Guillem Jover <guillem@hadrons.org>
+
+commit ce9998bf6ea1c3a9a63f386d7ceafed73a1ecc59
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Apr 18 22:35:41 2012 -0700
+
+ Comment out mention of X-Resource 1.2 in release notes
+
+ Since only the protocol headers actually made it in time, skip describing
+ it now, hold off until the server & client bits are there so people can
+ use it.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 64d8161650f0817d6c818c3d90e27a8b66fdf3dc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Apr 14 10:27:44 2012 -0700
+
+ xorg-docs 1.6.99.901 (1.7 RC1) snapshot for X11R7.7 RC1 docs
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bf9fa7fd4826643398b48cb01574d5cd8148ebca
+Author: Josh Triplett <josh@joshtriplett.org>
+Date: Fri Apr 6 21:42:12 2012 -0700
+
+ Update DDC/DPI description to match current Xorg implementation
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 04d5b1bb93aec1c9c1f6e6beddb471a5baf07066
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Apr 6 21:36:03 2012 -0700
+
+ Give more details about nested/virtual server deprecation
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a5acad6e8212f2fe552c7cc921207d646b64f6c9
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Mar 31 19:29:55 2012 -0700
+
+ Release Notes: Add nested & virtual X servers to potential future removals
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 85e1f83696999930f36aff36fc6c72f100e0be54
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Mar 31 19:04:43 2012 -0700
+
+ Release Notes: More new feature details
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 9a08d20d5ee82673690d6881e670569d8ab1cba1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Mar 31 15:22:17 2012 -0700
+
+ Release Notes: Merge in credits for xkeyboard-config
+
+ Since we didn't include xkb-config in the last katamari, used the
+ xkeyboard-config-2.0 release/tag from the same time as the baseline
+ instead of going back to the dawn of xkb-config.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ed7423f6331ce0ad306e7ddb7d9fc3300f0ad06d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 30 20:39:06 2012 -0700
+
+ Release Notes: add note about new strict compilation flags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 7c75b1ab2ce0527638b811c4d17befecf845238c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 30 18:49:27 2012 -0700
+
+ Release Notes: Add note on grab debugging keystrokes in Xorg 1.11 & later
+
+ Includes warning of security risks, especially when xkeyboard-config < 2.5
+ is used.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 8fca296e388b549c2b0d478a49ad997f29355a21
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Mar 31 14:15:20 2012 -0700
+
+ Preliminary credits list
+
+ Based on current git logs for changes in katamari components since
+ the tags for the prior release, including names listed in both
+ Author: and *-by: entries. (With manual removal of duplicates and
+ invalid entries.)
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 80a3ee75e019d9d209bea92c62f5d49fad5206ea
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 30 17:42:38 2012 -0700
+
+ Release Notes: clarify Xserver(1) vs. Xorg(1) man pages
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 15ac702023d29672ab3b94ed42a9281a67f86393
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Mar 26 21:46:15 2012 -0700
+
+ Update driver maintenance/status for upcoming 7.7 katamari
+
+ MAINTAINERS:
+ - Add driver-specific mailing lists & web pages for ATI, Intel & Geode
+ - Add driver entries for geode, nested, qxl, and xgixp drivers
+ - Mark cyrix, nsc, & via as obsolete
+
+ Release Notes:
+ - Move drivers not being included in katamari from drivers table to
+ removed table
+ - Update README links to use .txt since drivers no longer generate
+ html READMEs from SGML
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d47119a09fcef6011495d1dffa4d196352ba7c97
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Mar 20 23:58:18 2012 -0700
+
+ Solaris.xml: update for Solaris 11 release
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3c2f23d4ff2d083392f8f51cef4eae037212a46b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Mar 20 23:50:32 2012 -0700
+
+ Start updating README & Release Notes for 7.7 katamari
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d931a0f864755e284f6c761a906b54e8280a005e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 16 23:16:26 2012 -0700
+
+ Convert ``...'' and `...' quotes to <quote>...</quote>
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 7f206681eb8b44c309577c56f123673291a71ca1
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 16 23:03:58 2012 -0700
+
+ Update fonts documentation
+
+ Fix a bunch of links, including using olinks for other X.Org docs.
+ Clarify some wording in various areas.
+
+ Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 01451aa25f42bb998fdbab638e04352977f8017f
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Mar 19 22:59:08 2012 -0700
+
+ Add id's to general docs for better cross linking, less randomization of output
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 88a2f252900c8093c8035c0aa76dc974036c4dca
+Author: Dave Airlie <airlied@redhat.com>
+Date: Wed Feb 22 10:01:38 2012 +0000
+
+ add maintainers entry for -modesetting
+
+ Signed-off-by: Dave Airlie <airlied@redhat.com>
+
+commit 157ee156d6723a166e60af7de0e8db36c53bc219
+Author: Matt Dew <marcoz@osource.org>
+Date: Sun Jan 8 20:26:06 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 dfcb585eca08c0962592dcc45354b76a00328147
+Author: Matt Dew <marcoz@osource.org>
+Date: Sun Jan 8 18:10:11 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 b42b8eb225bced5be83b38668813a3ee5067d7cb
+Author: Matt Dew <marcoz@osource.org>
+Date: Mon Jan 2 20:16:06 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>
+ Acked-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 315de17bb44850a4f584f92541f1276a5f589595
+Author: Matt Dew <marcoz@osource.org>
+Date: Mon Oct 10 20:43:26 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 af47bd3c8cd03df5d791f091808d4b68605ec219
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Sep 27 11:07:26 2011 +1000
+
+ MAINTAINERS: acecad is unmaintained
+
+ I haven't heard from Guiseppe for too long.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 84bea7c5a208c7ead76a9233ffe82e06bd959386
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Sep 22 14:01:46 2011 -0400
+
+ xlfd: fix typo in copyright text
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bacc9c976baffd965192418ef4492686a77420f9
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Sep 22 09:27:39 2011 -0400
+
+ xlfd: missing copyright (c) symbol
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 33c90c0aaee268ea08e8b480e8ee63492bb9163b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 21 20:50:52 2011 -0400
+
+ XACE: fix copyright text
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 67524bdc49ef54248000cf2a31dfa3dee2d1271b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 21 20:42:52 2011 -0400
+
+ secint: fix author affiliation and copyright text
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e3a0b1f5b18bcc0bac59cdfa96e68ebb9580c27b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 21 20:40:19 2011 -0400
+
+ appgroup: fix copyright legal text
+
+ Missing text, duplicate abstract and so on...
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit dc5bf2c6fb0d2096aa16358291d6405f0381ea0d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 21 20:34:06 2011 -0400
+
+ analysis: fix author affiliation and copyright text
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c20f068d6fda35b33d5acd785d648bfbcf990a24
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 21 20:26:49 2011 -0400
+
+ xlfd: fix author affiliation and refactor legal text for multi licensing
+
+ Note that "X Window System is a trademark of The Open Group" is part
+ of the X Consortium license as opposed to free standing information.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bd90a4a32fb9028d1d0479116e5f0537004046d3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 21 20:17:03 2011 -0400
+
+ icccm: refactor copyright license text for multi licensing
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c362660a862c0c50306a989e7a45e926824ac571
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 21 20:10:41 2011 -0400
+
+ ctext: fix author affiliation
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 9079b31432832333971a857fcf14956e8bc6e271
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Tue Sep 20 12:17:34 2011 +1000
+
+ MAINTAINERS: microtouch was deactivated in 2009
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 4d3d43c16aa5049a815942c85dd7f00575e63cda
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu May 26 12:11:41 2011 +1000
+
+ MAINTAINERS: Remove Christoph from synaptics
+
+ Christoph has stated that he doesn't have the time to actively maintain
+ synaptics anymore.
+
+ CC: Christoph Brill <egore911@egore911.de>
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 23a4680d2eadaca482185925bd2d7001c5d78f99
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 14 11:34:57 2011 -0400
+
+ Solaris: shorten the title a bit
+
+ OpenSolaris has been deprecated in favor of Solaris Express
+ The Solaris brand name is generic enough for all flavors of Solaris
+ X.Org is not mentioned in the title of any document.
+ Now that "X Version 11, Release 7.6" has been added, it should make
+ the title page as informative as any other document.
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 21a58910167d6a1c2c4eeed51ddbfac63703628f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 14 11:31:47 2011 -0400
+
+ Solaris: set X11 release information
+
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 289130cea7933152556863840c789e1a458345e6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 14 13:19:47 2011 -0400
+
+ Fix ENTITY declaration for defs.ent
+
+ The path /xorg-sgml-doctools/X11 does not exist.
+ The makefile use --searchpath "$(XORG_SGML_PATH)/X11" to locate entities.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 92616bd4bad5d90221e4361603953710c7c184e1
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 14 10:42:44 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 45f2518a1b1a96ad77a4dd2d004f3bfb2ddf7f6d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Sep 13 16:53:56 2011 -0400
+
+ Use appropriate markup for publication date
+
+ Use the &fullrelvers; entity to set X11 release information
+
Reply to: