Hello community,
here is the log from the commit of package xorg-x11-util-devel for openSUSE:Factory
checked in at Tue Nov 2 10:42:27 CET 2010.
--------
--- xorg-x11-util-devel/xorg-x11-util-devel.changes 2010-09-04 21:40:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-util-devel/xorg-x11-util-devel.changes 2010-10-31 03:29:14.000000000 +0100
@@ -1,0 +2,16 @@
+Sun Oct 31 02:27:40 UTC 2010 - sndirsch@novell.com
+
+- imake 1.0.4
+ * This release provides a random collection of build
+ improvements, fixes for Cygwin compatibility, and janitorial
+ cleanups.
+
+-------------------------------------------------------------------
+Sat Oct 30 16:21:10 UTC 2010 - sndirsch@novell.com
+
+- makedepend 1.0.3
+ * This release fixes a bug if you have directories and files with
+ the same names (more likely with C++'s suffixless include
+ filenames, such as Qt's "QtCore").
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
imake-1.0.3.tar.bz2
makedepend-1.0.2.tar.bz2
New:
----
imake-1.0.4.tar.bz2
makedepend-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-util-devel.spec ++++++
--- /var/tmp/diff_new_pack.FF3XBa/_old 2010-11-02 10:41:56.000000000 +0100
+++ /var/tmp/diff_new_pack.FF3XBa/_new 2010-11-02 10:41:56.000000000 +0100
@@ -22,17 +22,17 @@
BuildRequires: pkgconfig xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 4
+Release: 5
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
Requires: xorg-x11-proto-devel
Summary: Include Files and Libraries mandatory for X11 Development
Source: gccmakedep-X11R7.1-1.0.2.tar.bz2
-Source1: imake-1.0.3.tar.bz2
+Source1: imake-1.0.4.tar.bz2
Source2: xorg-cf-files-1.0.3.tar.bz2
Source3: lndir-1.0.2.tar.bz2
-Source4: makedepend-1.0.2.tar.bz2
+Source4: makedepend-1.0.3.tar.bz2
Source5: xorg-sgml-doctools-1.5.tar.bz2
Patch1: xconf-sparc.diff
++++++ imake-1.0.3.tar.bz2 -> imake-1.0.4.tar.bz2 ++++++
++++ 4764 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/ChangeLog new/imake-1.0.4/ChangeLog
--- old/imake-1.0.3/ChangeLog 2010-04-16 04:58:44.000000000 +0200
+++ new/imake-1.0.4/ChangeLog 2010-10-31 03:10:56.000000000 +0100
@@ -1,3 +1,123 @@
+commit bf237073d39629599cb77bf0144f862c175bb640
+Author: Alan Coopersmith
+Date: Sat Oct 30 19:10:35 2010 -0700
+
+ imake 1.0.4
+
+ Signed-off-by: Alan Coopersmith
+
+commit 29c3c8f2fc3859b1c8e1dd1f2327ab51c40fca21
+Author: Gaetan Nadon
+Date: Sat Oct 30 19:08:31 2010 -0700
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+ Signed-off-by: Alan Coopersmith
+
+commit 3a3c6e584a1fee04a6bc4c11581c283d5fa8c603
+Author: Alan Coopersmith
+Date: Sat Oct 30 19:04:22 2010 -0700
+
+ Use autoconf standard HAVE_MKSTEMP instead of HAS_MKSTEMP
+
+ We no longer need to maintain compatibility with the monolith
+ Imakefile -D flags in the sources.
+
+ Signed-off-by: Alan Coopersmith
+
+commit f6587b17a6aef0404853ad5113158fddf4a90219
+Author: Alan Coopersmith
+Date: Sat Oct 30 18:59:39 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC, AC_PROG_SED, & AC_PROG_INSTALL are provided by
+ XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith
+
+commit bdf937d11774595eefc2ded78dcdf52dfe420443
+Author: Alan Coopersmith
+Date: Sat Oct 30 18:57:15 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Signed-off-by: Alan Coopersmith
+
+commit ca3374aee64c71c810159839c9b54c84b2bced24
+Author: Yaakov Selkowitz
+Date: Tue Apr 27 20:18:10 2010 -0500
+
+ Nuke RCS tags
+
+ Signed-off-by: Yaakov Selkowitz
+ Reviewed-by: Alan Coopersmith
+
+commit 01a05f973d52edc461c1100a939a70ea0ce9b048
+Author: Yaakov Selkowitz
+Date: Tue Apr 27 20:38:15 2010 -0500
+
+ mkdirhier: use mkdir -p
+
+ The '-p' option to mkdir(1) is required by SUSv2/Unix98, so we should be
+ able to rely on it on all systems we support. Some parts need to be
+ left in place in order to not alter some of its ancient, shall we say,
+ quirks.
+
+ Signed-off-by: Yaakov Selkowitz
+ Reviewed-by: Alan Coopersmith
+
+commit 098bf61eb89c3d93d2ed814d3e39e6412f6fcf9e
+Author: Yaakov Selkowitz
+Date: Tue Apr 27 19:18:27 2010 -0500
+
+ Use standard .gitignore with custom section for imake
+
+ Signed-off-by: Yaakov Selkowitz
+ Reviewed-by: Gaetan Nadon
+
+commit 04da52fb5c4721c0218dbe6537c9ad0f7bd2ab04
+Author: Yaakov Selkowitz
+Date: Tue Apr 27 19:14:35 2010 -0500
+
+ Use AC_PROG_SED to find sed
+
+ AC_PROG_SED sets SED as the path to a fully-functional 'sed' (which may
+ also be called 'gsed' if GNU sed is installed alongside a proprietary
+ version).
+
+ Signed-off-by: Yaakov Selkowitz
+ Reviewed-by: Alan Coopersmith
+
+commit 1127a5cb3166f4d5d0564732b3842fe81bf3e701
+Author: Yaakov Selkowitz
+Date: Tue Apr 27 19:06:32 2010 -0500
+
+ Allow for EXEEXT in appman_DATA rule
+
+ As a result of commit 22578c3718e41da72c66ce6a4186ec7315d6e3ad:
+
+ make[1]: *** No rule to make target `imake.exe.1', needed by `all-am'.
+ make[1]: *** No rule to make target `revpath.exe.1', needed by `all-am'.
+
+ On PE/COFF platforms EXEEXT is set to ".exe" and is appended by automake
+ to all *_PROGRAMS. For portability this must be accounted for in any
+ custom rules which refer to any *_PROGRAMS.
+
+ Signed-off-by: Yaakov Selkowitz
+ Reviewed-by: Alan Coopersmith
+
commit 48145e04d24b1c575a22bac69c3c3033f72322fc
Author: Alan Coopersmith
Date: Thu Apr 15 19:52:20 2010 -0700
@@ -107,7 +227,7 @@
Signed-off-by: Alan Coopersmith
commit eb8e41c3b3f280c34947579a5ee9fa511aee9acf
-Merge: e215b32... 9653950...
+Merge: e215b32 9653950
Author: Jeremy C. Reed
Date: Thu Feb 14 23:27:42 2008 -0600
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/cleanlinks new/imake-1.0.4/cleanlinks
--- old/imake-1.0.3/cleanlinks 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/cleanlinks 2010-05-15 05:23:23.000000000 +0200
@@ -7,7 +7,6 @@
#
# Author: David Dawes
#
-# $XFree86: xc/config/util/cleanlinks.sh,v 1.2 2003/04/15 03:05:16 dawes Exp $
find . -type l -print |
(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/config.h.in new/imake-1.0.4/config.h.in
--- old/imake-1.0.3/config.h.in 2010-04-16 04:58:31.000000000 +0200
+++ new/imake-1.0.4/config.h.in 2010-10-31 03:10:53.000000000 +0100
@@ -1,14 +1,14 @@
/* config.h.in. Generated from configure.ac by autoheader. */
-/* Define to 1 if you have the "mkstemp" function. */
-#undef HAS_MKSTEMP
-
/* Define to 1 if you have the header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if you have the `mkstemp' function. */
+#undef HAVE_MKSTEMP
+
/* Define to 1 if you have the header file. */
#undef HAVE_STDINT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/configure.ac new/imake-1.0.4/configure.ac
--- old/imake-1.0.3/configure.ac 2010-04-16 04:57:16.000000000 +0200
+++ new/imake-1.0.4/configure.ac 2010-10-31 03:10:23.000000000 +0100
@@ -21,30 +21,26 @@
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
-AC_INIT(imake, [1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([imake], [1.0.4],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [imake])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.4 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.4)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_PROG_CC
-AC_PROG_INSTALL
-
AC_PROG_CPP
-AC_PATH_PROG(SED, sed)
XORG_PROG_RAWCPP
CPP_PROGRAM=${RAWCPP}
AC_SUBST(CPP_PROGRAM)
-AC_CHECK_FUNC([mkstemp],
- AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the "mkstemp" function.]))
+AC_CHECK_FUNCS([mkstemp])
AC_CHECK_PROG(HAS_PERL, perl, yes)
AM_CONDITIONAL([HAS_PERL], [test "x$HAS_PERL" = xyes])
@@ -129,6 +125,5 @@
# Checks for pkg-config packages
PKG_CHECK_MODULES(XPROTO, xproto)
-AC_SUBST(XPROTO_CFLAGS)
AC_OUTPUT([Makefile])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/imake.c new/imake-1.0.4/imake.c
--- old/imake-1.0.3/imake.c 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/imake.c 2010-10-31 03:03:26.000000000 +0100
@@ -7,8 +7,6 @@
* be passed to the template file. *
* *
***************************************************************************/
-/* $XFree86: xc/config/imake/imake.c,v 3.63tsi Exp $ */
-
/*
*
Copyright (c) 1985, 1986, 1987, 1998 The Open Group
@@ -397,11 +395,11 @@
if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
LogFatal("Cannot create temporary file %s.", tmpMakefile);
} else {
-#ifdef HAS_MKSTEMP
+#ifdef HAVE_MKSTEMP
int fd;
#endif
tmpMakefile = Strdup(tmpMakefile);
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
if (mktemp(tmpMakefile) == NULL ||
(tmpfd = fopen(tmpMakefile, "w+")) == NULL) {
LogFatal("Cannot create temporary file %s.", tmpMakefile);
@@ -1771,11 +1769,11 @@
strcmp(ptoken, "pragma") &&
strcmp(ptoken, "undef")) {
if (outFile == NULL) {
-#ifdef HAS_MKSTEMP
+#ifdef HAVE_MKSTEMP
int fd;
#endif
tmpImakefile = Strdup(tmpImakefile);
-#ifndef HAS_MKSTEMP
+#ifndef HAVE_MKSTEMP
if (mktemp(tmpImakefile) == NULL ||
(outFile = fopen(tmpImakefile, "w+")) == NULL) {
LogFatal("Cannot open %s for write.",
@@ -1978,8 +1976,6 @@
#endif /* !SYSV */
initialized = TRUE;
fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
- fprintf (tmpfd, "# %s\n",
- "$Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $");
}
for (p1 = pline; p1 < end; p1++) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/imake.man new/imake-1.0.4/imake.man
--- old/imake-1.0.3/imake.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/imake.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: imake.man,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $
.\" Copyright (c) 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" other dealings in this Software without prior written authorization
.\" from The Open Group.
.\"
-.\" $XFree86: imake.man,v 1.8 2001/12/14 19:53:19 dawes Exp $
-.\"
.TH IMAKE 1 __xorgversion__
.SH NAME
imake \- C preprocessor interface to the make utility
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/imakemdep.h new/imake-1.0.4/imakemdep.h
--- old/imake-1.0.3/imakemdep.h 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/imakemdep.h 2010-05-15 05:23:23.000000000 +0200
@@ -1,5 +1,3 @@
-/* $Xorg: imakemdep.h,v 1.6 2001/02/09 02:03:16 xorgcvs Exp $ */
-/* $XdotOrg: xc/config/imake/imakemdep.h,v 1.9 2005/03/02 11:20:29 gisburn Exp $ */
/*
Copyright (c) 1993, 1994, 1998 The Open Group
@@ -25,7 +23,6 @@
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/config/imake/imakemdep.h,v 3.71 2003/06/12 14:12:26 eich Exp $ */
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/Makefile.am new/imake-1.0.4/Makefile.am
--- old/imake-1.0.3/Makefile.am 2010-04-16 04:57:16.000000000 +0200
+++ new/imake-1.0.4/Makefile.am 2010-10-31 02:56:32.000000000 +0100
@@ -125,30 +125,13 @@
mkhtmlindex.man
# Only need to install man pages for programs/scripts being installed
-appman_needed_for = $(bin_PROGRAMS) $(bin_SCRIPTS)
-appman_DATA = $(appman_needed_for:%=%.@APP_MAN_SUFFIX@)
+appman_DATA = $(bin_PROGRAMS:%$(EXEEXT)=%.@APP_MAN_SUFFIX@) $(bin_SCRIPTS:%=%.@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += \
-e 's|__cpp__|$(RAWCPP)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/makeg new/imake-1.0.4/makeg
--- old/imake-1.0.3/makeg 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/makeg 2010-05-15 05:23:23.000000000 +0200
@@ -1,6 +1,5 @@
#! /bin/sh
# makeg - run "make" with options necessary to make a debuggable executable
-# $Xorg: makeg.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $
# set GDB=1 in your environment if using gdb on Solaris 2.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/makeg.man new/imake-1.0.4/makeg.man
--- old/imake-1.0.3/makeg.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/makeg.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: makeg.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
.\" Copyright (c) 1996, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,8 +23,6 @@
.\" from The Open Group.
.\"
.\"
-.\" $XFree86: xc/config/util/makeg.man,v 1.2 2001/01/27 18:19:55 dawes Exp $
-.\"
.TH MAKEG 1 __xorgversion__
.SH NAME
makeg \- make a debuggable executable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/mdepend.cpp new/imake-1.0.4/mdepend.cpp
--- old/imake-1.0.3/mdepend.cpp 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mdepend.cpp 2010-05-15 05:23:23.000000000 +0200
@@ -1,8 +1,5 @@
XCOMM!/bin/sh
XCOMM
-XCOMM $Xorg: mdepend.cpp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $
-XCOMM $XdotOrg: $
-XCOMM
XCOMM Do the equivalent of the 'makedepend' program, but do it right.
XCOMM
XCOMM Usage:
@@ -23,8 +20,6 @@
XCOMM USG users will probably have to change "silent" to "-s" instead of
XCOMM "-" (at least, that is what the documentation implies).
XCOMM
-XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.9 2001/04/26 20:55:10 dawes Exp $
-XCOMM
CC=PREPROC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/mergelib.cpp new/imake-1.0.4/mergelib.cpp
--- old/imake-1.0.3/mergelib.cpp 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mergelib.cpp 2010-05-15 05:23:23.000000000 +0200
@@ -1,7 +1,5 @@
XCOMM!/bin/sh
XCOMM
-XCOMM $Xorg: mergelib.cpp,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
-XCOMM
XCOMM Copyright (c) 1989, 1998 The Open Group
XCOMM
XCOMM Permission to use, copy, modify, distribute, and sell this software and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/mergelib.man new/imake-1.0.4/mergelib.man
--- old/imake-1.0.3/mergelib.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mergelib.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH MERGELIB 1 __xorgversion__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/mkdirhier new/imake-1.0.4/mkdirhier
--- old/imake-1.0.3/mkdirhier 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mkdirhier 2010-05-15 05:23:23.000000000 +0200
@@ -1,5 +1,4 @@
#!/bin/sh
-# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $
# Courtesy of Paul Eggert
newline='
@@ -23,45 +22,12 @@
echo >&2 "mkdirhier: directory name contains a newline: \`\`$directory''"
status=1
continue;;
- ///*) prefix=/;; # See Posix 2.3 "path".
- //*) prefix=//;;
- /*) prefix=/;;
-*) prefix=./;;
*) prefix=
esac
- IFS=/
- set x $directory
- case $2 in
- */*) # IFS parsing is broken
- IFS=' '
- set x `echo $directory | tr / ' '`
- ;;
- esac
- IFS=$newline
- shift
+ mkdir -p $prefix$directory || status=$?
- for filename
- do
- path=$prefix$filename
- prefix=$path/
- shift
-
- test -d "$path" || {
- paths=$path
- for filename
- do
- if [ -n "$filename" -a "$filename" != "." ]; then
- path=$path/$filename
- paths=$paths$newline$path
- fi
- done
-
- mkdir $paths || status=$?
-
- break
- }
- done
done
exit $status
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/mkdirhier.man new/imake-1.0.4/mkdirhier.man
--- old/imake-1.0.3/mkdirhier.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mkdirhier.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: mkdirhier.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
.\" Copyright (c) 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" dealing in this Software without prior written authorization from The
.\" Open Group.
.\"
-.\" $XFree86: xc/config/util/mkdirhier.man,v 1.2 2001/01/27 18:19:55 dawes Exp $
-.\"
.TH MKDIRHIER 1 __xorgversion__
.SH NAME
mkdirhier \- makes a directory hierarchy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/mkhtmlindex.pl new/imake-1.0.4/mkhtmlindex.pl
--- old/imake-1.0.3/mkhtmlindex.pl 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mkhtmlindex.pl 2010-05-15 05:23:23.000000000 +0200
@@ -1,7 +1,5 @@
#!/usr/bin/perl
#
-# $XFree86: xc/config/util/mkhtmlindex.pl,v 1.2 2001/03/15 19:02:31 dawes Exp $
-#
# Copyright © 2000,2001 by VA Linux Systems, Inc.
#
# Generate index files for HTML man pages.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/mkhtmlindex.sh new/imake-1.0.4/mkhtmlindex.sh
--- old/imake-1.0.3/mkhtmlindex.sh 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/mkhtmlindex.sh 2010-05-15 05:23:23.000000000 +0200
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $XFree86: xc/config/util/mkhtmlindex.sh,v 1.3 2000/08/26 04:30:49 dawes Exp $
-#
# Copyright © 2000 by Precision Insight, Inc.
#
# Generate index files for the HTML man pages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/revpath.c new/imake-1.0.4/revpath.c
--- old/imake-1.0.3/revpath.c 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/revpath.c 2010-05-15 05:23:23.000000000 +0200
@@ -1,7 +1,6 @@
/*
* Copyright 1999 by The XFree86 Project, Inc.
*/
-/* $XFree86: xc/config/util/revpath.c,v 1.2 1999/02/01 11:55:49 dawes Exp $ */
/*
* Reverse a pathname. It returns a relative path that can be used to undo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/revpath.man new/imake-1.0.4/revpath.man
--- old/imake-1.0.3/revpath.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/revpath.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/config/util/revpath.man,v 1.1 1999/01/03 03:58:14 dawes Exp $
.TH REVPATH 1 __vendorversion__
.SH NAME
revpath \- generate a relative path that can be used to undo a change-directory
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/xmkmf.cpp new/imake-1.0.4/xmkmf.cpp
--- old/imake-1.0.3/xmkmf.cpp 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/xmkmf.cpp 2010-05-15 05:23:23.000000000 +0200
@@ -1,10 +1,6 @@
XCOMM!/bin/sh
-XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.3 2000/11/06 21:57:10 dawes Exp $
-XCOMM
XCOMM make a Makefile from an Imakefile from inside or outside the sources
-XCOMM
-XCOMM $Xorg: xmkmf.cpp,v 1.3 2000/08/17 19:41:53 cpqbld Exp $
usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/imake-1.0.3/xmkmf.man new/imake-1.0.4/xmkmf.man
--- old/imake-1.0.3/xmkmf.man 2009-10-16 23:45:43.000000000 +0200
+++ new/imake-1.0.4/xmkmf.man 2010-05-15 05:23:23.000000000 +0200
@@ -1,4 +1,3 @@
-.\" $Xorg: xmkmf.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
.\" Copyright (c) 1993, 1994, 1998 The Open Group
.\"
.\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -23,8 +22,6 @@
.\" dealing in this Software without prior written authorization from The
.\" Open Group.
.\"
-.\" $XFree86: xc/config/util/xmkmf.man,v 1.2 2001/01/27 18:19:55 dawes Exp $
-.\"
.TH XMKMF 1 __xorgversion__
.SH NAME
xmkmf \- create a Makefile from an Imakefile
++++++ makedepend-1.0.2.tar.bz2 -> makedepend-1.0.3.tar.bz2 ++++++
++++ 8725 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/makedepend-1.0.2/ChangeLog new/makedepend-1.0.3/ChangeLog
--- old/makedepend-1.0.2/ChangeLog 2009-10-11 07:09:15.000000000 +0200
+++ new/makedepend-1.0.3/ChangeLog 2010-10-30 07:45:59.000000000 +0200
@@ -1,3 +1,57 @@
+commit e67389ecc0c425bcfec0a3184ee48919e0e2c61a
+Author: Alan Coopersmith
+Date: Fri Oct 29 22:45:35 2010 -0700
+
+ makedepend 1.0.3
+
+ Signed-off-by: Alan Coopersmith
+
+commit bf25a6cb4888e5cf6827cd51cb7ee282cfb6cf47
+Author: Alan Coopersmith
+Date: Fri Oct 29 22:39:51 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ Enables use of platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith
+
+commit 7963cc382a3a351410b1342a9783df3af8516944
+Author: Gaetan Nadon
+Date: Tue Jul 20 18:45:18 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon
+
+commit 58bd34e6c3662ef06e9ef0dd78d69f003df42bdc
+Author: Alan Coopersmith
+Date: Fri May 14 21:14:44 2010 -0700
+
+ Convert testcase from bug 28045 into automake "make check" test
+
+ Signed-off-by: Alan Coopersmith
+
+commit 8522c314da7537169996476fe5ba411f720a09fe
+Author: Martin Pärtel
+Date: Fri May 14 21:00:15 2010 -0700
+
+ Bug 28045 - makedepend fails on directory named like an include file
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=28045
+
+ Signed-off-by: Alan Coopersmith
+
commit c976a7fc7c21772c00de9e61178cf467c6a10b57
Author: Alan Coopersmith
Date: Sat Oct 10 22:08:09 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/makedepend-1.0.2/configure.ac new/makedepend-1.0.3/configure.ac
--- old/makedepend-1.0.2/configure.ac 2009-10-11 07:07:56.000000000 +0200
+++ new/makedepend-1.0.3/configure.ac 2010-10-30 07:45:03.000000000 +0200
@@ -1,12 +1,13 @@
-AC_PREREQ([2.57])
-AC_INIT([makedepend], [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_PREREQ([2.60])
+AC_INIT([makedepend], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_CONFIG_HEADER([makedepend-config.h])
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS, XORG_WITH_LINT
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
dnl Checks for programs.
AC_PROG_CC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/makedepend-1.0.2/include.c new/makedepend-1.0.3/include.c
--- old/makedepend-1.0.2/include.c 2009-10-11 06:02:44.000000000 +0200
+++ new/makedepend-1.0.3/include.c 2010-05-15 05:50:46.000000000 +0200
@@ -264,7 +264,7 @@
if ((type == INCLUDEDOT) ||
(type == INCLUDENEXTDOT) ||
(*include == '/')) {
- if (stat(include, &st) == 0)
+ if (stat(include, &st) == 0 && !S_ISDIR(st.st_mode))
return newinclude(include, include);
if (show_where_not)
warning1("\tnot in %s\n", include);
@@ -286,7 +286,7 @@
strcpy(path + (p-file) + 1, include);
}
remove_dotdot(path);
- if (stat(path, &st) == 0)
+ if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode))
return newinclude(path, include);
if (show_where_not)
warning1("\tnot in %s\n", path);
@@ -304,7 +304,7 @@
for (; *pp; pp++) {
sprintf(path, "%s/%s", *pp, include);
remove_dotdot(path);
- if (stat(path, &st) == 0) {
+ if (stat(path, &st) == 0 && !S_ISDIR(st.st_mode)) {
includedirsnext = pp + 1;
return newinclude(path, include);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/makedepend-1.0.2/makedepend-config.h.in new/makedepend-1.0.3/makedepend-config.h.in
--- old/makedepend-1.0.2/makedepend-config.h.in 2009-10-11 07:08:40.000000000 +0200
+++ new/makedepend-1.0.3/makedepend-config.h.in 2010-10-30 07:45:59.000000000 +0200
@@ -48,6 +48,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/makedepend-1.0.2/Makefile.am new/makedepend-1.0.3/Makefile.am
--- old/makedepend-1.0.2/Makefile.am 2009-10-11 07:04:49.000000000 +0200
+++ new/makedepend-1.0.3/Makefile.am 2010-10-30 07:38:06.000000000 +0200
@@ -26,24 +26,8 @@
CLEANFILES = $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += \
-e 's|__cpp__|$(RAWCPP)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
@@ -68,3 +52,23 @@
lint:
$(LINT) $(ALL_LINT_FLAGS) $(makedepend_SOURCES)
endif LINT
+
+### Test cases - mostly for bug fixes submitted with a test case so far
+TESTS =
+
+# Absolute path to srcdir & builddir top that test scripts can reference
+TEST_BUILDDIR_PATH = `cd $(top_builddir) && pwd`
+TEST_SRCDIR_PATH = `cd $(top_srcdir) && pwd`
+
+# Path to makedepend command being tested that can be found from test subdirs
+TESTS_ENVIRONMENT = MAKEDEPEND="$(TEST_BUILDDIR_PATH)/makedepend"
+
+# Path to writable testdirectory in build directory
+TESTS_ENVIRONMENT += test_builddir="$(TEST_BUILDDIR_PATH)/tests"
+
+# Path to testcase files in source directory
+TESTS_ENVIRONMENT += test_srcdir="$(TEST_SRCDIR_PATH)/tests"
+
+# Test for https://bugs.freedesktop.org/show_bug.cgi?id=28045
+TESTS += tests/28045/makedep.sh
+EXTRA_DIST += tests/28045/makedep.sh tests/28045/foo.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/makedepend-1.0.2/tests/28045/foo.cpp new/makedepend-1.0.3/tests/28045/foo.cpp
--- old/makedepend-1.0.2/tests/28045/foo.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/makedepend-1.0.3/tests/28045/foo.cpp 2010-05-09 23:59:22.000000000 +0200
@@ -0,0 +1,2 @@
+
+#include <one>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/makedepend-1.0.2/tests/28045/makedep.sh new/makedepend-1.0.3/tests/28045/makedep.sh
--- old/makedepend-1.0.2/tests/28045/makedep.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/makedepend-1.0.3/tests/28045/makedep.sh 2010-05-15 06:12:22.000000000 +0200
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Test case from https://bugs.freedesktop.org/show_bug.cgi?id=28045
+# modified to work with automake test framework
+
+set -e
+
+if [ "x$MAKEDEPEND" == "x" ]; then
+ MAKEDEPEND=makedepend
+fi
+
+mkdir -p ${test_builddir}/28045
+cd ${test_builddir}/28045
+
+# Create test conditions:
+# - directory named "one"
+# - directory named "two" containing empty file named "one"
+mkdir one two
+touch two/one
+
+# Happens to work before fix for 28045
+$MAKEDEPEND -f- -- -Itwo -Ione -I. -- ${test_srcdir}/28045/foo.cpp > /dev/null
+
+# Happens to fail before fix for 28045
+$MAKEDEPEND -f- -- -I. -Ione -Itwo -- ${test_srcdir}/28045/foo.cpp > /dev/null
+
+# Clean up
+rm -rf one two
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org