xutils-dev: Changes to 'debian-unstable'
debian/changelog | 7
debian/copyright | 55
debian/patches/01_netbsd_imake.c_fixes.diff | 38
debian/patches/04_xutils-dev-debian.diff | 68
debian/patches/series | 1
imake/COPYING | 52
imake/ChangeLog | 458 +
imake/INSTALL | 291 +
imake/Makefile.am | 31
imake/Makefile.in | 473 +
imake/README | 35
imake/aclocal.m4 | 2302 ++++++---
imake/compile | 142
imake/config.guess | 291 -
imake/config.h.in | 45
imake/config.sub | 161
imake/configure | 6868 ++++++++++++++++------------
imake/configure.ac | 14
imake/depcomp | 172
imake/imake.c | 174
imake/imake.man | 21
imake/imakemdep.h | 1798 +++----
imake/install-sh | 517 +-
imake/mdepend.cpp | 2
imake/missing | 104
imake/mkinstalldirs | 158
util-macros/ChangeLog | 28
util-macros/Makefile.am | 2
util-macros/Makefile.in | 1
util-macros/configure | 20
util-macros/configure.ac | 2
util-macros/xorg-macros.m4.in | 54
32 files changed, 8804 insertions(+), 5581 deletions(-)
New commits:
commit d32ae4264ab951f18fd4f633bef23d749253b6d6
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 9 14:51:45 2010 +0200
Update imake section in debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index 7906fbc..c928951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xutils-dev (1:7.5+3) UNRELEASED; urgency=low
* Drop 01_netbsd_imake.c_fixes.diff. Doesn't apply, and Debian/NetBSD seems
dead.
* Rediff 04_xutils-dev-debian.diff.
+ * Update imake section in debian/copyright from upstream COPYING.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Apr 2010 17:53:38 +0200
diff --git a/debian/copyright b/debian/copyright
index cf4756a..0cfd573 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,33 +28,54 @@ gccmakedep:
Project.
imake:
+ Copyright (c) 1985, 1986, 1987, 1989, 1993, 1994, 1996, 1998 The Open Group
- Copyright (c) 1985, 1986, 1987, 1998 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
the above copyright notice appear in all copies and that both that
copyright notice and this permission notice appear in supporting
documentation.
-
+
+ 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 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.
+
+ Except as contained in this notice, the name of The Open Group 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 Open Group.
+
+ Copyright © 1999, 2000, 2003 by The XFree86 Project, Inc. All Rights Reserved.
+
+ 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
- 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.
-
- Except as contained in this notice, the name of The Open Group 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 Open Group.
- *
- * Original Author:
- * Todd Brunhoff
- * Tektronix, inc.
- * While a guest engineer at Project Athena, MIT
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ THE XFREE86 PROJECT 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.
+
+ Except as contained in this notice, the name of the XFree86 Project 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
+ XFree86 Project.
lndir:
commit 55b8d450b3ce526fd01316ec17abef58eb6075af
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 9 14:50:10 2010 +0200
Rediff 04_xutils-dev-debian.diff.
diff --git a/debian/changelog b/debian/changelog
index 56dcfaa..7906fbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xutils-dev (1:7.5+3) UNRELEASED; urgency=low
* imake 1.0.3.
* Drop 01_netbsd_imake.c_fixes.diff. Doesn't apply, and Debian/NetBSD seems
dead.
+ * Rediff 04_xutils-dev-debian.diff.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Apr 2010 17:53:38 +0200
diff --git a/debian/patches/04_xutils-dev-debian.diff b/debian/patches/04_xutils-dev-debian.diff
index 90c5c51..f387c4f 100644
--- a/debian/patches/04_xutils-dev-debian.diff
+++ b/debian/patches/04_xutils-dev-debian.diff
@@ -1,7 +1,7 @@
Index: xutils-dev/xorg-cf-files/bsdLib.rules
===================================================================
---- xutils-dev.orig/xorg-cf-files/bsdLib.rules 2006-05-29 22:42:58.000000000 -0400
-+++ xutils-dev/xorg-cf-files/bsdLib.rules 2006-05-29 22:52:10.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/bsdLib.rules
++++ xutils-dev/xorg-cf-files/bsdLib.rules
@@ -13,6 +13,12 @@
#define UseElfFormat NO
#endif
@@ -52,8 +52,8 @@ Index: xutils-dev/xorg-cf-files/bsdLib.rules
AllTarget(name) @@\
Index: xutils-dev/xorg-cf-files/gnu.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files/gnu.cf 2006-05-29 22:43:00.000000000 -0400
-+++ xutils-dev/xorg-cf-files/gnu.cf 2006-05-29 22:52:10.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/gnu.cf
++++ xutils-dev/xorg-cf-files/gnu.cf
@@ -17,16 +17,231 @@
#ifndef OSTeenyVersion
#define OSTeenyVersion DefaultOSTeenyVersion
@@ -617,8 +617,8 @@ Index: xutils-dev/xorg-cf-files/gnu.cf
+#endif
Index: xutils-dev/xorg-cf-files/gnuLib.rules
===================================================================
---- xutils-dev.orig/xorg-cf-files/gnuLib.rules 2006-05-29 22:24:15.000000000 -0400
-+++ xutils-dev/xorg-cf-files/gnuLib.rules 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/gnuLib.rules
++++ xutils-dev/xorg-cf-files/gnuLib.rules
@@ -17,7 +17,6 @@
#define ForceNormalLib NO
#endif
@@ -819,8 +819,8 @@ Index: xutils-dev/xorg-cf-files/gnuLib.rules
*/
Index: xutils-dev/xorg-cf-files/gnuLib.tmpl
===================================================================
---- xutils-dev.orig/xorg-cf-files/gnuLib.tmpl 2006-05-29 22:24:15.000000000 -0400
-+++ xutils-dev/xorg-cf-files/gnuLib.tmpl 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/gnuLib.tmpl
++++ xutils-dev/xorg-cf-files/gnuLib.tmpl
@@ -1,8 +1,9 @@
-XCOMM
-XCOMM GNU Hurd shared library template
@@ -912,8 +912,8 @@ Index: xutils-dev/xorg-cf-files/gnuLib.tmpl
+#define NoMessageCatalog
Index: xutils-dev/xorg-cf-files/Imake.rules
===================================================================
---- xutils-dev.orig/xorg-cf-files/Imake.rules 2006-05-29 22:43:03.000000000 -0400
-+++ xutils-dev/xorg-cf-files/Imake.rules 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/Imake.rules
++++ xutils-dev/xorg-cf-files/Imake.rules
@@ -2722,6 +2722,20 @@
@@ -937,8 +937,8 @@ Index: xutils-dev/xorg-cf-files/Imake.rules
#ifndef SubdirLibraryRule
Index: xutils-dev/xorg-cf-files/Imake.tmpl
===================================================================
---- xutils-dev.orig/xorg-cf-files/Imake.tmpl 2006-05-29 22:43:07.000000000 -0400
-+++ xutils-dev/xorg-cf-files/Imake.tmpl 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/Imake.tmpl
++++ xutils-dev/xorg-cf-files/Imake.tmpl
@@ -902,37 +902,82 @@
#define ManSourcePath $(MANPATH)/man
#endif
@@ -1175,8 +1175,8 @@ Index: xutils-dev/xorg-cf-files/Imake.tmpl
Index: xutils-dev/xorg-cf-files/Library.tmpl
===================================================================
---- xutils-dev.orig/xorg-cf-files/Library.tmpl 2006-05-29 22:24:15.000000000 -0400
-+++ xutils-dev/xorg-cf-files/Library.tmpl 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/Library.tmpl
++++ xutils-dev/xorg-cf-files/Library.tmpl
@@ -37,6 +37,14 @@
#define DoExtraLib NO
#endif
@@ -1286,8 +1286,8 @@ Index: xutils-dev/xorg-cf-files/Library.tmpl
# if !defined(LibInstall) || LibInstall
Index: xutils-dev/xorg-cf-files/linux.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files/linux.cf 2006-05-29 22:46:00.000000000 -0400
-+++ xutils-dev/xorg-cf-files/linux.cf 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/linux.cf
++++ xutils-dev/xorg-cf-files/linux.cf
@@ -107,31 +107,48 @@
XCOMM libc: (LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
XCOMM binutils: (LinuxBinUtilsMajorVersion)
@@ -1803,8 +1803,8 @@ Index: xutils-dev/xorg-cf-files/linux.cf
+#endif
Index: xutils-dev/xorg-cf-files/NetBSD.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files/NetBSD.cf 2006-05-29 22:24:15.000000000 -0400
-+++ xutils-dev/xorg-cf-files/NetBSD.cf 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/NetBSD.cf
++++ xutils-dev/xorg-cf-files/NetBSD.cf
@@ -18,12 +18,178 @@
#define OSTeenyVersion DefaultOSTeenyVersion
#endif
@@ -2008,7 +2008,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
#else
#define DlLibrary /**/
#endif
-@@ -334,7 +506,11 @@
+@@ -336,7 +508,11 @@
/* NetBSD doesn't have gperf in the base install */
#define DontRebuildGperfOutput YES
@@ -2021,7 +2021,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
* NetBSD doesn't have perl in default system
* you may override this in host.def if you installed perl from the packages
*/
-@@ -353,7 +529,13 @@
+@@ -355,7 +531,13 @@
/*
* Make & install Features
*/
@@ -2035,7 +2035,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
#define CompressAllFonts YES
#define GzipFontCompression YES
#define DefaultUserPath /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:$(BINDIR)
-@@ -457,6 +639,8 @@
+@@ -463,6 +645,8 @@
@@\
.EXEC:
@@ -2044,7 +2044,7 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
/*
* Man pages need to be formatted when installed, so override the default
* imake rules.
-@@ -546,6 +730,8 @@
+@@ -552,6 +736,8 @@
@@\
InstallManPageAliasesBase(file,destdir,aliases)
@@ -2055,8 +2055,8 @@ Index: xutils-dev/xorg-cf-files/NetBSD.cf
* and on all ELF platforms.
Index: xutils-dev/xorg-cf-files/sco5.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files/sco5.cf 2006-05-29 22:43:06.000000000 -0400
-+++ xutils-dev/xorg-cf-files/sco5.cf 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/sco5.cf
++++ xutils-dev/xorg-cf-files/sco5.cf
@@ -69,7 +69,7 @@
#endif
@@ -2068,8 +2068,8 @@ Index: xutils-dev/xorg-cf-files/sco5.cf
#define StandardDefines -DSYSV -Di386 -DSCO325 -D__SCO__
Index: xutils-dev/xorg-cf-files/usl.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files/usl.cf 2006-05-29 22:24:15.000000000 -0400
-+++ xutils-dev/xorg-cf-files/usl.cf 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/usl.cf
++++ xutils-dev/xorg-cf-files/usl.cf
@@ -159,7 +159,7 @@
#endif
@@ -2081,8 +2081,8 @@ Index: xutils-dev/xorg-cf-files/usl.cf
#define GencatFlags -m
Index: xutils-dev/xorg-cf-files/X11.tmpl
===================================================================
---- xutils-dev.orig/xorg-cf-files/X11.tmpl 2006-05-29 22:43:05.000000000 -0400
-+++ xutils-dev/xorg-cf-files/X11.tmpl 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/X11.tmpl
++++ xutils-dev/xorg-cf-files/X11.tmpl
@@ -45,7 +45,7 @@
# if defined XorgVersionString
# define XOrgReleaseString Release XorgVersionString
@@ -2331,8 +2331,8 @@ Index: xutils-dev/xorg-cf-files/X11.tmpl
/*
Index: xutils-dev/xorg-cf-files/xfree86.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files/xfree86.cf 2006-05-29 22:24:15.000000000 -0400
-+++ xutils-dev/xorg-cf-files/xfree86.cf 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/xfree86.cf
++++ xutils-dev/xorg-cf-files/xfree86.cf
@@ -100,6 +100,13 @@
#define XVendorManNameString XFree86
#endif
@@ -2528,8 +2528,8 @@ Index: xutils-dev/xorg-cf-files/xfree86.cf
Index: xutils-dev/xorg-cf-files/xorg.cf
===================================================================
---- xutils-dev.orig/xorg-cf-files/xorg.cf 2006-05-29 22:43:03.000000000 -0400
-+++ xutils-dev/xorg-cf-files/xorg.cf 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/xorg.cf
++++ xutils-dev/xorg-cf-files/xorg.cf
@@ -262,6 +262,11 @@
#define GlideDriver /**/
#endif
@@ -2653,8 +2653,8 @@ Index: xutils-dev/xorg-cf-files/xorg.cf
Index: xutils-dev/xorg-cf-files/xorgversion.def
===================================================================
---- xutils-dev.orig/xorg-cf-files/xorgversion.def 2006-05-29 22:24:15.000000000 -0400
-+++ xutils-dev/xorg-cf-files/xorgversion.def 2006-05-29 22:52:11.000000000 -0400
+--- xutils-dev.orig/xorg-cf-files/xorgversion.def
++++ xutils-dev/xorg-cf-files/xorgversion.def
@@ -1,5 +1,5 @@
#define XORG_VERSION_MAJOR 6
-#define XORG_VERSION_MINOR 8
commit 4a665c455350910d6eb1b070dd18ffe9533f4882
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 9 14:48:55 2010 +0200
Drop 01_netbsd_imake.c_fixes.diff.
Doesn't apply, and Debian/NetBSD seems dead.
diff --git a/debian/changelog b/debian/changelog
index 4bbd8ab..56dcfaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ xutils-dev (1:7.5+3) UNRELEASED; urgency=low
* util-macros 1.7.0.
* imake 1.0.3.
+ * Drop 01_netbsd_imake.c_fixes.diff. Doesn't apply, and Debian/NetBSD seems
+ dead.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Apr 2010 17:53:38 +0200
diff --git a/debian/patches/01_netbsd_imake.c_fixes.diff b/debian/patches/01_netbsd_imake.c_fixes.diff
deleted file mode 100644
index b95a3ea..0000000
--- a/debian/patches/01_netbsd_imake.c_fixes.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-$Id: 841_netbsd_imake.c_fixes.diff 689 2005-10-19 22:11:30Z dnusinow $
-
-Patch to imake.c for Debian/NetBSD support by Joel Baker
-<lucifer@lightbearer.com>.
-
-Index: a/imake/imake.c
-===================================================================
---- a/imake/imake.c.orig 2006-05-29 22:37:55.000000000 -0400
-+++ b/imake/imake.c 2006-05-29 22:44:50.000000000 -0400
-@@ -1087,6 +1087,10 @@
- fprintf (inFile, "%s\n", "#define LinuxWare 11");
- fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12");
-
-+ fprintf (inFile, "%s\n", "#define NetBSDUnknown 0");
-+ fprintf (inFile, "%s\n", "#define NetBSDNative 1");
-+ fprintf (inFile, "%s\n", "#define NetBSDDebian 2");
-+
- #ifdef CROSSCOMPILE
- if (CrossCompiling) {
- fprintf (inFile, "%s\n",
-@@ -1108,6 +1112,8 @@
- if (lstat (debian, &sb) == 0) {
- fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxDebian");
- fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Debian");
-+ fprintf (inFile, "%s\n", "#define DefaultNetBSDDistribution NetBSDDebian");
-+ fprintf (inFile, "%s\n", "#define DefaultNetBSDDistName Debian");
- /* You could also try to get the version of the Debian distrib by looking
- * at the content of /etc/debian_version */
- return;
-@@ -1116,6 +1122,8 @@
-
- fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown");
- fprintf (inFile, "%s\n", "#define DefaultLinuxDistName Unknown");
-+ fprintf (inFile, "%s\n", "#define DefaultNetBSDDistribution NetBSDUnknown");
-+ fprintf (inFile, "%s\n", "#define DefaultNetBSDDistName Unknown");
- /* would like to know what version of the distribution it is */
- }
-
diff --git a/debian/patches/series b/debian/patches/series
index 57ac33b..3ed579a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_netbsd_imake.c_fixes.diff
02_mkdirhier_rewrite.diff
03_xutils-dev-FHS.diff
04_xutils-dev-debian.diff
commit 2a2e2b7b3e3f60cb698fdded0a4af8c4fd596b8b
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 9 14:44:54 2010 +0200
imake 1.0.3.
diff --git a/debian/changelog b/debian/changelog
index 0f07e6f..4bbd8ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xutils-dev (1:7.5+3) UNRELEASED; urgency=low
* util-macros 1.7.0.
+ * imake 1.0.3.
-- Julien Cristau <jcristau@debian.org> Sat, 03 Apr 2010 17:53:38 +0200
diff --git a/imake/COPYING b/imake/COPYING
index 7f33cbf..013874a 100644
--- a/imake/COPYING
+++ b/imake/COPYING
@@ -1,12 +1,48 @@
-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) 1985, 1986, 1987, 1989, 1993, 1994, 1996, 1998 The Open Group
-Please submit updated COPYING files to the Xorg bugzilla:
+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.
-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:
+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.
-http://lists.freedesktop.org/mailman/listinfo/xorg
+Except as contained in this notice, the name of The Open Group 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 Open Group.
+
+Copyright © 1999, 2000, 2003 by The XFree86 Project, Inc. All Rights Reserved.
+
+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 XFREE86 PROJECT 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.
+
+Except as contained in this notice, the name of the XFree86 Project 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
+XFree86 Project.
diff --git a/imake/ChangeLog b/imake/ChangeLog
index 7c5c22f..33f6c36 100644
--- a/imake/ChangeLog
+++ b/imake/ChangeLog
@@ -1,67 +1,439 @@
-2006-05-15 Adam Jackson <ajax@freedesktop.org>
+commit 48145e04d24b1c575a22bac69c3c3033f72322fc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Apr 15 19:52:20 2010 -0700
- * configure.ac:
- Bump to 1.0.2
+ imake 1.0.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-2006-04-08 Donnie Berkholz <spyderous@gentoo.org>
+commit 6a71b39eb5a425aeee13f0e62d225dd0c6bf4e05
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Apr 15 19:38:50 2010 -0700
- reviewed by: Adam Jackson
+ Fill in COPYING file with notices from code & man pages
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- * imake.c: (get_libc_version):
- Allow specifying TMPDIR environment variable to use instead of /tmp, for
- systems on which /tmp is mounted noexec (Martin Schlemmer).
+commit 8d8c90973f5862e8d324a4e1cd94896a43d0c27e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Apr 15 19:22:57 2010 -0700
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Use $(AM_V_GEN) to silence commands for generating scripts & man pages
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- * configure.ac:
- Update package version for X11R7 release.
+commit a00cc6e7bd60eb81aeee4fa7dcbb3a07b352760d
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Apr 15 19:20:36 2010 -0700
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Migrate to xorg-macros 1.4, with XORG_DEFAULT_OPTIONS & INSTALL
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+commit 4e25c6af47bfac6e2b6910f5d415d788cf3398c4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 8 10:25:14 2009 -0400
-2005-12-11 Alan Coopersmith <alan.coopersmith@sun.com>
+ imake: use XORG_CHANGELOG macro to create ChangeLog. #22611
+
+ Build break: Makefile.am: command not found: git-log
+
+ Adding the macro in configure.ac and use it in Makefile.am
+ Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
+ Tested: running autogen.sh, make and 'make dist'
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
- * Makefile.am:
- Fix mkhtmlindex rules to not use $< so they work with non-GNU makes.
+commit 2e164f61a461a21a74f2050f8da886373307cc5a
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 24 13:49:13 2009 -0700
-2005-12-10 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Make cpp statement indenting more consistent
+
+ Auto-fixed with imdent from Paul Dubois (of imake book infamy)
+ Also stripped trailing whitespace to make git happier
+
+ git diff -w shows no changes in this patch other than whitespace
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
- * Makefile.am:
- * configure.ac:
- Add support for building imake config utilities.
+commit 29e3bccdb5dbc5ea45d58bd3d454a4b8cda36398
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 24 13:45:09 2009 -0700
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Drop some ancient SunOS 4 & A/UX support bits
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+commit 209bab8478a5a205d715a5f2f50cd32c4b69581e
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Wed Jun 24 13:43:15 2009 -0700
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Drop some unused #if 0 & #ifdef MONOLITH sections
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+commit 5667fbb0f85f2b34aaba7ea702e7d252f2d4adb6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jun 22 18:59:09 2009 -0700
-2005-11-24 Alan Coopersmith <alan.coopersmith@sun.com>
+ Convert HAS_MKSTEMP check from #if ...OS list... to autoconf
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
- * Makefile.am:
- Add makeg script & man page.
+commit 22578c3718e41da72c66ce6a4186ec7315d6e3ad
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jun 22 18:26:21 2009 -0700
-2005-11-12 Alan Coopersmith <alan.coopersmith@sun.com>
+ Only install man pages for programs/scripts being installed
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
- * configure.ac:
- * Makefile.am:
- Substitute variables in man pages
- Set CPP_PROGRAM to path to cpp
+commit 705178e8f8414730739386f8841cd99f49184d56
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jun 22 18:18:50 2009 -0700
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ Add .gitignore
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+commit 8f0d3c8cb5e74faffbb546b0a0b47a883859fd24
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Jun 22 18:15:26 2009 -0700
-2005-10-16 Donnie Berkholz <spyderous@gentoo.org>
+ Doc updates: reflect current state, pointers to Paul Dubois website/book
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
- * Makefile.am:
- Bug #4725 <https://bugs.freedesktop.org/show_bug.cgi?id=4725>
- Detect cf files in the correct location and mirror the monolithic
- install.
+commit eb8e41c3b3f280c34947579a5ee9fa511aee9acf
+Merge: e215b32... 9653950...
+Author: Jeremy C. Reed <reed@tx.reedmedia.net>
+Date: Thu Feb 14 23:27:42 2008 -0600
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/util/imake
+
+commit e215b32a5b46a0c49be1baa4595f258f275c3fb0
+Author: Jeremy C. Reed <reed@tx.reedmedia.net>
+Date: Thu Feb 14 22:41:51 2008 -0600
+
+ Stop core dump.
+
+ Don't abort() if pclose(). Because pipe may have already closed.
+
+ This is in get_stackprotector (only on OpenBSD and DragonFly).
+
+commit 96539504eec3e6e1e43a6f894770835765b0007d
+Author: Jeremy C. Reed <reed@tx.reedmedia.net>
+Date: Thu Feb 14 22:41:51 2008 -0600
+
+ Stop core dump.
+
+ Don't abort() if pclose(). Because pipe may have already closed.
+
+ This is in get_stackprotector (only on OpenBSD and DragonFly).
+
+ I doubt this function even worked, because gcc -v goes to stderr so
+ it reads nothing.
+
+commit 7e541aa0efe7000972d992a3c1569c4f7a8d9201
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:39:16 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit e10ad52b0a0d4fc63120e6b301d21f0829beef77
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Fri May 19 18:44:42 2006 +0000
+
+ Bump to 1.0.2
+
+commit ef2ef80f564098fe244c5a2065930b8502879043
+Author: Donnie Berkholz <spyderous@gentoo.org>
+Date: Sat Apr 8 21:43:31 2006 +0000
+
+ Allow specifying TMPDIR environment variable to use instead of /tmp, for
+ systems on which /tmp is mounted noexec (Martin Schlemmer).
+
+commit b8d8f49ba2660d4d84ca9c3e4a82118a07c4e889
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:30:08 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 7dd15a5adbad23deba0a7c2b5bb39a7bb39e70d6
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:36:01 2005 +0000
+
+ Stub COPYING files
+
+commit bad47fc3927b766cde5af54c6c9786f2dac5345c
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:40 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 4c12f30420340a4a4f0f6f0d21d20da988982820
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sun Dec 11 17:18:40 2005 +0000
+
+ Fix mkhtmlindex rules to not use $< so they work with non-GNU makes.
+
+commit b87a680569dd388ad108d43087aee6c8a50ff663
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 10 16:30:35 2005 +0000
+
+ Add support for building imake config utilities.
+
+commit 15cb7c3dfb5b7d4a9e5d84514c8c5140ff6050c8
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:46 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit bab6d99929b6dfa339993093ea7dacffc98c5acd
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:47 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit a7790a9fc6e70f5dcefbe58219b5192857c88c45
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:00:24 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 c9db5d7eb65a59b7e4bae091acb8194bd01de284
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Thu Nov 24 18:06:39 2005 +0000
+
+ Add makeg script & man page to imake package
+
+commit d6313cf27320281f24d6f852fc7f8d0bb8aacd6b
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Nov 12 19:55:28 2005 +0000
+
+ Substitute variables in man pages Set CPP_PROGRAM to path to cpp
+
+commit cd8ef36c4862f710621c35a4732ca3d0e49e8d5e
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:25:57 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit e53156a68f0138a8b0af408436fd54826b677cc6
+Author: Kean Johnson <kean@armory.com>
+Date: Tue Nov 8 06:33:24 2005 +0000
+
+ See ChangeLog entry 2005-11-07 for details.
+
+commit 009b63897b8d2bc4fd27ff04bc3884317cf0b17d
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:16 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 19f4715eb18c20d357f03ca6b245bec5e58833e5
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Oct 8 20:46:40 2005 +0000
+
+ Updates for modular build
+
+commit f4937241d85b026f0beca69eba8ce448143e3f0f
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Oct 8 20:38:57 2005 +0000
+
+ Build system for imake
+
+commit 5acc1119e447c0855f649b9d8ae8ddb9cf8373b7
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 3 16:17:10 2005 +0000
+
+ Bug #3812 <https://bugs.freedesktop.org/show_bug.cgi?id=3812> Patch #3462
+ <https://bugs.freedesktop.org/attachment.cgi?id=3462> GNU/kFreeBSD
+ Imake support (Robert Millan)
+
+commit ea133dd95dbd63d5db79af1f364e9678331989e2
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Aug 26 05:01:37 2005 +0000
+
+ Make makedepend excruciatingly safe (Debian #011).
+
+commit 5f90561e8ddcccec3d35355c7b4ad5925031f5d5
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Aug 1 02:13:55 2005 +0000
+
+ Pass through __BUILTIN_VA_STRUCT and __BUILTIN_VA_ARG_INCR defines in
+ makedepend so it doesn't issue errors when source files include
+ <varargs.h> or <stdarg.h> on Solaris 10.
+
+commit 65ea7b4cc68153673dcdce016acd6ee6acc4aec3
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date: Wed Mar 2 11:20:29 2005 +0000
+
+ xc/config/cf/DragonFly.cf
+ xc/config/cf/Imake.cf
+ xc/config/cf/Imakefile
+ xc/config/imake/imake.c
+ xc/config/imake/imakemdep.h
+ xc/extras/drm/shared/drm.h
+ xc/include/Xos_r.h
+ xc/lib/xtrans/Xtranssock.c
+ xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
+ xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
+ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
+ //bugs.freedesktop.org/show_bug.cgi?id=1712) attachment #2004
+ (https://bugs.freedesktop.org/attachment.cgi?id=2004): Add support for
+ DragonFly/BSD platform. Patch by Jeroen Ruigrok <asmodai@tendra.org>
+ and Mike Verona <firedragonfly@gmail.com>.
+
+commit ecdad73b62bb3222d02667d2add16d7417a5da9b
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date: Thu Feb 24 15:31:09 2005 +0000
+
+ enable detection of gcc compiler for cygwin and mingw
+
+commit af6a6a1c8a30b88b2eb80aa47f58fd8ae26d9677
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Wed Jan 19 22:28:20 2005 +0000
+
+ Pass through additional #defines for Solaris. (Sun bug id #5097074 - Alan
+ Coopersmith)
+
+commit 19e94341580c4c108c8d1615ae4542e2ee27431a
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date: Sat Dec 4 00:42:46 2004 +0000
+
+ Encoding of numerous files changed to UTF-8
+
+commit eb6967199448890591bec799d70c45827bc188eb
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date: Mon Nov 15 15:06:52 2004 +0000
+
+ Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
+ mingw (Win32) port
+
+commit 36fbf892d1c2740afa51911b6f2c2e4bf8f871c0
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Sat Oct 30 20:33:43 2004 +0000
+
+ Add -d flag for compilers like the Sun C compilers that produce dependency
+ lists themselves. To use with the Sun compilers, add to host.def: #
+ define UseCCMakeDepend YES # define DependFlags -cc $(CC) -d -xM (Sun
+ bug id #4245688 - fix by Alan Coopersmith)
+ Add Solaris to the platforms on which mprotect is run to set execute
+ permissions when necessary. (Sun bug id #6175128 - fix by Alan
+ Coopersmith)
+ Internationalize digital output (Sun bug id #4119396 - fix by Steve
+ Swales), add -bgpixmap option to set XPM file as background (originally
+ from STSF project version of xclock by Alan Coopersmith)
+ xc/programs/xmodmap/handle.c,pf.c xmodmap was printing line numbers which
+ are one too low in error messages (Xorg bugzilla #1739, Sun bug id
+ 4637857 - fix by Sam Lau)
+
+commit 02fa88c73e7df616e1c620996d613b56a119ea4d
+Author: Egbert Eich <eich@suse.de>
+Date: Tue Oct 19 13:50:06 2004 +0000
+
+ Enabling modules and DRI for Linux HPPA.
+ Removing hpsocket.c as it isn't used anywhere any more (Bugzilla #1584).
+
+commit 8be49ad988e8072389042bb9240b074b89a828ad
+Author: Egbert Eich <eich@suse.de>
+Date: Mon Oct 18 14:26:35 2004 +0000
+
+ powerpc/powerpc64 build fixes.
+
+commit 53f7aa94ebd7864b411320efe8a615580fad7085
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Sat Oct 9 22:04:13 2004 +0000
+
+ Fix ProPolice support for OpenBSD (merge with the HasGccStackProtector
+ define that was used on OpenBSD).
+ remove -ansi from DefaultCCOptions on OpenBSD.
+
+commit a60680db574e2e6c910352c4093c06dc562741ef
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Aug 11 21:14:02 2004 +0000
+
+ Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith).
+
+commit e3174f16ac5aabc0da0c22c79b138103eaba0c28
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Fri Jun 11 17:59:30 2004 +0000
+
+ Allow overriding of os version with OSREL env var on FreeBSD. Used in the
+ ports cluster and cross-version testing.
+
+commit 73f12a29fbfdac7f1cb7956f32564e253e313527
+Author: Egbert Eich <eich@suse.de>
+Date: Thu May 6 17:31:17 2004 +0000
+
+ BugZilla #601: Fixing makedepend choking on floating point exception
+ because CHAR_BIT is defined to __CHAR_BIT__ which is a compiler
+ intrinsic define. BugZilla #605: Fixing build on IA64 which is broken
+ due to the inclusion of the kernel header asm/page.h. Kernel headers
+ however don't work with
+ -ansi. The inclusion of asm/page.h can however savely be removed as it
+ there are plenty of other ways to determine the page size.
+
+commit e825f4eabd82155a1327c42f16a6e3bcba96b311
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 18:42:00 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit fa8f86352aab5825ca289969cfd11d90e56eb579
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:27:28 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 6c30fa731ba63151d792f278bf0b4dc3d2010d43
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:09:38 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit aa4808e4d4245d9ef0e6dae09670295da49972d0
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:34:16 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit cb1cabdedcd488a729923ef6677b5e7b13cb3d5a
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:21:15 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit b1abaa61cb80aa0c282dbb15c8d834c36c2c9443
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Jan 29 08:06:33 2004 +0000
+
+ Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit 91f4b859c20d25898da3324921758c2d35523fd5
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Tue Nov 25 19:26:56 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit e5ab5c93d3178aa82b66e2c086b54e042930725e
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:20 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 1bc16368b0ff5701fa740aba943ac47a4f99b258
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:20 2003 +0000
+
+ Initial revision
+
+commit 86fae01174ab672736557a4bb1b2188cf3cec064
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:29 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/imake/INSTALL b/imake/INSTALL
new file mode 100644
index 0000000..8b82ade
--- /dev/null
+++ b/imake/INSTALL
@@ -0,0 +1,291 @@
Reply to: