r35396 - in /desktop/experimental/cogl: ./ debian/changelog debian/patches/04_fix_crash_on_free.patch debian/patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Thu Jun 21 07:34:47 2012
New Revision: 35396

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35396
Log:
Merge cogl 1.10.2-6

Added:
    desktop/experimental/cogl/debian/patches/04_fix_crash_on_free.patch
      - copied unchanged from r35395, desktop/unstable/cogl/debian/patches/04_fix_crash_on_free.patch
Modified:
    desktop/experimental/cogl/   (props changed)
    desktop/experimental/cogl/debian/changelog
    desktop/experimental/cogl/debian/patches/series

Propchange: desktop/experimental/cogl/
------------------------------------------------------------------------------
    svn:mergeinfo = /desktop/unstable/cogl:35391-35395

Modified: desktop/experimental/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cogl/debian/changelog?rev=35396&op=diff
==============================================================================
--- desktop/experimental/cogl/debian/changelog [utf-8] (original)
+++ desktop/experimental/cogl/debian/changelog [utf-8] Thu Jun 21 07:34:47 2012
@@ -1,4 +1,4 @@
-cogl (1.10.2-5exp1) UNRELEASED; urgency=low
+cogl (1.10.2-6exp1) UNRELEASED; urgency=low
 
   * Bring back multiple backend support from 1.10.2-4 packaging
   * debian/rules: Only build gles2 support on non-hurd (kfreebsd & linux)
@@ -6,6 +6,16 @@
     apart from on hurd
 
  -- Sjoerd Simons <sjoerd at debian.org>  Thu, 21 Jun 2012 08:48:37 +0200
+
+cogl (1.10.2-6) unstable; urgency=low
+
+  * debian/rules: Set the gles2-libname to libGLESv2.so.2 as shipped by Mesa
+    (Closes: #678018)
+  * debian/patches/04_fix_crash_on_free.patch:
+    + Added. Fix crash when freeing an unconnected renderer.
+      (Closes: #673433 #676282)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu, 21 Jun 2012 09:29:45 +0200
 
 cogl (1.10.2-5) unstable; urgency=low
 

Modified: desktop/experimental/cogl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/cogl/debian/patches/series?rev=35396&op=diff
==============================================================================
--- desktop/experimental/cogl/debian/patches/series [utf-8] (original)
+++ desktop/experimental/cogl/debian/patches/series [utf-8] Thu Jun 21 07:34:47 2012
@@ -1,2 +1,3 @@
 #02_disable_armv5t_specific_optimization.patch
 03_select_default_renderer_driver.patch
+04_fix_crash_on_free.patch