mesa: Changes to 'ubuntu'

[Christopher Halse Rogers <raof-guest@alioth.debian.org>]

 debian/changelog                      |    6 ++++++
 debian/patches/egl-platform-mir.patch |    5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 45410c20fc299de688b7fe3102b93a3a064b2ce6
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date:   Tue Sep 17 12:05:53 2013 -0400

    Fix double-free in Mir EGL platform

diff --git a/debian/changelog b/debian/changelog
index a8170cd..47a76eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (9.2-1ubuntu2) saucy; urgency=low
+
+  * Fix double-free in Mir EGL platform (LP: #1221974) 
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com>  Tue, 17 Sep 2013 12:05:36 -0400
+
 mesa (9.2-1ubuntu1) saucy; urgency=low
 
   * Merge from debian-experimental, remaining changes:
diff --git a/debian/patches/egl-platform-mir.patch b/debian/patches/egl-platform-mir.patch
index 5734806..5187652 100644
--- a/debian/patches/egl-platform-mir.patch
+++ b/debian/patches/egl-platform-mir.patch
@@ -149,10 +149,10 @@ index 6dfdf94..668480c 100644
  char *
 diff --git a/src/egl/drivers/dri2/platform_mir.c b/src/egl/drivers/dri2/platform_mir.c
 new file mode 100644
-index 0000000..55bfa40
+index 0000000..3c0d6fb
 --- /dev/null
 +++ b/src/egl/drivers/dri2/platform_mir.c
-@@ -0,0 +1,350 @@
+@@ -0,0 +1,349 @@
 +/*
 + * Copyright © 2012 Canonical, Inc
 + *
@@ -387,7 +387,6 @@ index 0000000..55bfa40
 +      }
 +   }
 +
-+   free(dri2_surf);
 +   free(surf);
 +
 +   return EGL_TRUE;