pixman: Changes to 'debian-experimental'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/changelog      |    2 +-
 debian/control        |    4 ++--
 pixman/pixman-image.c |    4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 83ab14d80d910afdebc54b831a97d86a3d4b9bbc
Author: Julien Cristau <jcristau@debian.org>
Date:   Wed Jun 6 00:49:55 2007 +0200

    Update version and minor description changes.

diff --git a/debian/changelog b/debian/changelog
index 79e8e31..921edff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pixman (0.9.0~git20070524-1) UNRELEASED; urgency=low
+pixman (0.9.0~git20070605-1) UNRELEASED; urgency=low
 
   * First upload.
 
diff --git a/debian/control b/debian/control
index 3fecae5..b44a603 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Priority: extra
 Architecture: any
 Depends: libpixman0 (= ${binary:Version})
 Description: pixel-manipulation library for X and cairo (debugging symbols)
- Debugging symbols for the Cairo pixel manipulation library.  This is
+ Debugging symbols for the Cairo/X pixel manipulation library.  This is
  needed to debug programs linked against libpixman0.
 
 Package: libpixman-dev
@@ -32,4 +32,4 @@ Depends: libpixman0 (= ${binary:Version})
 Conflicts: libpixman1-dev
 Description: pixel-manipulation library for X and cairo (development files)
  Development libraries, header files and documentation needed by
- programs that want to compile with the Cairo pixman library.
+ programs that want to compile with the Cairo/X pixman library.

commit 5ca61dc99b198243f08e6f1f3f96e3c87ff818b9
Author: Søren Sandmann Pedersen <sandmann@redhat.com>
Date:   Tue Jun 5 11:33:17 2007 -0400

    Fix bug in pixman_image_set_filter() where only the parameters were
    updated, not the filter type. Reported by Michel Dänzer.

diff --git a/pixman/pixman-image.c b/pixman/pixman-image.c
index 0802b86..e7e5d24 100644
--- a/pixman/pixman-image.c
+++ b/pixman/pixman-image.c
@@ -351,8 +351,10 @@ pixman_image_set_filter (pixman_image_t       *image,
 {
     image_common_t *common = (image_common_t *)image;
     
-    if (params != common->filter_params)
+    if (params != common->filter_params || filter != common->filter)
     {
+	common->filter = filter;
+	
 	if (common->filter_params)
 	    free (common->filter_params);