x11-utils: Changes to 'debian-unstable'
debian/changelog | 11
debian/control | 2
debian/copyright | 22 +
debian/patches/01_luit_fix_race_condition.diff | 146 -------
debian/patches/series | 1
luit/COPYING | 26 -
luit/ChangeLog | 329 +++++++++++++++-
luit/INSTALL | 236 -----------
luit/Makefile.am | 14
luit/Makefile.in | 274 ++++---------
luit/aclocal.m4 | 188 +++++----
luit/charset.c | 128 +++---
luit/charset.h | 16
luit/compile | 142 ------
luit/config.guess | 6
luit/config.sub | 10
luit/configure | 167 ++++----
luit/configure.ac | 8
luit/depcomp | 93 +++-
luit/install-sh | 514 +++++++++++++++++--------
luit/luit.c | 91 ++--
luit/luit.man | 6
luit/missing | 61 +-
luit/mkinstalldirs | 158 -------
luit/parser.c | 8
luit/parser.h | 2
luit/sys.c | 14
27 files changed, 1284 insertions(+), 1389 deletions(-)
New commits:
commit 210835271678f7d6d28f44ecc99402e3f621f8a5
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 1 01:25:54 2008 +0100
* Drop patch for #291137, which is included in luit 1.0.3.
diff --git a/debian/changelog b/debian/changelog
index b5f84bc..f242458 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ x11-utils (7.3+2) UNRELEASED; urgency=low
+ looks for locale.alias in the right place (closes: #443892)
* Add copyright/license info for luit to debian/copyright, taken from
upstream's COPYING file.
+ * Drop patch for #291137, which is included in luit 1.0.3.
- -- Julien Cristau <jcristau@debian.org> Fri, 01 Feb 2008 01:20:14 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 01 Feb 2008 01:23:34 +0100
x11-utils (7.3+1) unstable; urgency=low
diff --git a/debian/patches/01_luit_fix_race_condition.diff b/debian/patches/01_luit_fix_race_condition.diff
deleted file mode 100644
index db993ab..0000000
--- a/debian/patches/01_luit_fix_race_condition.diff
+++ /dev/null
@@ -1,146 +0,0 @@
-From 33c99a9408fc236ec68cc027c1caddc805e80efe Mon Sep 17 00:00:00 2001
-From: Juliusz Chroboczek <jch@pps.jussieu.fr>
-Date: Sun, 5 Nov 2006 23:43:52 +0100
-Subject: [PATCH] Set up parent pty before forking (bug 8490).
-This avoids a race condition when the child reads the terminal settings
-before the parent has set the pty up.
----
- luit.c | 76 +++++++++++++++++++++++++++++++++------------------------------
- 1 files changed, 40 insertions(+), 36 deletions(-)
-
-diff --git a/luit.c b/luit.c
-index c4e1f91..99cee82 100644
---- luit/luit.c
-+++ luit/luit.c
-@@ -434,6 +434,17 @@ convert(int ifd, int ofd)
- return 0;
- }
-
-+static void
-+sigwinchHandler(int sig)
-+{
-+ sigwinch_queued = 1;
-+}
-+
-+static void
-+sigchldHandler(int sig)
-+{
-+ sigchld_queued = 1;
-+}
-
- static int
- condom(int argc, char **argv)
-@@ -444,6 +455,7 @@ condom(int argc, char **argv)
- char *path;
- char **child_argv;
- int rc;
-+ int val;
-
- rc = parseArgs(argc, argv, child_argv0,
- &path, &child_argv);
-@@ -461,6 +473,29 @@ condom(int argc, char **argv)
- perror("Couldn't drop priviledges");
- exit(1);
- }
-+#ifdef SIGWINCH
-+ installHandler(SIGWINCH, sigwinchHandler);
-+#endif
-+ installHandler(SIGCHLD, sigchldHandler);
-+
-+ rc = copyTermios(0, pty);
-+ if(rc < 0)
-+ FatalError("Couldn't copy terminal settings\n");
-+
-+ rc = setRawTermios();
-+ if(rc < 0)
-+ FatalError("Couldn't set terminal to raw\n");
-+
-+ val = fcntl(0, F_GETFL, 0);
-+ if(val >= 0) {
-+ fcntl(0, F_SETFL, val | O_NONBLOCK);
-+ }
-+ val = fcntl(pty, F_GETFL, 0);
-+ if(val >= 0) {
-+ fcntl(pty, F_SETFL, val | O_NONBLOCK);
-+ }
-+
-+ setWindowSize(0, pty);
-
- pid = fork();
- if(pid < 0) {
-@@ -470,6 +505,10 @@ condom(int argc, char **argv)
-
- if(pid == 0) {
- close(pty);
-+#ifdef SIGWINCH
-+ installHandler(SIGWINCH, SIG_DFL);
-+#endif
-+ installHandler(SIGCHLD, SIG_DFL);
- child(line, path, child_argv);
- } else {
- free(child_argv);
-@@ -490,6 +529,7 @@ child(char *line, char *path, char **arg
- close(0);
- close(1);
- close(2);
-+
- pgrp = setsid();
- if(pgrp < 0) {
- kill(getppid(), SIGABRT);
-@@ -517,53 +557,17 @@ child(char *line, char *path, char **arg
- exit(1);
- }
-
--static void
--sigwinchHandler(int sig) {
-- sigwinch_queued = 1;
--}
--
--static void
--sigchldHandler(int sig)
--{
-- sigchld_queued = 1;
--}
--
- void
- parent(int pid, int pty)
- {
- unsigned char buf[BUFFER_SIZE];
- int i;
-- int val;
- int rc;
-
- if(verbose) {
- reportIso2022(outputState);
- }
-
--#ifdef SIGWINCH
-- installHandler(SIGWINCH, sigwinchHandler);
--#endif
-- installHandler(SIGCHLD, sigchldHandler);
--
-- rc = copyTermios(0, pty);
-- if(rc < 0)
-- FatalError("Couldn't copy terminal settings\n");
--
-- rc = setRawTermios();
-- if(rc < 0)
-- FatalError("Couldn't set terminal to raw\n");
--
-- val = fcntl(0, F_GETFL, 0);
-- if(val >= 0) {
-- fcntl(0, F_SETFL, val | O_NONBLOCK);
-- }
-- val = fcntl(pty, F_GETFL, 0);
-- if(val >= 0) {
-- fcntl(pty, F_SETFL, val | O_NONBLOCK);
-- }
--
-- setWindowSize(0, pty);
--
- for(;;) {
- rc = waitForInput(0, pty);
-
---
-1.4.3.2
-
diff --git a/debian/patches/series b/debian/patches/series
index 578c917..c8dec57 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-01_luit_fix_race_condition.diff -p0
02_xev_flush_standard_output.diff
04_xlsfonts_do_not_spew_usage_on_connection_error.diff -p0
commit 1cc37da1caf1fd4666b0af5e729a33e1ba2ba58f
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 1 01:20:50 2008 +0100
Add copyright/license info for luit to debian/copyright
Copied from upstream's COPYING file.
diff --git a/debian/changelog b/debian/changelog
index 21dcea4..b5f84bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ x11-utils (7.3+2) UNRELEASED; urgency=low
* Relax Replaces on xutils and xbase-clients to allow further updates.
* luit 1.0.3
+ looks for locale.alias in the right place (closes: #443892)
+ * Add copyright/license info for luit to debian/copyright, taken from
+ upstream's COPYING file.
- -- Julien Cristau <jcristau@debian.org> Fri, 01 Feb 2008 01:13:13 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 01 Feb 2008 01:20:14 +0100
x11-utils (7.3+1) unstable; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 88655da..9851cd9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,6 +54,28 @@ listres:
* Author: Jim Fulton, MIT X Consortium
*/
+luit:
+ Copyright (c) 2001 by Juliusz Chroboczek
+ Copyright (c) 2002 by Tomohiro KUBOTA
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
viewres:
Copyright (c) 1989 X Consortium
commit fcb3e62e5f561fa61cc22b5784cfe2a701ec8d85
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 1 01:16:01 2008 +0100
luit 1.0.3
diff --git a/debian/changelog b/debian/changelog
index 25c8d0a..21dcea4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
x11-utils (7.3+2) UNRELEASED; urgency=low
* Relax Replaces on xutils and xbase-clients to allow further updates.
+ * luit 1.0.3
+ + looks for locale.alias in the right place (closes: #443892)
- -- Julien Cristau <jcristau@debian.org> Fri, 01 Feb 2008 01:08:08 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 01 Feb 2008 01:13:13 +0100
x11-utils (7.3+1) unstable; urgency=low
diff --git a/luit/COPYING b/luit/COPYING
index 7f33cbf..f2b9823 100644
--- a/luit/COPYING
+++ b/luit/COPYING
@@ -1,12 +1,20 @@
-This is a stub file. This package has not yet had its complete licensing
-information compiled. Please see the individual source files for details on
-your rights to use and modify this software.
+Copyright (c) 2001 by Juliusz Chroboczek
+Copyright (c) 2002 by Tomohiro KUBOTA
-Please submit updated COPYING files to the Xorg bugzilla:
+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:
-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-All licensing questions regarding this software should be directed at the
-Xorg mailing list:
-
-http://lists.freedesktop.org/mailman/listinfo/xorg
+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.
diff --git a/luit/ChangeLog b/luit/ChangeLog
index c236a25..1daa2ae 100644
--- a/luit/ChangeLog
+++ b/luit/ChangeLog
@@ -1,31 +1,322 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 2547b637ab615884ea51458dfb793f1a70bc5201
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Feb 1 00:08:27 2008 +0100
- * configure.ac:
- Update package version for X11R7 release.
+ Bump to 1.0.3.
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bde6425192d06d4168048c32ca92abbade085869
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Feb 1 00:05:56 2008 +0100
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Make ChangeLog hook safer.
-2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit e1a002217cabdb0806f28a0530a9cb972f370312
+Author: Julien Cristau <jcristau@debian.org>
+Date: Tue Jan 29 21:45:35 2008 +0100
- * Makefile.am:
- * configure.ac:
- Add configure options to allow hard-coded paths to be changed.
+ Define _XOPEN_SOURCE to 500 on linux
+
+ strdup() is only exposed by glibc headers if _XOPEN_SOURCE is defined to
+ a value >= 500.
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit abca524c0298e629810bd98d18b73eceb0eca8d9
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 28 18:23:40 2008 -0800
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Set locale.alias file in man page to match the one set by configure
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit bada8600b282d453727c6202ab69f3cb2c8fc7fb
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 28 16:19:05 2008 -0800
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Constify a bit
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 673fd4184c005909db20035006f6b98eb6210bd4
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 28 15:54:55 2008 -0800
- * configure.ac:
- Update package version number for RC1 release.
+ Replace malloc/strcpy pairs with strdup
+commit 9ca1cdabb4f04cc7e8c437b48821f0672f58af60
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 28 14:40:30 2008 -0800
+
+ Man page typo fixes
+
+commit 87a181ce2647225e21e5824104ca1f7b04a221c7
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 28 14:33:41 2008 -0800
+
+ Fix sparse warnings: non-ANSI function declaration (missing void)
+
+commit 191f62fab880b9aa001a566a95343c4fe5565b40
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 28 14:31:31 2008 -0800
+
+ Fix many sparse warnings of Using plain integer as NULL pointer
+
+commit 98cd8b69a5ad042087a7f081482d4fd4d001cc3e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jan 28 14:25:15 2008 -0800
+
+ Change luit_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+
+ Makefile.am:29: compiling `charset.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
+
+commit a1b53290954cfabfbb28ac0bb932570754e118ae
+Author: Karsten Hilbert <karsten.hilbert@gmx.net>
+Date: Thu Oct 11 15:44:28 2007 +0200
+
+ Fix typo in luit.man
+
+ Debian bug#446216.
+
+commit 599d3c2049bc71929c29e864e4d76b2bdfc0c550
+Author: Dan Nicholson <dbn.lists@gmail.com>
+Date: Fri Sep 21 14:52:09 2007 -0400
+
+ Match luit locale.alias location to libX11 default
+ Luit expects to find the locale.alias file in ${libdir}/X11/locale. However,
+ libX11 installs the locale files in ${datadir}/X11/locale, by default.
+
+commit ff27bd043f93ee9505f7f6cd0aed417ef264351e
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:51:03 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 47c5031b9ac3e14e5bffcae9edb4daa6306b754d
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:24:26 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 0277a1b8d6f2f1cf8156967862436207a170f111
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date: Tue Nov 14 16:37:21 2006 +0100
+
+ Include corrected PHONY in Makefile.
+ Thanks to Donnie Berkholz for noticing I'm stupid.
+
+commit 2d4743cac9e2ceb81781586d396ebcc151fd123b
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date: Tue Nov 14 03:37:14 2006 +0100
+
+ Remove incorrect .PHONY in Makefile.
+
+commit c89bc49b6dc037c6b5177f2c79370257efd54b7e
+Author: Julien Cristau <julien.cristau@ens-lyon.org>
+Date: Tue Nov 7 17:27:36 2006 +0100
+
+ [PATCH] Add a rule to autogenerate ChangeLog for distribution.
+
+ The current ChangeLog is not getting updated, so we generate it from git-log
+ instead. Also clean it in "make maintainer-clean".
+
+ Signed-off-by: Julien Cristau <julien.cristau@ens-lyon.org>
+ Signed-off-by: Juliusz Chroboczek <jch@pps.jussieu.fr>
+
+commit 0190002a9730185dec0ab8bcf27ce730d295e39d
+Author: Julien Cristau <julien.cristau@ens-lyon.org>
+Date: Tue Nov 7 17:27:35 2006 +0100
+
+ [PATCH] Delete ChangeLog file.
+
+ Signed-off-by: Julien Cristau <julien.cristau@ens-lyon.org>
+ Signed-off-by: Juliusz Chroboczek <jch@pps.jussieu.fr>
+
+commit 930c1fb0cce2bdd65553b85e4231fe14ccf7a2e7
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Nov 8 16:24:26 2006 +0200
+
+ bump to 1.0.2
+
+commit 33c99a9408fc236ec68cc027c1caddc805e80efe
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date: Sun Nov 5 23:43:52 2006 +0100
+
+ Set up parent pty before forking (bug 8490).
+ This avoids a race condition when the child reads the terminal settings
+ before the parent has set the pty up.
+
+commit 605d8b15add136788f1316534c275f0f6d0fe792
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date: Tue Oct 31 17:05:20 2006 +0100
+
+ Added random IBM codepages to the encodings vector.
+ I didn't modify the locales vector -- people using non-standard encodings
+ should directly set the ISO 2022 state using -gr, -g2 and friends.
+
+commit 0318e87e279527ea0fba6c07b9d3e7ce5598c934
+Author: Juliusz Chroboczek <jch@pps.jussieu.fr>
+Date: Tue Oct 31 01:22:36 2006 +0100
+
+ Updated COPYING.
+
+commit a4e6e5a6c618706d5375ff1a9ffc34cce23fcf76
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:43 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit b5e1535b07183305313ec74612525286b11d5deb
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:22:40 2005 +0000
+
+ Stub COPYING files
+
+commit 899331d63218a9ef190f3575811e76bced5d67e1
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:02 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 9b949814b988ffb0d01bfd945b207bbb8379e573
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 8 17:55:17 2005 +0000
+
+ Add configure options to allow hard-coded paths to be changed.
+
+commit 6f19ff5947590d28e17fd86a47af38f2d3abf90d
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:17 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 7cad59b8eb72df9c6c51c6deff4b353a0ce2f9e8
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:16 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit da7d5db0365ad51888dc262c0ed6b8e63c479af8
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:01:37 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 0970cf337c42939a1865048aef1a49782de5d3b0
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:34:56 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit aea3251136908221d6547f2dea67ea1e81a94acd
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Sun Nov 20 22:08:48 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 22f85fed95a41f35410d49452a1ca891807fdf03
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:47:49 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 52cd38a1849b80cdf8f393402061e259250ccee9
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 23:56:19 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 889af994115911897dbaff5d1262275d1a25fc73
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Fri Oct 14 00:25:41 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 77bdecc7b28208b6a74f80d6ad169e4be81fc311
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 20:25:28 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit e751086392e8379b0a92dfdbe7b1effdbbf11b8d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 15:11:56 2005 +0000
+
+ Define _XOPEN_SOURCE on Linux (patch from Stefan Dirsch)
+
+commit d235388c5d3130966c8524e041184fd52b668225
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:29 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit d9df2dbe4186d6662c40e364c527b157335d05c0
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Jul 20 19:31:49 2005 +0000
+
+ Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
+ configure cache, you cache it, and the cached value is probably wrong.
+
+commit b9846be287e3f5a00b9012af2f060255bed4879f
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Jul 6 16:30:11 2005 +0000
+
+ Build system for luit
+
+commit 94118c5d40a3b355eeafb95631c741574ba43342
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:35 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 52c779f3fe3dd8116e6c54ec1cca05b89cecf0ca
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:34:54 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 86bdb1f20619208e22e27cc91dffc14e0cd91406
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:53 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 5d8090493ad08e657d1a57518ccf98d4b6a3885e
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:15 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit f466b8b816201dd6385e4897fcad7888dae3d502
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:55 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit c65c9b70829cf3e7e82729a7756cad05189c31ec
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:09:01 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 0afe748d654f553771ee2f4b07ab1ccce30b9ddd
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:29:02 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit f0c47a47ea65135be8b78cd215ba4a67ecc44a57
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:57 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 84208ce0135c0376208346d20a76add90d52aae4
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:57 2003 +0000
+
+ Initial revision
diff --git a/luit/INSTALL b/luit/INSTALL
index 23e5f25..e69de29 100644
--- a/luit/INSTALL
+++ b/luit/INSTALL
@@ -1,236 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-Basic Installation
-==================
-
-These are generic installation instructions.
-
- The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation. It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions. Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
- It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.)
-
- If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release. If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
-
-The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
-
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
- the package.
-
- 4. Type `make install' to install the programs and any data files and
- documentation.
-
- 5. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
- also a `make maintainer-clean' target, but that is intended mainly
- for the package's developers. If you use it, you may have to get
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment. Here
-is an example:
-
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script. `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc. You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
- You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files. If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
- In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files. Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
- If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System). The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
- For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option. TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
- CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
- OS KERNEL-OS
-
- See the file `config.sub' for the possible values of each field. If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
- If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
- If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists. Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'. However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost. In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'. For example:
-
- ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
-
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
- Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
- Print the version of Autoconf used to generate the `configure'
- script, and exit.
-
-`--cache-file=FILE'
- Enable the cache: use and save the results of the tests in FILE,
- traditionally `config.cache'. FILE defaults to `/dev/null' to
- disable caching.
-
-`--config-cache'
-`-C'
- Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
- Do not print messages saying which checks are being made. To
- suppress all normal output, redirect it to `/dev/null' (any error
- messages will still be shown).
-
-`--srcdir=DIR'
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options. Run
-`configure --help' for more details.
-
diff --git a/luit/Makefile.am b/luit/Makefile.am
index 705d239..6299f16 100644
--- a/luit/Makefile.am
+++ b/luit/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = luit
LOCALEALIASFILE = @LOCALEALIASFILE@
-luit_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
+AM_CFLAGS = $(LUIT_CFLAGS) -DLOCALE_ALIAS_FILE=\"$(LOCALEALIASFILE)\"
luit_LDADD = $(LUIT_LIBS)
luit_SOURCES = \
@@ -49,11 +49,20 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
-EXTRA_DIST = $(appman_PRE)
+EXTRA_DIST = $(appman_PRE) ChangeLog
CLEANFILES = $(appman_DATA)
SED = sed
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
+
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@@ -63,6 +72,7 @@ MAN_SUBSTS = \
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
-e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__localealiasfile__|$(LOCALEALIASFILE)|g' \
-e 's|__projectroot__|$(prefix)|g' \
-e 's|__apploaddir__|$(appdefaultdir)|' \
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
diff --git a/luit/Makefile.in b/luit/Makefile.in
index a1cd741..0076728 100644
--- a/luit/Makefile.in
+++ b/luit/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -36,15 +36,11 @@
# PERFORMANCE OF THIS SOFTWARE.
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -59,31 +55,29 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = luit$(EXEEXT)
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- compile config.guess config.sub depcomp install-sh missing \
- mkinstalldirs
-subdir = .
+ config.guess config.sub depcomp install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Reply to: