pixman: Branch 'master' - 4 commits

[Søren Sandmann Pedersen]

 RELEASING          |    4 ++--
 configure.ac       |    2 +-
 pixman/Makefile.am |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 48e951000c7ff14f40c671f3efb6abb18162c840
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Feb 22 16:13:32 2011 -0500

    Post-release version bump to 0.21.7

diff --git a/configure.ac b/configure.ac
index 36b9d3a..db9a883 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 21)
-m4_define([pixman_micro], 6)
+m4_define([pixman_micro], 7)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit 8b3332166094db657e96c365a524b2cd7513359b
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Feb 22 15:43:41 2011 -0500

    Pre-release version bump to 0.21.6

diff --git a/configure.ac b/configure.ac
index 8d96647..36b9d3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 21)
-m4_define([pixman_micro], 5)
+m4_define([pixman_micro], 6)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
commit 2cb67d2a0b6bed4490a41c34a185cc54a445559a
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Feb 22 15:40:34 2011 -0500

    Minor fix to the RELEASING file

diff --git a/RELEASING b/RELEASING
index 7ddcef4..fbe1581 100644
--- a/RELEASING
+++ b/RELEASING
@@ -11,7 +11,7 @@ Here are the steps to follow to create a new pixman release:
 	git log master...origin		(no output; note: *3* dots)
 
 2) Increment pixman_(major|minor|micro) in configure.ac according to
-   the directions in that file. Use git commit to record this.
+   the directions in that file.
 
 3) Make sure that new version works, including
 
@@ -23,7 +23,7 @@ Here are the steps to follow to create a new pixman release:
 	- the cairo test suite hasn't gained any new failures compared
 	  to last pixman version.
 
-4) Use "git commit" to record any changes made in step 3.
+4) Use "git commit" to record the changes made in step 2 and 3.
 
 5) Generate and publish the tar files by running 
 
commit 3cdf74257bdb9d054637252f4fa7503abf580db9
Author: Søren Sandmann Pedersen <ssp at redhat.com>
Date:   Tue Feb 22 15:28:17 2011 -0500

    Delete pixman-x64-mmx-emulation.h from pixman/Makefile.am

diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index ca31301..d016e9f 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -52,7 +52,7 @@ pixman-combine64.h : pixman-combine.h.template make-combine.pl
 	$(PERL) $(srcdir)/make-combine.pl 16 < $(srcdir)/pixman-combine.h.template > $@ || ($(RM) $@; exit 1)
 
 EXTRA_DIST = Makefile.win32 pixman-combine.c.template make-combine.pl pixman-region.c \
-	pixman-combine.h.template solaris-hwcap.mapfile pixman-x64-mmx-emulation.h
+	pixman-combine.h.template solaris-hwcap.mapfile
 CLEANFILES = pixman-combine32.c pixman-combine64.c pixman-combine32.h pixman-combine64.h
 
 # mmx code