pixman: Branch 'master' - 3 commits
Søren Sandmann Pedersen
sandmann at kemper.freedesktop.org
Fri May 15 04:48:14 PDT 2009
Makefile.am | 6 +++---
configure.ac | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 58e08374e1cd01371786469787b3709eca27f463
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date: Fri May 15 07:47:59 2009 -0400
Don't call hyphenated git commands as they don't exist anymore
diff --git a/Makefile.am b/Makefile.am
index 3fbff14..63b08c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ $(pkgconfig_DATA): pixman-1.pc.in
snapshot:
distdir="$(distdir)-`date '+%Y%m%d'`"; \
- test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git-rev-parse HEAD | cut -c 1-6`; \
+ test -d "$(srcdir)/.git" && distdir=$$distdir-`cd "$(srcdir)" && git rev-parse HEAD | cut -c 1-6`; \
$(MAKE) $(AM_MAKEFLAGS) distdir="$$distdir" dist
GPGKEY=6FF7C1A8
@@ -80,7 +80,7 @@ ensure-prev:
release-check: ensure-prev release-verify-newer release-remove-old distcheck
release-tag:
- git-tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
+ git tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(sha1_tbz2) $(md5_tgz) $(gpg_file)
mkdir -p releases
@@ -123,7 +123,7 @@ release-publish-message: $(HASHFILES) ensure-prev
@echo " tag: $(PACKAGE)-$(VERSION)"
@echo ""
@echo "Log:"
- @git-log --no-merges "$(PACKAGE)-$(PREV)".."$(PACKAGE)-$(VERSION)" | git shortlog | awk '{ printf "\t"; print ; }' | cut -b1-80
+ @git log --no-merges "$(PACKAGE)-$(PREV)".."$(PACKAGE)-$(VERSION)" | git shortlog | awk '{ printf "\t"; print ; }' | cut -b1-80
@echo "============================== CUT HERE =============================="
@echo ""
commit b365547e7dd9cb02fb43d85ae4104903083c4ebf
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date: Fri May 15 07:47:22 2009 -0400
Post-release version bump
diff --git a/configure.ac b/configure.ac
index 05efce2..c555f25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 15)
-m4_define([pixman_micro], 4)
+m4_define([pixman_micro], 5)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
commit 564ecfe8e9a1aba41f5a798de461294ae2fe1c6d
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date: Fri May 15 06:57:59 2009 -0400
Pre-release version bump
diff --git a/configure.ac b/configure.ac
index f1998c3..05efce2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
m4_define([pixman_major], 0)
m4_define([pixman_minor], 15)
-m4_define([pixman_micro], 3)
+m4_define([pixman_micro], 4)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
More information about the xorg-commit
mailing list