pixman: Branch 'master'

Sun Jun 8 22:47:15 PDT 2008

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

New commits:
commit e84db894933b25ef9ab83a6c15a0521e15d61bae
Author: SÃ¸ren Sandmann <sandmann at redhat.com>
Date:   Mon Jun 9 01:29:14 2008 -0400

    Bump version number and make it distcheck

diff --git a/configure.ac b/configure.ac
index 6365c4c..b4c603f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AC_PREREQ([2.57])
 
 m4_define([pixman_major], 0)
 m4_define([pixman_minor], 11)
-m4_define([pixman_micro], 1)
+m4_define([pixman_micro], 2)
 
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
diff --git a/pixman/Makefile.am b/pixman/Makefile.am
index 377f958..cb5014e 100644
--- a/pixman/Makefile.am
+++ b/pixman/Makefile.am
@@ -38,7 +38,7 @@ pixman-combine64.c : combine.inc pixman-combine64.h combine.pl
 pixman-combine64.h : combine.h.inc combine.pl
 	$(PERL) $(srcdir)/combine.pl 16 < $(srcdir)/combine.h.inc > $@ || ($(RM) $@; exit 1)
 
-EXTRA_DIST = Makefile.win32 combine.inc combine.pl
+EXTRA_DIST = Makefile.win32 combine.inc combine.pl pixman-region.c combine.h.inc
 CLEANFILES = pixman-combine32.c pixman-combine64.c pixman-combine32.h pixman-combine64.h
 
 # mmx code
