util-macros 1.1.4

This commit is contained in:
matthieu 2006-12-17 10:57:41 +00:00
parent e18e77bc10
commit be38f2a46a
4 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,16 @@
commit 0a4aadbda211a5128bae1c2e860b781c95c4bbf5
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Dec 16 01:14:27 2006 +0200
bump to 1.1.4
commit eb371188086824c4655840dd72831d16fbfb17ce
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 19:02:46 2006 +0200
Makefile.am: make ChangeLog hook safer
Make ChangeLog hook as safe as possible.
commit e091014e3c7573a49ce51d67f359bd0f3d3e1893
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Nov 30 22:05:27 2006 +0200

View File

@ -27,7 +27,7 @@ EXTRA_DIST = $(aclocal_DATA) ChangeLog
.PHONY: ChangeLog
ChangeLog:
(cd $(srcdir) && git-log) > ChangeLog
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog

View File

@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
AC_INIT([util-macros],
[1.1.3],
[1.1.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])

View File

@ -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.3
[XORG_MACROS_version=1.1.4
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