xorg-server: Changes to 'debian-unstable'
debian/changelog | 6 ++++--
exa/exa.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 21c05c4c6cea122a51767ef57fea8baa9a272bfc
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 26 19:27:45 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 8375ebd..ac9b26b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.4.2-5) UNRELEASED; urgency=low
+xorg-server (2:1.4.2-5) unstable; urgency=low
* Don't pretend we support randr 1.2 when queried by swapped clients. The
dispatch code for RandR 1.2 requests would return BadImplementation anyway
@@ -6,7 +6,7 @@ xorg-server (2:1.4.2-5) UNRELEASED; urgency=low
* Cherry-picked from upstream:
+ exa: fix assert logic thinko.
- -- Julien Cristau <jcristau@debian.org> Sat, 23 Aug 2008 14:58:14 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 26 Aug 2008 19:27:34 +0200
xorg-server (2:1.4.2-4) unstable; urgency=low
commit 965835ca7f353dbef49d613f431e4f61b7f9202f
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 26 19:25:05 2008 +0200
Update changelog
diff --git a/debian/changelog b/debian/changelog
index 54b1a7b..8375ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xorg-server (2:1.4.2-5) UNRELEASED; urgency=low
* Don't pretend we support randr 1.2 when queried by swapped clients. The
dispatch code for RandR 1.2 requests would return BadImplementation anyway
(closes: #495833).
+ * Cherry-picked from upstream:
+ + exa: fix assert logic thinko.
-- Julien Cristau <jcristau@debian.org> Sat, 23 Aug 2008 14:58:14 +0200
commit 8153528ca1862136219a8aba158c6c73bfe6bff2
Author: Maarten Maathuis <madman2003@gmail.com>
Date: Sun Aug 17 19:57:02 2008 +0200
exa: fix assert logic thinko from 361a9eb953aaa38f8ebc057185de29e50f9eef26
- I guess failing PrepareAccess is rare, since this a 3 year old bug.
(cherry picked from commit c662381a14d2c69cc8b4aa1c66763cbaf6addc5d)
diff --git a/exa/exa.c b/exa/exa.c
index b2faf2f..34eccc9 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -365,7 +365,7 @@ exaPrepareAccess(DrawablePtr pDrawable, int index)
if (!(*pExaScr->info->PrepareAccess) (pPixmap, index)) {
ExaPixmapPriv (pPixmap);
- if (pExaPixmap->score != EXA_PIXMAP_SCORE_PINNED)
+ if (pExaPixmap->score == EXA_PIXMAP_SCORE_PINNED)
FatalError("Driver failed PrepareAccess on a pinned pixmap\n");
exaMoveOutPixmap (pPixmap);
}
Reply to: