.gitignore | 79 ++- COPYING | 39 - ChangeLog | 247 +++++++++ Makefile.am | 54 -- README | 7 Xtrans.c | 10 Xtrans.mm | 789 ------------------------------ Xtransint.h | 2 Xtranslcl.c | 21 Xtranssock.c | 23 configure.ac | 34 - debian/changelog | 18 debian/control | 7 debian/copyright | 47 - debian/rules | 6 debian/xtrans-dev.install | 1 doc/.gitignore | 5 doc/Makefile.am | 62 ++ doc/xtrans.xml | 1206 ++++++++++++++++++++++++++++++++++++++++++++++ xtrans.m4 | 46 - 20 files changed, 1738 insertions(+), 965 deletions(-)
New commits: commit 72cbe8bd25a024f7ed134c9c7c5661b8505a2be5 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 23:20:08 2010 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index 678414c..effcc3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xtrans (1.2.6-1) UNRELEASED; urgency=low +xtrans (1.2.6-1) unstable; urgency=low [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no @@ -18,7 +18,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low * No longer pass --disable-shared, this option is gone. * Add myself to Uploaders. - -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 + -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 23:20:03 +0100 xtrans (1.2.5-1) unstable; urgency=low commit 31b22edbecb7ce288ad94b7c91a3ce95142f8e80 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 23:20:01 2010 +0100 Add pkg-config build-dep. diff --git a/debian/changelog b/debian/changelog index 45f960e..678414c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low * New upstream release. * Update debian/copyright from upstream COPYING. * Bump xutils-dev build-dep for new macros. + * Add pkg-config build-dep. * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. * Pass --with-xmlto and --without-fop (we want html and txt only). * Pass --docdir=/usr/share/doc/xtrans-dev and add this directory to diff --git a/debian/control b/debian/control index b5c5d32..4152b6b 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: quilt, automake, xutils-dev (>= 1:7.5+4), + pkg-config, # docs: xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, Standards-Version: 3.8.3 commit e025a6f2ccc18ae1a5a2fea4556451f1653f7dd7 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 23:17:37 2010 +0100 Add myself to Uploaders. diff --git a/debian/changelog b/debian/changelog index 91dc2e2..45f960e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low xtrans-dev.install file. * Switch from --list-missing to --fail-missing for additional safety. * No longer pass --disable-shared, this option is gone. + * Add myself to Uploaders. -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 diff --git a/debian/control b/debian/control index a259e24..b5c5d32 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xtrans Section: x11 Priority: optional Maintainer: Debian X Strike Force <[email protected]> -Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]> +Uploaders: David Nusinow <[email protected]>, Brice Goglin <[email protected]>, Cyril Brulebois <[email protected]> Build-Depends: debhelper (>= 5.0.0), quilt, commit 4444b55a1d42d10583ff79ea9fe2153adf4f623c Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 23:15:53 2010 +0100 No longer pass --disable-shared, this option is gone. diff --git a/debian/changelog b/debian/changelog index 7531db1..91dc2e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low * Pass --docdir=/usr/share/doc/xtrans-dev and add this directory to xtrans-dev.install file. * Switch from --list-missing to --fail-missing for additional safety. + * No longer pass --disable-shared, this option is gone. -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 diff --git a/debian/rules b/debian/rules index 4bbb04a..065407f 100755 --- a/debian/rules +++ b/debian/rules @@ -40,7 +40,7 @@ build/config.status: configure test -d build || mkdir build cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info --disable-shared \ + --infodir=\$${prefix}/share/info \ --docdir=\$${prefix}/share/doc/$(PACKAGE) \ --with-xmlto --without-fop \ $(confflags) CFLAGS="$(CFLAGS)" commit ff589373ea0f30f20afcb2b7ce6166e2ae9915b9 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 23:15:35 2010 +0100 Switch from --list-missing to --fail-missing for additional safety. diff --git a/debian/changelog b/debian/changelog index d08b058..7531db1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low * Pass --with-xmlto and --without-fop (we want html and txt only). * Pass --docdir=/usr/share/doc/xtrans-dev and add this directory to xtrans-dev.install file. + * Switch from --list-missing to --fail-missing for additional safety. -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 diff --git a/debian/rules b/debian/rules index ac3a36d..4bbb04a 100755 --- a/debian/rules +++ b/debian/rules @@ -82,7 +82,7 @@ binary-indep: build install dh_installdocs README dh_installman - dh_install --sourcedir=debian/tmp --list-missing + dh_install --sourcedir=debian/tmp --fail-missing dh_installchangelogs ChangeLog dh_link dh_strip commit 417babf773fe4362c9d2ecc388e679f7ed1ac4cf Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 23:14:50 2010 +0100 Pass --docdir=/usr/share/doc/xtrans-dev and add this directory to xtrans-dev.install file. diff --git a/debian/changelog b/debian/changelog index 6a75148..d08b058 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low * Bump xutils-dev build-dep for new macros. * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. * Pass --with-xmlto and --without-fop (we want html and txt only). + * Pass --docdir=/usr/share/doc/xtrans-dev and add this directory to + xtrans-dev.install file. -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 diff --git a/debian/rules b/debian/rules index c3dcaa6..ac3a36d 100755 --- a/debian/rules +++ b/debian/rules @@ -41,6 +41,7 @@ build/config.status: configure cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --disable-shared \ + --docdir=\$${prefix}/share/doc/$(PACKAGE) \ --with-xmlto --without-fop \ $(confflags) CFLAGS="$(CFLAGS)" diff --git a/debian/xtrans-dev.install b/debian/xtrans-dev.install index 4fad672..eed7bb1 100644 --- a/debian/xtrans-dev.install +++ b/debian/xtrans-dev.install @@ -1,3 +1,4 @@ usr/include/X11/Xtrans/* usr/share/aclocal/xtrans.m4 usr/share/pkgconfig/xtrans.pc +usr/share/doc/xtrans-dev/ commit b86d4e90e464747201be71363913c98141c137c9 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 23:01:38 2010 +0100 Pass --with-xmlto and --without-fop (we want html and txt only). diff --git a/debian/changelog b/debian/changelog index f250061..6a75148 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low * Update debian/copyright from upstream COPYING. * Bump xutils-dev build-dep for new macros. * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. + * Pass --with-xmlto and --without-fop (we want html and txt only). -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 diff --git a/debian/rules b/debian/rules index d6dfd63..c3dcaa6 100755 --- a/debian/rules +++ b/debian/rules @@ -41,6 +41,7 @@ build/config.status: configure cd build && \ ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --disable-shared \ + --with-xmlto --without-fop \ $(confflags) CFLAGS="$(CFLAGS)" build: build-stamp commit 4de021c582126e93921a233577221eb386359626 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 23:01:04 2010 +0100 Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. diff --git a/debian/changelog b/debian/changelog index 72ce9af..f250061 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low * New upstream release. * Update debian/copyright from upstream COPYING. * Bump xutils-dev build-dep for new macros. + * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the doc. -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 diff --git a/debian/control b/debian/control index e8b2650..a259e24 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,8 @@ Build-Depends: quilt, automake, xutils-dev (>= 1:7.5+4), +# docs: + xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xtrans Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xtrans.git commit dd98522fa3970e3c60ec4ff789d6ad05176ff1bf Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 22:58:13 2010 +0100 Bump xutils-dev build-dep for new macros. diff --git a/debian/changelog b/debian/changelog index d20b091..72ce9af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. * Update debian/copyright from upstream COPYING. + * Bump xutils-dev build-dep for new macros. -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 diff --git a/debian/control b/debian/control index 6aebb7e..e8b2650 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 5.0.0), quilt, automake, - xutils-dev (>= 1:7.5~1), + xutils-dev (>= 1:7.5+4), Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/xtrans Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/xtrans.git commit bebaf5a25c3e066e327845076bc5272105292556 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 22:55:21 2010 +0100 Update debian/copyright from upstream COPYING. diff --git a/debian/changelog b/debian/changelog index b8bbae7..d20b091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ xtrans (1.2.6-1) UNRELEASED; urgency=low [ Cyril Brulebois ] * New upstream release. + * Update debian/copyright from upstream COPYING. -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 diff --git a/debian/copyright b/debian/copyright index 05ae4b2..265fe20 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,15 +3,7 @@ http://xorg.freedesktop.org/releases/individual/lib/ Debianised by Daniel Stone <[email protected]>. -Contributors to this package include The Open Group (another words, the -X Consortium), NCR Corporation, Sebastien Marineau and Holger Veit -(OS/2 support), Sun Microsystems, David Dawes, Egbert Eich, Alan Coopersmith -Marc La France, J. Kean Johnston, Frank Giessler, Jean-Claude Michot, and -Matthieu Herrb. - -Our apologies if we missed anyone. - -Copyright 1993, 1994, 1998 The Open Group +Copyright 1993, 1994, 1998, 2002 The Open Group Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that @@ -61,29 +53,26 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ______________________________________________________________________________ -Copyright 2002, 2005 Sun Microsystems, Inc. All rights reserved. - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. +Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved. -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. -Except as contained in this notice, the name of the copyright holders shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from the copyright holders. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. ______________________________________________________________________________ commit 0270f0cec4e0adc99ebd95a9935ed955ed0336e8 Author: Cyril Brulebois <[email protected]> Date: Sat Nov 20 22:54:36 2010 +0100 Update changelogs. diff --git a/ChangeLog b/ChangeLog index 9b32e52..ea88052 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,250 @@ +commit 59f57d1a19d4091fef115b9eafa139bf620332cb +Author: Alan Coopersmith <[email protected]> +Date: Mon Nov 8 16:33:45 2010 -0800 + + xtrans 1.2.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 05cd71c899e83022147f27085ee652d26f5462cb +Author: Jesse Adkins <[email protected]> +Date: Sat Nov 6 12:53:24 2010 -0700 + + Remove ISCFuncs, fix SCOFuncs inclusion (bug 23324) + + ISCFuncs was removed by commit 339ddc413559d4cb117a72f87b2a70dae6911c32. + SCOFuncs should be for SCO only, instead of !sun. + + Also, remove comments that suggest ISC support. + + Signed-off-by: Jesse Adkins <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0e5a66c82535dd8e9beee9fc4c42c52f90d05f50 +Author: Alan Coopersmith <[email protected]> +Date: Sat Nov 6 13:22:59 2010 -0700 + + doc: Update for X11R7/modularization + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 1858516e9f0f3e65cc3d1f6cedfe8bfa614c8082 +Author: Alan Coopersmith <[email protected]> +Date: Sat Nov 6 11:22:15 2010 -0700 + + doc: Markup & typo cleanups + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 16bdc50ca85bbae065a32647e2410a5ca47b4924 +Author: Alan Coopersmith <[email protected]> +Date: Sat Nov 6 09:53:08 2010 -0700 + + doc: Correct legal notices + + Restore both copyright/license notices from troff version + Move implementation note out of legalnotice section + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d01d081538d04ac60b9e14f6e2faa60fe6bed5ff +Author: Alan Coopersmith <[email protected]> +Date: Sat Nov 6 09:23:26 2010 -0700 + + doc: Use installed css stylesheet instead of making another copy + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit ea6977f4a51612172ba51c3bd35aa150ad9ff158 +Author: Alan Coopersmith <[email protected]> +Date: Sat Nov 6 12:41:48 2010 -0700 + + Xtransint.h: Add missing ' in comment + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 862d2de24950d2658158ebc4cf8307e73f80bc8d +Author: Alan Coopersmith <[email protected]> +Date: Fri Oct 29 18:22:33 2010 -0700 + + Sun's copyrights now belong to Oracle + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit cbb59ebc916d0be18c322eec782b694f4dc2e685 +Author: Gaetan Nadon <[email protected]> +Date: Sun Jun 27 20:27:39 2010 -0400 + + Update README to reflect docs converted from nroff to DocBook XML + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 3441142714b2640d1e143fcb5d089a2a42bd5321 +Author: Gaetan Nadon <[email protected]> +Date: Sun Jun 27 20:21:20 2010 -0400 + + doc: remove trailing spaces in xtrans.xml + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 7761846c7fd97f15d7207e1b9fd9d42c9e58a0c4 +Author: Gaetan Nadon <[email protected]> +Date: Sat Jun 26 13:06:22 2010 -0400 + + doc: replace groff input format with docbook xml format + + Initial version of xtrans docbook xml. + Requires util-macros 1.10 + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 4f557036253ac5750576c88e5b9a86759a49d247 +Author: Gaetan Nadon <[email protected]> +Date: Fri Jun 18 21:47:52 2010 -0400 + + config: XORG_WITH_GROFF: use HAVE_GROFF_HTML conditional + + Groff uses grohtml to generate html output format. This program, in turn, + uses a number of pnm* commands from the netpbm package, psselect + from the psutils package and the ghostscript package. + + These are independently installed, so they could be missing. + Skip the HTML output format if one of the dependencies is missing. + The version 1.9 of the util-macros package is required. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1e9b958a096682b1ec111d400bd25048e3f95ed4 +Author: Alan Coopersmith <[email protected]> +Date: Fri May 21 18:54:20 2010 -0700 + + Update README to reflect docs moved here from xorg-docs module + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d400e69526c1c331e8e23893e2ba8658979376e8 +Author: Gaetan Nadon <[email protected]> +Date: Mon Mar 29 14:53:49 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 373922e1529b3d55513fbc0ec24527600f7b529c +Author: Gaetan Nadon <[email protected]> +Date: Tue Feb 16 18:18:06 2010 -0500 + + doc: use HAVE_GROFF_MM to skip doc when 'm.tmac' macros missing + + This conditional is defined in XORG_WITH_GROFF macro. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit b531ff3ed2ad841b716ba370fd43bbe8f06f1185 +Author: Gaetan Nadon <[email protected]> +Date: Fri Jan 29 15:05:37 2010 -0500 + + doc: use new macros XORG_WITH_GROFF and PS2PDF + + These control the usage of doc tools + Also use XORG_ENABLE_DOCS to control generation of docs + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 5922556f408fbcd14e7ad23bbe46db2ae8dcdee6 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jan 14 21:11:43 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit dab2bcdaf60977643ec55d71a81e67c1e3a162a9 +Author: Rémi Cardona <[email protected]> +Date: Thu Dec 17 08:31:20 2009 +0100 + + require autoconf 2.60 because of $(docdir) use + + Signed-off-by: Rémi Cardona <[email protected]> + Reviewed-by: Gaetan Nadon <[email protected]> + Reviewed-by: Alan Coopersmith <[email protected]> + Reviewed-by: Dan Nicholson <[email protected]> + +commit 197ec0dc83e775e42fce4966142ae3a641f2db69 +Author: Gaetan Nadon <[email protected]> +Date: Fri Nov 27 20:56:05 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 27a18fb2c9356cc44bdd892f87200c3ea230109b +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:11 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 92da89326d26e0924d4c6efe2ebd26ceb527f4f7 +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 22:08:43 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 9aeff40d0722b4fedc4ab9ccc1aaff75368020fe +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:20 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit f0f7c47055eecac35786ec616c7632604da204b5 +Author: Jeremy Huddleston <[email protected]> +Date: Wed Oct 21 12:47:27 2009 -0700 + + This is not a GNU project, so declare it foreign. + + On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: + > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: + > > I noticed an INSTALL file in xlsclients and libXvMC today, and it + > > was quite annoying to work around since 'autoreconf -fvi' replaces + > > it and git wants to commit it. Should these files even be in git? + > > Can I nuke them for the betterment of humanity and since they get + > > created by autoreconf anyways? + > + > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 + + As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with + AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation + of the INSTALL file. It is also part of the 24206 solution. + + Signed-off-by: Jeremy Huddleston <[email protected]> + +commit 7d98b9b03c5fd5a82f9f4d215b10c0926edeab00 +Author: Eric Sesterhenn <[email protected]> +Date: Mon Oct 19 09:53:18 2009 -0700 + + Bug 24612: Memory & fd leaks in local transports + + X.Org bug #24612 <http://bugs.freedesktop.org/show_bug.cgi?id=24612> + Patch #30548 <http://bugs.freedesktop.org/attachment.cgi?id=30548> + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 1127b8ec766ed8c48cc49b0779647fb697a07ebd Author: Alan Coopersmith <[email protected]> Date: Sat Oct 17 13:14:03 2009 -0700 diff --git a/debian/changelog b/debian/changelog index f65fd3a..b8bbae7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -xtrans (1.2.5-2) UNRELEASED; urgency=low +xtrans (1.2.6-1) UNRELEASED; urgency=low + [ Julien Cristau ] * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no good reason. Thanks, Colin Watson! * Remove myself from Uploaders - -- Julien Cristau <[email protected]> Sat, 16 Jan 2010 16:47:36 +0000 + [ Cyril Brulebois ] + * New upstream release. + + -- Cyril Brulebois <[email protected]> Sat, 20 Nov 2010 22:54:16 +0100 xtrans (1.2.5-1) unstable; urgency=low commit 59f57d1a19d4091fef115b9eafa139bf620332cb Author: Alan Coopersmith <[email protected]> Date: Mon Nov 8 16:33:45 2010 -0800 xtrans 1.2.6 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index f72d758..ce521bb 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,8 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) -AC_INIT(xtrans, [1.2.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xtrans) +AC_INIT([xtrans], [1.2.6], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xtrans]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 05cd71c899e83022147f27085ee652d26f5462cb Author: Jesse Adkins <[email protected]> Date: Sat Nov 6 12:53:24 2010 -0700 Remove ISCFuncs, fix SCOFuncs inclusion (bug 23324) ISCFuncs was removed by commit 339ddc413559d4cb117a72f87b2a70dae6911c32. SCOFuncs should be for SCO only, instead of !sun. Also, remove comments that suggest ISC support. Signed-off-by: Jesse Adkins <[email protected]> Reviewed-by: Alan Coopersmith <[email protected]> Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/Xtrans.c b/Xtrans.c index 7b18f10..f59bd61 100644 --- a/Xtrans.c +++ b/Xtrans.c @@ -72,7 +72,7 @@ from The Open Group. #define TRANS_LOCAL_LOCAL_INDEX 9 #define TRANS_LOCAL_PTS_INDEX 10 #define TRANS_LOCAL_NAMED_INDEX 11 -#define TRANS_LOCAL_ISC_INDEX 12 +/* 12 used to be ISC, but that's gone. */ #define TRANS_LOCAL_SCO_INDEX 13 #define TRANS_SOCKET_INET6_INDEX 14 #define TRANS_LOCAL_PIPE_INDEX 15 @@ -108,12 +108,10 @@ Xtransport_table Xtransports[] = { #endif #ifdef sun { &TRANS(PIPEFuncs), TRANS_LOCAL_PIPE_INDEX }, -#else /* !sun */ -#if !defined(__SCO__) && !defined(__UNIXWARE__) - { &TRANS(ISCFuncs), TRANS_LOCAL_ISC_INDEX }, -#endif - { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, #endif /* sun */ +#if defined(__SCO__) || defined(__UNIXWARE__) + { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, +#endif /* __SCO__ || __UNIXWARE__ */ #endif /* LOCALCONN */ }; diff --git a/Xtranslcl.c b/Xtranslcl.c index cb5836c..ca04e7f 100644 --- a/Xtranslcl.c +++ b/Xtranslcl.c @@ -102,7 +102,6 @@ from The Open Group. /* Types of local connections supported: * - PTS * - named pipes - * - ISC * - SCO */ #if !defined(sun) @@ -250,11 +249,6 @@ static void _dummy(int sig) #else #define NAMEDNODENAME "/dev/X/Nserver." -/* - * ISC is only defined for X11 since they are there for - * backwards binary compatability only. - */ - #define SCORNODENAME "/dev/X%1sR" #define SCOSNODENAME "/dev/X%1sS" #endif /* !sun */ @@ -936,7 +930,7 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status) #if defined(LOCAL_TRANS_SCO) /* - * connect_spipe is used by the SCO and ISC connection types. + * connect_spipe is used by the SCO connection type. */ static int connect_spipe(int fd1, int fd2) @@ -961,7 +955,7 @@ connect_spipe(int fd1, int fd2) } /* - * named_spipe is used by the SCO and ISC connection types. + * named_spipe is used by the SCO connection type. */ static int @@ -1675,7 +1669,7 @@ static char *freeXLOCAL=NULL; #elif defined(sun) #define DEF_XLOCAL "UNIX:NAMED" #else -#define DEF_XLOCAL "UNIX:PTS:NAMED:ISC:SCO" +#define DEF_XLOCAL "UNIX:PTS:NAMED:SCO" #endif static void commit 0e5a66c82535dd8e9beee9fc4c42c52f90d05f50 Author: Alan Coopersmith <[email protected]> Date: Sat Nov 6 13:22:59 2010 -0700 doc: Update for X11R7/modularization Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/doc/xtrans.xml b/doc/xtrans.xml index 208a438..ec8b42d 100644 --- a/doc/xtrans.xml +++ b/doc/xtrans.xml @@ -8,17 +8,18 @@ <bookinfo> <title>X Transport Interface</title> <subtitle>X Consortium Standard</subtitle> - <releaseinfo>X Version 11, Release 6.X</releaseinfo> + <releaseinfo>X Version 11, Release 7.X</releaseinfo> <authorgroup> <author> <firstname>Stuart</firstname><surname>Anderson</surname> </author> </authorgroup> <othercredit><firstname>Ralph</firstname><surname>Mor</surname></othercredit> + <othercredit><firstname>Alan</firstname><surname>Coopersmith</surname></othercredit> <corpname>NCR Corporation</corpname> - <releaseinfo>Version 0.6</releaseinfo> + <releaseinfo>Version 0.7</releaseinfo> <affiliation><orgname>The Open Group</orgname></affiliation> - <productnumber>X Version 11, Release 6.x</productnumber> + <productnumber>X Version 11, Release 7.x</productnumber> <legalnotice> <para> @@ -306,6 +307,38 @@ not be used to create a listener. indicates that this is a <symbol>LOCALCONN</symbol> transport. </para></listitem> </varlistentry> + <varlistentry> + <term><symbol>TRANS_ABSTRACT</symbol></term> + <listitem><para> +indicates that a local connection transport uses the abstract socket namespace. + </para></listitem> + </varlistentry> +</variablelist> +</para> + +<para> +Some additional flags may be set in the <structfield>flags</structfield> +field by the library while it is running: +<variablelist> + <varlistentry> + <term><symbol>TRANS_DISABLED</symbol></term> + <listitem><para> +indicates that this transport has been disabled. + </para></listitem> + </varlistentry> + <varlistentry> + <term><symbol>TRANS_NOLISTEN</symbol></term> + <listitem><para> +indicates that servers should not open new listeners using this transport. + </para></listitem> + </varlistentry> + <varlistentry> + <term><symbol>TRANS_NOUNLINK</symbol></term> + <listitem><para> +set by a transport backend to indicate that the endpoints for its connection +should not be unlinked. + </para></listitem> + </varlistentry> </variablelist> </para> </sect1> @@ -919,47 +952,67 @@ that existing connection types such as <symbol>TCPCONN</symbol>, possible transport type. </para> <para> -Below are the flags that can be set in <symbol>ConnectionFlags</symbol> -in the <filename>vendor.cf</filename> or +In X11R6, the below flags to enable transport types were set in +<symbol>ConnectionFlags</symbol> in the <filename>vendor.cf</filename> or <filename>site.def</filename> config files. </para> +<para> +In X11R7 modular releases, these flags are set when running +<filename>configure</filename> scripts which include the +<function>XTRANS_CONNECTION_FLAGS</function> macro from +<filename>xtrans.m4</filename>. +</para> <informaltable pgwide='0' frame='none'> <tgroup cols='4' align='left'> - <colspec colname='c1' align='center'/> - <colspec colname='c2'/> + <colspec colname='define' align='center'/> + <colspec colname='enable'/> + <colspec colname='desc'/> + <thead> + <row> + <entry><code>#define</code></entry> + <entry>configure flag</entry> + <entry>Description</entry> + </row> + </thead> <tbody> <row> <entry><symbol>TCPCONN</symbol></entry> + <entry><option>--enable-tcp-transport</option></entry> <entry> Enables the INET (IPv4) Domain Socket based transport </entry> </row> <row> <entry><symbol>IPv6</symbol></entry> + <entry><option>--enable-ipv6</option></entry> <entry> Extends <symbol>TCPCONN</symbol> to enable IPv6 Socket based transport </entry> </row> <row> <entry><symbol>UNIXCONN</symbol></entry> + <entry><option>--enable-unix-transport</option></entry> <entry> Enables the UNIX Domain Socket based transport </entry> </row> <row> <entry><symbol>STREAMSCONN</symbol></entry> + <entry><emphasis>Not available in X11R7</emphasis></entry> <entry> Enables the TLI based transports </entry> </row> <row> <entry><symbol>LOCALCONN</symbol></entry> + <entry><option>--enable-local-transport</option></entry> <entry> Enables the SYSV Local connection transports </entry> </row> <row> <entry><symbol>DNETCONN</symbol></entry> + <entry><emphasis>Not available in X11R7</emphasis></entry> <entry> Enables the DECnet transports </entry> @@ -1036,10 +1089,17 @@ concurrently with this document. This prototype has been able to flush out many details and problems as the specification was being developed. </para> <para> -All of the source code for this interface is located in +In X11R6, all of the source code for this interface was located in <filename>xc/lib/xtrans</filename>. </para> <para> +In X11R7, all of the source code for this interface is delivered via +the <systemitem>lib/libxtrans</systemitem> modular package from X.Org, +and is installed under +<filename><replaceable>${prefix}</replaceable>/X11/Xtrans</filename> +so that other modules may find it when they build. +</para> +<para> All functions names in the source are of the format <function>TRANS(func)()</function>. The <function>TRANS()</function> @@ -1062,27 +1122,20 @@ that is implemented by the library or server, such as X11, FS, and ICE. <para> All libraries and servers that use the X Transport Interface should have a new -file called <filename>transport.c</filename>. This file will include the -transports based on the configuration flags ConnectionFlags. Below is an -example <filename>transport.c</filename>. +file called <filename><replaceable>TRANSPORT</replaceable>trans.c</filename>. +This file will include the transports based on the configuration flags +provided by the <filename>configure</filename> script. Below is an +example <filename>xfstrans.c</filename> for the font server. </para> <programlisting language="C"> -#include "Xtransint.h" -#ifdef DNETCONN -#include "Xtransdnet.c" -#endif -#ifdef LOCALCONN -#include "Xtranslocal.c" -#endif -#ifdef TCPCONN -#include "Xtranssock.c" -#endif -#ifdef STREAMSCONN -#include "Xtranstli.c" -#endif -#include "Xtrans.c" -#include "Xtransutil.c" +#include "config.h" + +#define FONT_t 1 +#define TRANS_REOPEN 1 +#define TRANS_SERVER 1 + -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
