xorg-docs: Changes to 'debian-unstable'
.gitignore | 82
ChangeLog | 957 +
MAINTAINERS | 60
Makefile.am | 88
README | 8
configure.ac | 73
debian/changelog | 37
debian/control | 12
debian/copyright | 456
debian/patches/01-disable-ps-generation.diff | 31
debian/patches/02-disable-automatic-size-detection.diff | 13
debian/patches/03-tell-xmlto-to-be-quiet.diff | 11
debian/patches/series | 3
debian/rules | 19
debian/xorg-docs.install | 84
debian/xorg-docs.links | 2
general/License.xml | 744 +
general/Makefile.am | 17
general/README.xml | 345
general/ReleaseNotes.xml | 2045 +++
general/Versions.xml | 329
general/fonts/Makefile.am | 10
general/fonts/fonts.xml | 1950 ++
general/graphics/Makefile.am | 10
general/graphics/dps.xml | 81
general/input/Makefile.am | 10
general/input/XKB-Config.xml | 319
general/input/XKB-Enhancing.xml | 876 +
general/platforms/Darwin.xml | 42
general/platforms/Makefile.am | 12
general/platforms/Solaris.xml | 174
man/.gitignore | 1
man/Consortium.man | 236
man/Makefile.am | 24
man/Standards.man | 433
man/X.man | 1325 ++
man/XOrgFoundation.man | 57
man/XProjectTeam.man | 89
man/Xsecurity.man | 262
man/general/Consortium.man | 239
man/general/Makefile.am | 58
man/general/Standards.man | 435
man/general/X.man | 1334 --
man/general/XOrgFoundation.man | 57
man/general/XProjectTeam.man | 91
man/general/Xsecurity.man | 242
misc/xlogo.epsi | 1
registry | 58
sgml/.gitignore | 2
sgml/Install.sgml | 50
sgml/Japanese/1st.sgml | 104
sgml/Japanese/read98.sgml | 265
sgml/LICENSE.sgml | 741 -
sgml/Makefile.am | 41
sgml/README.sgml | 331
sgml/RELNOTES.sgml | 2084 ---
sgml/Versions.sgml | 298
sgml/add.sh | 13
sgml/core/Makefile.am | 5
sgml/core/Xserver-spec.sgml | 5180 -------
sgml/fonts/Makefile.am | 5
sgml/fonts/fonts.sgml | 1954 --
sgml/graphics/Makefile.am | 5
sgml/graphics/dps.sgml | 379
sgml/index.post | 31
sgml/index.pre | 19
sgml/input/Makefile.am | 5
sgml/input/XKB-Config.sgml | 365
sgml/input/XKB-Enhancing.sgml | 898 -
sgml/mdefs.pre | 20
sgml/platforms/Darwin.sgml | 39
sgml/platforms/Makefile.am | 11
sgml/platforms/NetBSD.sgml | 797 -
sgml/platforms/OpenBSD.sgml | 476
sgml/platforms/SCO.sgml | 278
sgml/platforms/Solaris.sgml | 173
sgml/security/Makefile.am | 5
sgml/security/XACE-Spec.sgml | 1040 -
sgmlrules.in | 62
specs/BDF/bdf.ms | 1
specs/CTEXT/Makefile.am | 9
specs/CTEXT/ctext.tbl.ms | 450
specs/CTEXT/ctext.xml | 879 +
specs/FSProtocol/protocol.ms | 3602 -----
specs/GL/libGL.txt | 197
specs/ICCCM/Makefile.am | 9
specs/ICCCM/icccm.ms | 5721 --------
specs/ICCCM/icccm.xml | 9092 +++++++++++++
specs/ICCCM/indexmacros.t | 3
specs/ICE/ICElib.ms | 3400 -----
specs/ICE/ice.ms | 1878 --
specs/Makefile.am | 1
specs/SIAddresses/.gitignore | 4
specs/XDMCP/xdmcp.ms | 2177 ---
specs/XLFD/Makefile.am | 9
specs/XLFD/xlfd.tbl.ms | 2827 ----
specs/XLFD/xlfd.xml | 4124 ++++++
specs/XProtocol/Makefile | 25
specs/XProtocol/X11.encoding | 4434 ------
specs/XProtocol/X11.keysyms | 1286 -
specs/XProtocol/X11.protocol |10551 ----------------
specs/XProtocol/glossary | 1028 -
specs/XProtocol/indexmacros.t | 3
specs/XProtocol/postproc | 14
specs/Xext/DPMS.ms | 465
specs/Xext/DPMSLib.ms | 331
specs/Xext/bigreq.ms | 224
specs/Xext/buffer.ms | 1301 -
specs/Xext/dbe.tex | 782 -
specs/Xext/dbelib.tex | 621
specs/Xext/evi.ms | 344
specs/Xext/mit-shm.ms | 358
specs/Xext/record.ms | 1472 --
specs/Xext/recordlib.ms | 1409 --
specs/Xext/security.tex | 834 -
specs/Xext/shape.ms | 954 -
specs/Xext/shapelib.ms | 556
specs/Xext/sync.tex | 1010 -
specs/Xext/synclib.tex | 773 -
specs/Xext/tog-cup.ms | 396
specs/Xext/xc-misc.ms | 222
specs/Xext/xtest.ms | 483
specs/Xext/xtestlib.ms | 446
specs/Xi/encoding.ms | 2016 ---
specs/Xi/library.ms | 6313 ---------
specs/Xi/porting.ms | 990 -
specs/Xi/protocol.txt | 4
specs/Xmu/Xmu.ms | 2494 ---
specs/Xserver/Makefile.am | 9
specs/Xserver/XACE-Spec.xml | 1040 +
specs/Xserver/analysis.tex | 1528 --
specs/Xserver/analysis.xml | 2217 +++
specs/Xserver/appgroup.ms | 188
specs/Xserver/appgroup.xml | 248
specs/Xserver/ddx.tbl.ms | 2
specs/Xserver/secint.tex | 219
specs/Xserver/secint.xml | 294
specs/Xt/CH01 | 2471 ---
specs/Xt/CH02 | 3165 ----
specs/Xt/CH03 | 1031 -
specs/Xt/CH04 | 1998 ---
specs/Xt/CH05 | 783 -
specs/Xt/CH06 | 1110 -
specs/Xt/CH07 | 3555 -----
specs/Xt/CH08 | 452
specs/Xt/CH09 | 3211 ----
specs/Xt/CH10 | 1521 --
specs/Xt/CH11 | 3566 -----
specs/Xt/CH12 | 1067 -
specs/Xt/CH13 | 805 -
specs/Xt/Xtk.intr.front | 334
specs/Xt/appA | 107
specs/Xt/appB | 783 -
specs/Xt/appC | 1204 -
specs/Xt/appD | 602
specs/Xt/appE | 606
specs/Xt/appF | 125
specs/Xt/intr.idxmac.t | 3
specs/Xt/postproc | 19
specs/Xt/strings.mit | 17
specs/saver/saver.ms | 881 -
util/block.awk | 22
util/fixindex.awk | 73
util/indexmacros.t | 42
util/macros.t | 226
xmlrules.in | 65
166 files changed, 29091 insertions(+), 112538 deletions(-)
New commits:
commit 5523a0a43359471e318e7b713231d03388c5bdc6
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:48:39 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index f307b3a..448b438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
+xorg-docs (1:1.5.99.901-1) unstable; urgency=low
[ Julien Cristau ]
* Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
@@ -36,7 +36,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
pointing there.
* Add myself to Uploaders.
- -- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 14:48:12 +0100
+ -- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 16:48:34 +0100
xorg-docs (1:1.5-1) unstable; urgency=low
commit 695ef35e73da26ce8e4f72aa2786cfd3f255d5d0
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:48:15 2010 +0100
Add w3m build-dep, needed for txt output.
diff --git a/debian/changelog b/debian/changelog
index ddba045..f307b3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,7 +14,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
+ Pass --enable-docs and --enable-specs to configure (the default, but
let's make sure).
+ Pass --with-xmlto and --with-fop, building html+txt+pdf.
- + Add xmlto and fop build-dep accordingly.
+ + Add xmlto, fop, and w3m build-dep accordingly.
+ Add 01-disable-ps-generation.diff, no point in shipping pdf and ps.
+ Add 02-disable-automatic-size-detection.diff to pass --noautosize to
xmlto.
diff --git a/debian/control b/debian/control
index 88b0832..834903b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
xutils-dev (>= 1:7.5+5),
xmlto,
fop,
+ w3m,
Standards-Version: 3.8.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/doc/xorg-docs
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/doc/xorg-docs.git
commit 10c196e921ff824ff762d6e2e0fc6d4a130414f7
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:38:53 2010 +0100
Add quilt build-dep again.
diff --git a/debian/changelog b/debian/changelog
index c997345..ddba045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
waaay too chatty.
+ Accordingly, make build-stamp depend on $(STAMP_DIR)/patch rather
than on $(STAMP_DIR)/prepare
+ + Add quilt build-dep again.
+ Kill *.xml, no need to install them.
+ Switch from --list-missing to --fail-missing for additional safety.
+ Rework xorg-docs.install from scratch, installing html+txt+pdf
diff --git a/debian/control b/debian/control
index b3c1070..88b0832 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ 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),
+ quilt,
pkg-config,
xorg-sgml-doctools (>= 1:1.5.99.901),
docbook-xml,
commit 7e45c098af973d900a6dc69df3880a36314f2aae
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:16:20 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 8e97666..c997345 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
symlinked from /usr/share/doc/xorg-docs/docs. Upstream now ships in
/usr/share/doc/xorg-doc, so keep /usr/share/X11/doc as a symlink
pointing there.
+ * Add myself to Uploaders.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 14:48:12 +0100
diff --git a/debian/control b/debian/control
index 08d7051..b3c1070 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>
+Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit a538811828787dd2e5281bb6758ebc0edc1075c1
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:16:00 2010 +0100
Install *.pdf files.
diff --git a/debian/changelog b/debian/changelog
index 632d99f..8e97666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,9 +24,9 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
than on $(STAMP_DIR)/prepare
+ Kill *.xml, no need to install them.
+ Switch from --list-missing to --fail-missing for additional safety.
- + Rework xorg-docs.install from scratch, installing html+txt files,
- MAINTAINERS, and discarding platforms (the only ones available
- aren't of interest for Debian systems).
+ + Rework xorg-docs.install from scratch, installing html+txt+pdf
+ files, MAINTAINERS, and discarding platforms (the only ones
+ available aren't of interest for Debian systems).
+ Remove docbook* build-dep, no longer needed.
+ No longer pass --disable-shared, this option is gone.
* Update the symlink: Upstream used to ship in /usr/share/X11/doc,
diff --git a/debian/xorg-docs.install b/debian/xorg-docs.install
index 5c3a503..f0f79a9 100644
--- a/debian/xorg-docs.install
+++ b/debian/xorg-docs.install
@@ -1,17 +1,25 @@
usr/share/doc/xorg-docs/MAINTAINERS
usr/share/doc/xorg-docs/*.html
usr/share/doc/xorg-docs/*.txt
+usr/share/doc/xorg-docs/*.pdf
usr/share/doc/xorg-docs/graphics/*.html
usr/share/doc/xorg-docs/graphics/*.txt
+usr/share/doc/xorg-docs/graphics/*.pdf
usr/share/doc/xorg-docs/fonts/*.html
usr/share/doc/xorg-docs/fonts/*.txt
+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/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
commit 027b05e9e0570a1f18c324272cc8ec98d296e173
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:07:46 2010 +0100
Add xmlto and fop build-dep accordingly.
diff --git a/debian/changelog b/debian/changelog
index 1021c6f..632d99f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
+ Pass --enable-docs and --enable-specs to configure (the default, but
let's make sure).
+ Pass --with-xmlto and --with-fop, building html+txt+pdf.
+ + Add xmlto and fop build-dep accordingly.
+ Add 01-disable-ps-generation.diff, no point in shipping pdf and ps.
+ Add 02-disable-automatic-size-detection.diff to pass --noautosize to
xmlto.
diff --git a/debian/control b/debian/control
index cea5a05..08d7051 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,8 @@ Build-Depends:
automake,
autoconf,
xutils-dev (>= 1:7.5+5),
+ xmlto,
+ fop,
Standards-Version: 3.8.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/doc/xorg-docs
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/doc/xorg-docs.git
commit 0ae1d03359c6c3a92b70f7ba07e5bd392f0b6219
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:07:00 2010 +0100
Cosmetic: move CFLAGS to the end of the configure line.
diff --git a/debian/rules b/debian/rules
index 671cd2e..f3e6e9e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,11 +40,12 @@ build-stamp: $(STAMP_DIR)/patch
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
- $(confflags) CFLAGS="$(CFLAGS)" \
+ $(confflags) \
--enable-docs \
--enable-specs \
--with-xmlto \
- --with-fop
+ --with-fop \
+ CFLAGS="$(CFLAGS)"
$(MAKE) -C build
>$@
commit 0b0ed5da7e79757e7c573a7e3723f407f4fe6022
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:06:23 2010 +0100
No longer pass --disable-shared, this option is gone.
diff --git a/debian/changelog b/debian/changelog
index 7908dee..1021c6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
MAINTAINERS, and discarding platforms (the only ones available
aren't of interest for Debian systems).
+ Remove docbook* build-dep, no longer needed.
+ + No longer pass --disable-shared, this option is gone.
* Update the symlink: Upstream used to ship in /usr/share/X11/doc,
symlinked from /usr/share/doc/xorg-docs/docs. Upstream now ships in
/usr/share/doc/xorg-doc, so keep /usr/share/X11/doc as a symlink
diff --git a/debian/rules b/debian/rules
index 7fe0e3f..671cd2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,7 +39,7 @@ build-stamp: $(STAMP_DIR)/patch
mkdir -p build
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --disable-shared \
+ --infodir=\$${prefix}/share/info \
$(confflags) CFLAGS="$(CFLAGS)" \
--enable-docs \
--enable-specs \
commit e6cd3c189485314dbcfb1c4f02f57a3e67ac109f
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:05:19 2010 +0100
Add 03-tell-xmlto-to-be-quiet.diff since pdf generation tends to be waaay too chatty.
diff --git a/debian/changelog b/debian/changelog
index 350a7d6..7908dee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
+ Add 01-disable-ps-generation.diff, no point in shipping pdf and ps.
+ Add 02-disable-automatic-size-detection.diff to pass --noautosize to
xmlto.
+ + Add 03-tell-xmlto-to-be-quiet.diff since pdf generation tends to be
+ waaay too chatty.
+ Accordingly, make build-stamp depend on $(STAMP_DIR)/patch rather
than on $(STAMP_DIR)/prepare
+ Kill *.xml, no need to install them.
diff --git a/debian/patches/03-tell-xmlto-to-be-quiet.diff b/debian/patches/03-tell-xmlto-to-be-quiet.diff
new file mode 100644
index 0000000..c9e1afb
--- /dev/null
+++ b/debian/patches/03-tell-xmlto-to-be-quiet.diff
@@ -0,0 +1,11 @@
+--- a/xmlrules.in
++++ b/xmlrules.in
+@@ -52,7 +52,7 @@ SUFFIXES = .xml .pdf .txt .html
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) xhtml-nochunks $<
+
+ %.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
+
+ chunked-html: $(doc_sources)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
diff --git a/debian/patches/series b/debian/patches/series
index eca1fd7..0a52276 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-disable-ps-generation.diff
02-disable-automatic-size-detection.diff
+03-tell-xmlto-to-be-quiet.diff
commit 8ddd1a4d7a913d7c580f30c2fc8b18fc41880f22
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 16:01:54 2010 +0100
Add 02-disable-automatic-size-detection.diff to pass --noautosize to xmlto.
diff --git a/debian/changelog b/debian/changelog
index f5f69d8..350a7d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
let's make sure).
+ Pass --with-xmlto and --with-fop, building html+txt+pdf.
+ Add 01-disable-ps-generation.diff, no point in shipping pdf and ps.
+ + Add 02-disable-automatic-size-detection.diff to pass --noautosize to
+ xmlto.
+ Accordingly, make build-stamp depend on $(STAMP_DIR)/patch rather
than on $(STAMP_DIR)/prepare
+ Kill *.xml, no need to install them.
diff --git a/debian/patches/02-disable-automatic-size-detection.diff b/debian/patches/02-disable-automatic-size-detection.diff
new file mode 100644
index 0000000..f80b21c
--- /dev/null
+++ b/debian/patches/02-disable-automatic-size-detection.diff
@@ -0,0 +1,13 @@
+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
+
+ CLEANFILES = $(xml_DATA)
diff --git a/debian/patches/series b/debian/patches/series
index 156c1b2..eca1fd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-disable-ps-generation.diff
+02-disable-automatic-size-detection.diff
commit d93011c85d756f85399eadf63dff97504c277012
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 15:55:58 2010 +0100
Accordingly, make build-stamp depend on $(STAMP_DIR)/patch rather than on $(STAMP_DIR)/prepare
diff --git a/debian/changelog b/debian/changelog
index 7ad22f0..f5f69d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
let's make sure).
+ Pass --with-xmlto and --with-fop, building html+txt+pdf.
+ Add 01-disable-ps-generation.diff, no point in shipping pdf and ps.
+ + Accordingly, make build-stamp depend on $(STAMP_DIR)/patch rather
+ than on $(STAMP_DIR)/prepare
+ Kill *.xml, no need to install them.
+ Switch from --list-missing to --fail-missing for additional safety.
+ Rework xorg-docs.install from scratch, installing html+txt files,
diff --git a/debian/rules b/debian/rules
index 72946ea..7fe0e3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ endif
build: build-stamp
-build-stamp: $(STAMP_DIR)/prepare
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
autoreconf -vfi
mkdir -p build
commit 92f3eb7ea910c4cae5b1c51885e5cf9b9953df29
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 15:46:41 2010 +0100
Add 01-disable-ps-generation.diff, no point in shipping pdf and ps.
diff --git a/debian/changelog b/debian/changelog
index 120a727..7ad22f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
+ Pass --enable-docs and --enable-specs to configure (the default, but
let's make sure).
+ Pass --with-xmlto and --with-fop, building html+txt+pdf.
+ + Add 01-disable-ps-generation.diff, no point in shipping pdf and ps.
+ Kill *.xml, no need to install them.
+ Switch from --list-missing to --fail-missing for additional safety.
+ Rework xorg-docs.install from scratch, installing html+txt files,
diff --git a/debian/patches/01-disable-ps-generation.diff b/debian/patches/01-disable-ps-generation.diff
new file mode 100644
index 0000000..b0dc65d
--- /dev/null
+++ b/debian/patches/01-disable-ps-generation.diff
@@ -0,0 +1,31 @@
+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 $<
+-
+ chunked-html: $(doc_sources)
+ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources)
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..156c1b2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-disable-ps-generation.diff
commit 83cd10a2fddf689b488adc33f530899a54d0e02b
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 15:43:41 2010 +0100
Update (reverse) /usr/share/X11/doc symlink.
diff --git a/debian/changelog b/debian/changelog
index d3c0c16..120a727 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
MAINTAINERS, and discarding platforms (the only ones available
aren't of interest for Debian systems).
+ Remove docbook* build-dep, no longer needed.
+ * Update the symlink: Upstream used to ship in /usr/share/X11/doc,
+ symlinked from /usr/share/doc/xorg-docs/docs. Upstream now ships in
+ /usr/share/doc/xorg-doc, so keep /usr/share/X11/doc as a symlink
+ pointing there.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 14:48:12 +0100
diff --git a/debian/xorg-docs.links b/debian/xorg-docs.links
index a0c6caf..fe2c93c 100644
--- a/debian/xorg-docs.links
+++ b/debian/xorg-docs.links
@@ -1 +1 @@
-usr/share/X11/doc usr/share/doc/xorg-docs/docs
+usr/share/doc/xorg-docs/docs usr/share/X11/doc
commit 14cb48c2ef59c7b66a75ec5236a3d32371696f87
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 15:40:07 2010 +0100
Pass --with-fop.
diff --git a/debian/changelog b/debian/changelog
index 9ce4e92..d3c0c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
* Update build system:
+ Pass --enable-docs and --enable-specs to configure (the default, but
let's make sure).
- + Pass --with-xmlto and --without-fop, building html+txt.
+ + Pass --with-xmlto and --with-fop, building html+txt+pdf.
+ Kill *.xml, no need to install them.
+ Switch from --list-missing to --fail-missing for additional safety.
+ Rework xorg-docs.install from scratch, installing html+txt files,
diff --git a/debian/rules b/debian/rules
index 036e392..72946ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ build-stamp: $(STAMP_DIR)/prepare
--enable-docs \
--enable-specs \
--with-xmlto \
- --without-fop
+ --with-fop
$(MAKE) -C build
>$@
commit 81cb9be7177d945cadeab980f542d0633aa10071
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 15:31:46 2010 +0100
Bump xutils-dev build-dep for new macros.
diff --git a/debian/changelog b/debian/changelog
index 314c189..9ce4e92 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release candidate.
+ * Bump xutils-dev build-dep for new macros.
* Bump xorg-sgml-doctools build-dep.
* Use generated build/general/License.txt to update debian/copyright
since license/copying info is now in XML upstream.
diff --git a/debian/control b/debian/control
index 0d4414d..cea5a05 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
docbook-xml,
automake,
autoconf,
- xutils-dev (>= 1:7.5~)
+ xutils-dev (>= 1:7.5+5),
Standards-Version: 3.8.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/doc/xorg-docs
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/doc/xorg-docs.git
commit d8a5d07abdfa182585713f4d5fc0124d01e3a018
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 15:31:04 2010 +0100
Remove docbook* build-dep, no longer needed.
diff --git a/debian/changelog b/debian/changelog
index cbd7297..314c189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
+ Rework xorg-docs.install from scratch, installing html+txt files,
MAINTAINERS, and discarding platforms (the only ones available
aren't of interest for Debian systems).
+ + Remove docbook* build-dep, no longer needed.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 14:48:12 +0100
diff --git a/debian/control b/debian/control
index 1a6aea6..0d4414d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,6 @@ Uploaders: David Nusinow <dnusinow@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
- docbook-utils,
- docbook (>= 4.2),
xorg-sgml-doctools (>= 1:1.5.99.901),
docbook-xml,
automake,
commit 468f3e00a29ab817093c3d03254768e6a20400e9
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 15:29:36 2010 +0100
Fix excluding platforms/{Darwin,Solaris}.*
diff --git a/debian/changelog b/debian/changelog
index b36a204..cbd7297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,8 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
+ Kill *.xml, no need to install them.
+ Switch from --list-missing to --fail-missing for additional safety.
+ Rework xorg-docs.install from scratch, installing html+txt files,
- MAINTAINERS, and discarding platforms which aren't of interest for
- Debian systems.
+ MAINTAINERS, and discarding platforms (the only ones available
+ aren't of interest for Debian systems).
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 14:48:12 +0100
diff --git a/debian/rules b/debian/rules
index 661e682..036e392 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,9 @@ binary-indep: build install
dh_installdocs
dh_installman
find debian/tmp -name '*.xml' -delete
- dh_install --sourcedir=debian/tmp --fail-missing
+ dh_install --sourcedir=debian/tmp --fail-missing \
+ -Xplatforms/Darwin \
+ -Xplatforms/Solaris
dh_installchangelogs ChangeLog
dh_link
dh_compress
diff --git a/debian/xorg-docs.install b/debian/xorg-docs.install
index 67ae9d4..5c3a503 100644
--- a/debian/xorg-docs.install
+++ b/debian/xorg-docs.install
@@ -15,8 +15,3 @@ usr/share/doc/xorg-docs/specs/XLFD/*.html
usr/share/doc/xorg-docs/specs/XLFD/*.txt
usr/share/doc/xorg-docs/specs/Xserver/*.html
usr/share/doc/xorg-docs/specs/Xserver/*.txt
-
-# Discard platform-specific documentation, without specifying the
-# entire directory, some more docs may be added:
-usr/share/doc/xorg-docs/platforms/Darwin.* /dev/null
-usr/share/doc/xorg-docs/platforms/Solaris.* /dev/null
commit 413336d663007a08fcd6f79ef35ba76ea6afbc5a
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 15:16:32 2010 +0100
Update build system.
diff --git a/debian/changelog b/debian/changelog
index caaf066..b36a204 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,15 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
* Bump xorg-sgml-doctools build-dep.
* Use generated build/general/License.txt to update debian/copyright
since license/copying info is now in XML upstream.
+ * Update build system:
+ + Pass --enable-docs and --enable-specs to configure (the default, but
+ let's make sure).
+ + Pass --with-xmlto and --without-fop, building html+txt.
+ + Kill *.xml, no need to install them.
+ + Switch from --list-missing to --fail-missing for additional safety.
+ + Rework xorg-docs.install from scratch, installing html+txt files,
+ MAINTAINERS, and discarding platforms which aren't of interest for
+ Debian systems.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 14:48:12 +0100
diff --git a/debian/rules b/debian/rules
index d58feb3..661e682 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,9 +41,10 @@ build-stamp: $(STAMP_DIR)/prepare
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info --disable-shared \
$(confflags) CFLAGS="$(CFLAGS)" \
- --enable-html \
- --enable-txt \
- --enable-ps
+ --enable-docs \
+ --enable-specs \
+ --with-xmlto \
+ --without-fop
$(MAKE) -C build
>$@
@@ -77,7 +78,8 @@ binary-indep: build install
dh_installdocs
dh_installman
- dh_install --sourcedir=debian/tmp --list-missing --exclude "platforms"
+ find debian/tmp -name '*.xml' -delete
+ dh_install --sourcedir=debian/tmp --fail-missing
dh_installchangelogs ChangeLog
dh_link
dh_compress
diff --git a/debian/xorg-docs.install b/debian/xorg-docs.install
index 46e9d0b..67ae9d4 100644
--- a/debian/xorg-docs.install
+++ b/debian/xorg-docs.install
@@ -1,59 +1,22 @@
-usr/share/X11/doc/core/Xserver-spec.txt
-usr/share/X11/doc/core/Xserver-spec.pdf
-usr/share/X11/doc/core/Xserver-spec.ps
-usr/share/X11/doc/core/Xserver-spec.html
-usr/share/X11/doc/core/Xserver-spec.sgml
-usr/share/X11/doc/fonts
-usr/share/X11/doc/fonts/fonts.txt
-usr/share/X11/doc/fonts/fonts.pdf
-usr/share/X11/doc/fonts/fonts.ps
-usr/share/X11/doc/fonts/fonts.html
-usr/share/X11/doc/fonts/fonts.sgml
-usr/share/X11/doc/graphics
-usr/share/X11/doc/graphics/dps.txt
-usr/share/X11/doc/graphics/dps.pdf
-usr/share/X11/doc/graphics/dps.ps
-usr/share/X11/doc/graphics/dps.html
-usr/share/X11/doc/graphics/dps.sgml
-usr/share/X11/doc/input
-usr/share/X11/doc/input/XKB-Config.txt
-usr/share/X11/doc/input/XKB-Enhancing.txt
-usr/share/X11/doc/input/XKB-Config.pdf
-usr/share/X11/doc/input/XKB-Enhancing.pdf
-usr/share/X11/doc/input/XKB-Config.ps
-usr/share/X11/doc/input/XKB-Enhancing.ps
-usr/share/X11/doc/input/XKB-Config.html
-usr/share/X11/doc/input/XKB-Enhancing.html
-usr/share/X11/doc/input/XKB-Config.sgml
-usr/share/X11/doc/input/XKB-Enhancing.sgml
-usr/share/X11/doc/security/XACE-Spec.txt
-usr/share/X11/doc/security/XACE-Spec.pdf
-usr/share/X11/doc/security/XACE-Spec.ps
-usr/share/X11/doc/security/XACE-Spec.html
-usr/share/X11/doc/security/XACE-Spec.sgml
-usr/share/X11/doc/Install.txt
-usr/share/X11/doc/LICENSE.txt
-usr/share/X11/doc/README.txt
-usr/share/X11/doc/RELNOTES.txt
-usr/share/X11/doc/Versions.txt
-usr/share/X11/doc/Install.pdf
-usr/share/X11/doc/LICENSE.pdf
-usr/share/X11/doc/README.pdf
-usr/share/X11/doc/RELNOTES.pdf
-usr/share/X11/doc/Versions.pdf
-usr/share/X11/doc/Install.ps
-usr/share/X11/doc/LICENSE.ps
-usr/share/X11/doc/README.ps
-usr/share/X11/doc/RELNOTES.ps
-usr/share/X11/doc/Versions.ps
-usr/share/X11/doc/Install.html
-usr/share/X11/doc/LICENSE.html
-usr/share/X11/doc/README.html
-usr/share/X11/doc/RELNOTES.html
-usr/share/X11/doc/Versions.html
-usr/share/X11/doc/Install.sgml
-usr/share/X11/doc/LICENSE.sgml
-usr/share/X11/doc/README.sgml
-usr/share/X11/doc/RELNOTES.sgml
-usr/share/X11/doc/Versions.sgml
-usr/share/X11/doc/MAINTAINERS
+usr/share/doc/xorg-docs/MAINTAINERS
+usr/share/doc/xorg-docs/*.html
+usr/share/doc/xorg-docs/*.txt
+usr/share/doc/xorg-docs/graphics/*.html
+usr/share/doc/xorg-docs/graphics/*.txt
+usr/share/doc/xorg-docs/fonts/*.html
+usr/share/doc/xorg-docs/fonts/*.txt
+usr/share/doc/xorg-docs/input/*.html
+usr/share/doc/xorg-docs/input/*.txt
+usr/share/doc/xorg-docs/specs/CTEXT/*.html
+usr/share/doc/xorg-docs/specs/CTEXT/*.txt
+usr/share/doc/xorg-docs/specs/ICCCM/*.html
+usr/share/doc/xorg-docs/specs/ICCCM/*.txt
+usr/share/doc/xorg-docs/specs/XLFD/*.html
+usr/share/doc/xorg-docs/specs/XLFD/*.txt
+usr/share/doc/xorg-docs/specs/Xserver/*.html
+usr/share/doc/xorg-docs/specs/Xserver/*.txt
+
+# Discard platform-specific documentation, without specifying the
+# entire directory, some more docs may be added:
+usr/share/doc/xorg-docs/platforms/Darwin.* /dev/null
+usr/share/doc/xorg-docs/platforms/Solaris.* /dev/null
commit 519c75af63a18d6e44f57ad68b6aff2ec207974b
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Nov 12 14:53:59 2010 +0100
Use generated build/general/License.txt to update debian/copyright.
Do so since license/copying info is now in XML upstream.
diff --git a/debian/changelog b/debian/changelog
index bf347db..caaf066 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ xorg-docs (1:1.5.99.901-1) UNRELEASED; urgency=low
[ Cyril Brulebois ]
* New upstream release candidate.
* Bump xorg-sgml-doctools build-dep.
+ * Use generated build/general/License.txt to update debian/copyright
+ since license/copying info is now in XML upstream.
-- Cyril Brulebois <kibi@debian.org> Fri, 12 Nov 2010 14:48:12 +0100
diff --git a/debian/copyright b/debian/copyright
index f224a6e..b32393d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,50 +1,428 @@
This package was downloaded from
http://xorg.freedesktop.org/releases/individual/doc/.
-Copyright 1989, 1998 The Open Group
-Copyright 2005 Hitachi, Ltd.
+Packager's note: Taken from the generated general/License.txt
+
+
+Licenses
+
+The X.Org Foundation
+
+November 2010
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Table of Contents
+
+Introduction
+X.Org Preferred License
+XFree86 License 1.0
+Other Licenses
+
+ X/MIT Copyrights
+ Berkeley-based copyrights:
+ SGI Free Software License B
+ Bigelow & Holmes Inc and URW++ GmbH Luxi font license
+
+Introduction
+
+The X.Org Foundation X Window System distribution is a compilation of code and
+documentation from many sources. This document is intended primarily as a guide
+to the licenses used in the distribution: you must check each file and/or
+package for precise redistribution terms. None-the-less, this summary may be
+useful to many users.
+
Reply to: