xutils-dev: Changes to 'debian-unstable'
debian/changelog | 23
debian/patches/02_mkdirhier_rewrite.diff | 2
debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff | 27
debian/patches/series | 1
debian/xsfbs/xsfbs-autoreconf.mk | 150 ++
debian/xsfbs/xsfbs.mk | 374 +++++
debian/xsfbs/xsfbs.sh | 907 +++++++++++++
gccmakedep/aclocal.m4 | 87 +
gccmakedep/config.guess | 63
gccmakedep/config.sub | 87 -
gccmakedep/configure | 343 +---
gccmakedep/mkinstalldirs | 89 -
imake/aclocal.m4 | 87 +
imake/config.guess | 63
imake/config.sub | 87 -
imake/configure | 351 +----
imake/mkinstalldirs | 89 -
lndir/aclocal.m4 | 87 +
lndir/compile | 147 +-
lndir/config.guess | 667 +++++----
lndir/config.sub | 222 ++-
lndir/configure | 285 +---
lndir/depcomp | 103 +
lndir/install-sh | 477 +++---
lndir/missing | 142 +-
lndir/mkinstalldirs | 89 -
makedepend/AUTHORS | 2
makedepend/ChangeLog | 10
makedepend/Makefile.in | 5
makedepend/aclocal.m4 | 107 +
makedepend/compile | 147 +-
makedepend/config.guess | 667 +++++----
makedepend/config.sub | 230 ++-
makedepend/configure | 555 ++-----
makedepend/configure.ac | 2
makedepend/depcomp | 103 +
makedepend/install-sh | 477 +++---
makedepend/makedepend-config.h.in | 9
makedepend/missing | 142 +-
makedepend/mkinstalldirs | 111 -
makedepend/parse.c | 9
util-macros/ChangeLog | 36
util-macros/Makefile.am | 2
util-macros/Makefile.in | 126 -
util-macros/aclocal.m4 | 37
util-macros/configure | 202 +-
util-macros/configure.ac | 2
util-macros/xorg-macros.m4 | 2
util-macros/xorgversion.m4 | 20
xorg-cf-files/configure | 140 +-
xorg-cf-files/mkinstalldirs | 89 -
51 files changed, 5291 insertions(+), 2990 deletions(-)
New commits:
commit c82ab28a750327c28fd8b1dc592e79198cd9be81
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 04:00:10 2007 +0200
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 8a87a51..681ba44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
+xutils-dev (1:7.2.ds2-1) unstable; urgency=low
[ Julien Cristau ]
* [xorg-cf-files] Add patch from upstream git to define GNUArchitecture on
@@ -10,8 +10,9 @@ xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
[ Julien Cristau ]
* Update makedepend to 1.0.1.
+ * Upload to unstable.
- -- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2007 03:48:18 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2007 03:55:00 +0200
xutils-dev (1:7.2.ds-1) experimental; urgency=low
commit feff7efb9f00b4f1b032420a509e5a03934ab4ac
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Apr 9 03:52:57 2007 +0200
Update to makedepend 1.0.1.
diff --git a/debian/changelog b/debian/changelog
index c81cfc1..8a87a51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,10 @@ xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
* [imake] Fix typo in 02_mkdirhier_rewrite.diff.
Thanks, A. Costa (closes: #306690).
- -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sun, 18 Feb 2007 17:24:31 +0100
+ [ Julien Cristau ]
+ * Update makedepend to 1.0.1.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 09 Apr 2007 03:48:18 +0200
xutils-dev (1:7.2.ds-1) experimental; urgency=low
diff --git a/makedepend/AUTHORS b/makedepend/AUTHORS
index fdcbc78..61a9a69 100644
--- a/makedepend/AUTHORS
+++ b/makedepend/AUTHORS
@@ -16,4 +16,4 @@ Additional contributors:
Mark Snitily
Alexander Stohr
-$XdotOrg: $
\ No newline at end of file
+$XdotOrg: $ÿÿÿÿÿÿÿÿ
\ No newline at end of file
diff --git a/makedepend/ChangeLog b/makedepend/ChangeLog
index 1075e26..132124d 100644
--- a/makedepend/ChangeLog
+++ b/makedepend/ChangeLog
@@ -1,3 +1,13 @@
+2007-03-21 Jeremy C. Reed <reed@reedmedia.net>
+
+ * configure.ac:
+ Update version for release.
+
+2006-06-02 Alan Coopersmith <alan.coopersmith@sun.com>
+
+ * parse.c (slookup):
+ Coverity #925: Pointer "file" dereferenced before NULL check
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/makedepend/Makefile.in b/makedepend/Makefile.in
index 305a7c6..c2f50ff 100644
--- a/makedepend/Makefile.in
+++ b/makedepend/Makefile.in
@@ -43,8 +43,7 @@ bin_PROGRAMS = makedepend$(EXEEXT)
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/makedepend-config.h.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog compile \
- config.guess config.sub depcomp install-sh missing \
- mkinstalldirs
+ config.guess config.sub depcomp install-sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -52,7 +51,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = makedepend-config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
diff --git a/makedepend/aclocal.m4 b/makedepend/aclocal.m4
index f041bfd..daa452d 100644
--- a/makedepend/aclocal.m4
+++ b/makedepend/aclocal.m4
@@ -216,7 +216,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.2
+ [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -620,7 +620,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -633,6 +634,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
diff --git a/makedepend/config.sub b/makedepend/config.sub
index 387c18d..fab0aa3 100755
--- a/makedepend/config.sub
+++ b/makedepend/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1366,6 +1371,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
diff --git a/makedepend/configure b/makedepend/configure
index 471e4d9..40e61c7 100755
--- a/makedepend/configure
+++ b/makedepend/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for makedepend 1.0.0.
+# Generated by GNU Autoconf 2.61 for makedepend 1.0.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='makedepend'
PACKAGE_TARNAME='makedepend'
-PACKAGE_VERSION='1.0.0'
-PACKAGE_STRING='makedepend 1.0.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='makedepend 1.0.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1191,7 +1191,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures makedepend 1.0.0 to adapt to many kinds of systems.
+\`configure' configures makedepend 1.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1261,7 +1261,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of makedepend 1.0.0:";;
+ short | recursive ) echo "Configuration of makedepend 1.0.1:";;
esac
cat <<\_ACEOF
@@ -1354,7 +1354,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-makedepend configure 1.0.0
+makedepend configure 1.0.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1368,7 +1368,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by makedepend $as_me 1.0.0, which was
+It was created by makedepend $as_me 1.0.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2038,7 +2038,7 @@ fi
# Define the identity of the package.
PACKAGE='makedepend'
- VERSION='1.0.0'
+ VERSION='1.0.1'
cat >>confdefs.h <<_ACEOF
@@ -4190,6 +4190,29 @@ fi
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
fi
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile"
@@ -4603,7 +4626,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by makedepend $as_me 1.0.0, which was
+This file was extended by makedepend $as_me 1.0.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4656,7 +4679,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-makedepend config.status 1.0.0
+makedepend config.status 1.0.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/makedepend/configure.ac b/makedepend/configure.ac
index a8e48d1..f9cbd07 100644
--- a/makedepend/configure.ac
+++ b/makedepend/configure.ac
@@ -1,6 +1,6 @@
dnl $XdotOrg: $
AC_PREREQ([2.57])
-AC_INIT([makedepend], [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([makedepend], [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_CONFIG_HEADER([makedepend-config.h])
diff --git a/makedepend/makedepend-config.h.in b/makedepend/makedepend-config.h.in
index be22817..3f04636 100644
--- a/makedepend/makedepend-config.h.in
+++ b/makedepend/makedepend-config.h.in
@@ -24,6 +24,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
diff --git a/makedepend/mkinstalldirs b/makedepend/mkinstalldirs
deleted file mode 100755
index 259dbfc..0000000
--- a/makedepend/mkinstalldirs
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-06-29.22
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
- case $1 in
- -h | --help | --h*) # -h for help
- echo "$usage"
- exit $?
- ;;
- -m) # -m PERM arg
- shift
- test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
- dirmode=$1
- shift
- ;;
- --version)
- echo "$0 $scriptversion"
- exit $?
- ;;
- --) # stop option processing
- shift
- break
- ;;
- -*) # unknown option
- echo "$usage" 1>&2
- exit 1
- ;;
- *) # first non-opt arg
- break
- ;;
- esac
-done
-
-for file
-do
- if test -d "$file"; then
- shift
- else
- break
- fi
-done
-
-case $# in
- 0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error. This is a problem when calling mkinstalldirs
-# from a parallel make. We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
- '')
- if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- echo "mkdir -p -- $*"
- exec mkdir -p -- "$@"
- else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- test -d ./-p && rmdir ./-p
- test -d ./--version && rmdir ./--version
- fi
- ;;
- *)
- if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
- test ! -d ./--version; then
- echo "mkdir -m $dirmode -p -- $*"
- exec mkdir -m "$dirmode" -p -- "$@"
- else
- # Clean up after NextStep and OpenStep mkdir.
- for d in ./-m ./-p ./--version "./$dirmode";
- do
- test -d $d && rmdir $d
- done
- fi
- ;;
-esac
-
-for file
-do
- case $file in
- /*) pathcomp=/ ;;
- *) pathcomp= ;;
- esac
- oIFS=$IFS
- IFS=/
- set fnord $file
- shift
- IFS=$oIFS
-
- for d
- do
- test "x$d" = x && continue
-
- pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-
- if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
-
- mkdir "$pathcomp" || lasterr=$?
-
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
- lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
- errstatus=$lasterr
- fi
- fi
- fi
- fi
-
- pathcomp=$pathcomp/
- done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/makedepend/parse.c b/makedepend/parse.c
index 935c61d..5248293 100644
--- a/makedepend/parse.c
+++ b/makedepend/parse.c
@@ -429,9 +429,14 @@ struct symtab **
slookup(char *symbol, struct inclist *file)
{
register int first = 0;
- register int last = file->i_ndefs - 1;
+ register int last;
- if (file) while (last >= first)
+ if (file == NULL)
+ return NULL;
+
+ last = file->i_ndefs - 1;
+
+ while (last >= first)
{
/* Fast inline binary search */
register char *s1;
commit 0e3aa5fb2217fcd9292a2376372f5cc8eab5a50f
Author: Brice Goglin <brice.goglin@ens-lyon.org>
Date: Sun Feb 18 17:26:22 2007 +0100
* [imake] Fix typo in 02_mkdirhier_rewrite.diff.
Thanks, A. Costa (closes: #306690).
diff --git a/debian/changelog b/debian/changelog
index 6ce8096..c81cfc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* [xorg-cf-files] Add patch from upstream git to define GNUArchitecture on
GNU/kFreeBSD. Thanks, Robert Millan (closes: #357582).
- -- Julien Cristau <jcristau@debian.org> Sat, 17 Feb 2007 18:35:32 +0100
+ [ Brice Goglin ]
+ * [imake] Fix typo in 02_mkdirhier_rewrite.diff.
+ Thanks, A. Costa (closes: #306690).
+
+ -- Brice Goglin <Brice.Goglin@ens-lyon.org> Sun, 18 Feb 2007 17:24:31 +0100
xutils-dev (1:7.2.ds-1) experimental; urgency=low
diff --git a/debian/patches/02_mkdirhier_rewrite.diff b/debian/patches/02_mkdirhier_rewrite.diff
index a7f3c4f..71f5afd 100644
--- a/debian/patches/02_mkdirhier_rewrite.diff
+++ b/debian/patches/02_mkdirhier_rewrite.diff
@@ -253,7 +253,7 @@ Index: imake/mkdirhier.man
+.PP
+.B mkdirhier
+prefixes its diagnostic messages with the name under which it was invoked,
-+followed by a colon (\(oq:\(cq) so that its messages can be distingushed
++followed by a colon (\(oq:\(cq) so that its messages can be distinguished
+from others.
+.TP
+.B could not create directory \(dq\fIdirectory\fP\(dq
commit 24e5ca8d47b8b0cb581f4e23cfd129523f06e0e2
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 17 18:41:21 2007 +0100
[xorg-cf-files] Define GNUArchitecture on GNU/kFreeBSD.
Add patch by Robert Millan applied to upstream git to define GNUArchitecture
when __GLIBC__ is defined.
diff --git a/debian/changelog b/debian/changelog
index e8fb56d..6ce8096 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xutils-dev (1:7.2.ds-2) UNRELEASED; urgency=low
+
+ * [xorg-cf-files] Add patch from upstream git to define GNUArchitecture on
+ GNU/kFreeBSD. Thanks, Robert Millan (closes: #357582).
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 17 Feb 2007 18:35:32 +0100
+
xutils-dev (1:7.2.ds-1) experimental; urgency=low
* Update util-macros to 1.1.5 (X11R7.2).
diff --git a/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff b/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff
new file mode 100644
index 0000000..1fc0af2
--- /dev/null
+++ b/debian/patches/07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff
@@ -0,0 +1,27 @@
+From 9c8ca4fe2066924754c3c1ea78ef0788ceaf320b Mon Sep 17 00:00:00 2001
+From: Robert Millan <rmh@aybabtu.com>
+Date: Fri, 14 Jul 2006 18:50:34 -0700
+Subject: [PATCH] Bug #6310: GNUArchitecture needed for GNU/kFreeBSD
+
+<https://bugs.freedesktop.org/show_bug.cgi?id=6310>
+---
+ Imake.cf | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/xorg-cf-files/Imake.cf b/xorg-cf-files/Imake.cf
+index 3edd6a7..8676ad7 100644
+--- a/xorg-cf-files/Imake.cf
++++ b/xorg-cf-files/Imake.cf
+@@ -787,6 +787,9 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $
+ # ifdef __linux__
+ # define LinuxArchitecture
+ # endif
++# ifdef __GLIBC__
++# define GNUArchitecture
++# endif
+ # ifdef i386
+ # ifndef i386Architecture
+ # define i386Architecture
+--
+1.4.4.4
+
diff --git a/debian/patches/series b/debian/patches/series
index f54478f..f5871a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
04_xutils-dev-debian.diff
05_xaw_without_xp.diff
06_font_path.diff
+07_cf_GNUArchitecture_for_GNU_kFreeBSD.diff
commit 140b63f44c6da6850e47d338fa61dae7cb7943c8
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 17 18:06:49 2007 +0100
autoreconf -f -i in every subdir.
diff --git a/debian/changelog b/debian/changelog
index b881774..e8fb56d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xutils-dev (1:7.2.ds-1) experimental; urgency=low
* Update util-macros to 1.1.5 (X11R7.2).
+ * autoreconf everything.
- -- Julien Cristau <jcristau@debian.org> Sat, 17 Feb 2007 17:48:50 +0100
+ -- Julien Cristau <jcristau@debian.org> Sat, 17 Feb 2007 18:05:53 +0100
xutils-dev (1:7.1.ds-6) unstable; urgency=high
diff --git a/gccmakedep/aclocal.m4 b/gccmakedep/aclocal.m4
index 04221aa..ca89da5 100644
--- a/gccmakedep/aclocal.m4
+++ b/gccmakedep/aclocal.m4
@@ -58,7 +58,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.1
+ [XORG_MACROS_version=1.1.2
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -204,18 +204,17 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
-AC_CHECK_FILE(
- [$prefix/share/X11/sgml/defs.ent],
- [DEFS_ENT_PATH=$prefix/share/X11/sgml],
- [DEFS_ENT_PATH=]
-)
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
AC_PATH_PROG(LINUXDOC, linuxdoc)
AC_PATH_PROG(PS2PDF, ps2pdf)
AC_MSG_CHECKING([Whether to build documentation])
-if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then
+if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
BUILDDOC=yes
else
BUILDDOC=no
@@ -227,7 +226,7 @@ AC_MSG_RESULT([$BUILDDOC])
AC_MSG_CHECKING([Whether to build pdf documentation])
-if test x$PS2PDF != x ; then
+if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
else
BUILDPDFDOC=no
@@ -237,10 +236,10 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
AC_MSG_RESULT([$BUILDPDFDOC])
-MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
-MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
MAKE_PDF="$PS2PDF"
-MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B html --split=0"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
AC_SUBST(MAKE_TEXT)
AC_SUBST(MAKE_PS)
@@ -248,6 +247,72 @@ AC_SUBST(MAKE_PDF)
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_LINUXDOC
+# XORG_CHECK_DOCBOOK
+# -------------------
+# Minimum version: 1.0.0
+#
+# Checks for the ability to build output formats from SGML DocBook source.
+# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
+# indicates whether the necessary tools and files are found and, if set,
+# $(MAKE_XXX) blah.sgml will produce blah.xxx.
+AC_DEFUN([XORG_CHECK_DOCBOOK],[
+XORG_SGML_PATH=$prefix/share/sgml
+HAVE_DEFS_ENT=
+BUILDTXTDOC=no
+BUILDPDFDOC=no
+BUILDPSDOC=no
+BUILDHTMLDOC=no
+
+AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
+
+AC_PATH_PROG(DOCBOOKPS, docbook2ps)
+AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
+AC_PATH_PROG(DOCBOOKHTML, docbook2html)
+AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
+
+AC_MSG_CHECKING([Whether to build text documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
+ test x$BUILD_TXTDOC != xno; then
+ BUILDTXTDOC=yes
+fi
+AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
+AC_MSG_RESULT([$BUILDTXTDOC])
+
+AC_MSG_CHECKING([Whether to build PDF documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
+ test x$BUILD_PDFDOC != xno; then
+ BUILDPDFDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+AC_MSG_CHECKING([Whether to build PostScript documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
+ test x$BUILD_PSDOC != xno; then
+ BUILDPSDOC=yes
+fi
+AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
+AC_MSG_RESULT([$BUILDPSDOC])
+
+AC_MSG_CHECKING([Whether to build HTML documentation])
+if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
+ test x$BUILD_HTMLDOC != xno; then
+ BUILDHTMLDOC=yes
+fi
+AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
+AC_MSG_RESULT([$BUILDHTMLDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
+MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
+MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
+MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
+
+AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
+]) # XORG_CHECK_DOCBOOK
+
# XORG_CHECK_MALLOC_ZERO
# ----------------------
# Minimum version: 1.0.0
diff --git a/gccmakedep/config.guess b/gccmakedep/config.guess
index 917bbc5..396482d 100755
--- a/gccmakedep/config.guess
+++ b/gccmakedep/config.guess
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2005-07-08'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -106,7 +107,7 @@ set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -206,8 +207,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:ekkoBSD:*:*)
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -764,7 +768,14 @@ EOF
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -779,8 +790,11 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -794,7 +808,7 @@ EOF
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
- amd64:CYGWIN*:*:*)
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit ;;
p*:CYGWIN*:*)
@@ -817,6 +831,9 @@ EOF
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit ;;
@@ -851,7 +868,11 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
@@ -870,9 +891,16 @@ EOF
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
@@ -916,6 +944,9 @@ EOF
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
@@ -961,7 +992,7 @@ EOF
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
@@ -971,7 +1002,11 @@ EOF
LIBC=dietlibc
Reply to: