diff --git a/util/macros/ChangeLog b/util/macros/ChangeLog index 9308bbc23..7f9589be7 100644 --- a/util/macros/ChangeLog +++ b/util/macros/ChangeLog @@ -1,3 +1,18 @@ +commit f2ddb356d86225a8ff6d1d1397fb2156cebd360f +Author: Daniel Stone +Date: Sun Dec 24 06:17:44 2006 +0200 + + bump to 1.1.5 + +commit e8b485d9252ffbb357a0b987ab1488d4033b555c +Author: Matthieu Herrb +Date: Mon Dec 18 18:25:25 2006 -0800 + + Bug 9368: non portable sed usage in xorgversion.m4 + + Bugzilla #9368 + Patch #8140 + commit 0a4aadbda211a5128bae1c2e860b781c95c4bbf5 Author: Daniel Stone Date: Sat Dec 16 01:14:27 2006 +0200 diff --git a/util/macros/configure.ac b/util/macros/configure.ac index 1ea77c5db..ad8b250ed 100644 --- a/util/macros/configure.ac +++ b/util/macros/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) AC_INIT([util-macros], - [1.1.4], + [1.1.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/util/macros/xorg-macros.m4 b/util/macros/xorg-macros.m4 index a6c58c901..6b707eb9a 100644 --- a/util/macros/xorg-macros.m4 +++ b/util/macros/xorg-macros.m4 @@ -45,7 +45,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.4 + [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