From dec06979b911ca410cc289f12e053a2d49c49abb Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 23 Oct 2009 13:38:28 +0100
Subject: [PATCH] Release 1.1.2 developers snapshot

---
 .gitignore   |  2 +-
 NEWS         | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README       |  8 +++++
 configure.ac |  2 +-
 4 files changed, 105 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 71c4023..809de36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ clutter/stamp-*
 /clutter/cogl/cogl/cogl.h
 /clutter/cogl/cogl/*.pc
 /clutter/cogl/cogl/cogl-enum-types.[ch]
-/clutter/cogl/cogl/stamp-cogl-enum-types.h
+/clutter/cogl/cogl/stamp-enum-types
 /clutter/cogl/gles/cogl-fixed-vertex-shader.[ch]
 /clutter/cogl/gles/cogl-fixed-fragment-shader.[ch]
 *.gir
diff --git a/NEWS b/NEWS
index ace98be..d3bba10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,98 @@
+Clutter 1.1.2 (23/10/2009)
+===============================================================================
+
+  * List of changes since Clutter 1.0
+
+    o Add ClutterLayoutManager, an abstract proxy class for easily
+      writing layout management policies; also add ClutterLayoutMeta,
+      a class for storing layout properties.
+
+    o Add ClutterBox, a generic container actor that relies on a
+      ClutterLayoutManager instance to manage the layout of its
+      children.
+
+    o Add the following layout managers:
+
+      - ClutterFixedLayout - a layout manager implementing the
+        policy used by ClutterGroup
+
+      - ClutterBinLayout - a layout manager for packing actors
+        as layers inside the same area, with per-actor alignment
+
+      - ClutterFlowLayout - a layout manager arranging actors as
+        a reflowing grid
+
+      - ClutterBoxLayout - a layout manager arranging actors as
+        a single line
+
+    o Remove the requirement for the backend-specific implementation
+      of ClutterStage to be a ClutterActor: a Stage implementation must
+      only implement the ClutterStageWindow interface. This cleans up
+      the backend code.
+
+    o COGL source tree clean up and rationalization; COGL now
+      knows the platform, and not only the driver (GL or GLES) so
+      we can migrate part of the low-level backend code from Clutter
+      to COGL where it makes sense.
+
+    o Remove code duplication across whole COGL.
+
+    o The GLES 2.0 driver for COGL, and the EGLX backend for Clutter
+      have been fixed and confirmed working.
+
+    o Add "dump-pick-buffer" to CLUTTER_DEBUG: this debug options
+      dumps the contents of each pick() buffer into a PNG file, for
+      debugging purposes.
+
+    o Allow interpolating intervals of ClutterUnits for animating
+      unit-based properties.
+
+    o Increase strictness and correctness of the ClutterUnits
+      grammar parser.
+
+    o Add GValue transformation functions for ClutterPath to and
+      from a string.
+
+    o Fix word movement in ClutterText; implement GObject getter for
+      :use-markup; emit notification for :position; decouple the
+      :text property from the :use-markup property.
+
+    o Do not queue redraws or relayouts on actors currently being
+      destroyed. 
+
+    o Support #rrggbb and #rgb notations for ClutterColor.
+
+    o Multiple bug fixes.
+
+    o Provide _NET_WM_PID on the X11 stage implementation.
+
+    o Documentation and Introspection annotation fixes.
+
+    o Add test units for the ClutterActor size requesition.
+
+    o Build fixes.
+
+    o Use AM_SILENT_RULES if Automake 1.11 is detected, and fall
+      back to Shave on older Automake versions.
+
+Many thanks to:
+
+  Robert Bragg
+  Damien Lespiau
+  Neil Roberts
+  Thomas Wood
+  Owen W. Taylor
+  Øyvind Kolås
+  Götz Waschk
+  Zhou Jiangwei
+  Colin Walters
+  Jonas Bonn
+  Joshua Lock
+  Jussi Kukkonen
+  Samuel Degrande
+  Vladimir Nadvornik
+  Xu Li
+
 Clutter 1.0.0 (28/07/2009)
 ===============================================================================
 
diff --git a/README b/README
index fb600e0..6682960 100644
--- a/README
+++ b/README
@@ -204,6 +204,14 @@ RELEASE NOTES
 Relevant information for developers with existing Clutter applications
 wanting to port to newer releases (See NEWS for general new feature info).
 
+Release Notes for Clutter 1.2
+-------------------------------
+
+* ClutterStageManager is now publicly available and documented API.
+
+* Clutter now depends on the system copy of JSON-GLib, and will fall
+  back to the internal copy only if JSON-GLib is not installed.
+
 Release Notes for Clutter 1.0
 -------------------------------
 
diff --git a/configure.ac b/configure.ac
index f9b06fd..7518c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 # - increase clutter_interface_version to the next odd number
 m4_define([clutter_major_version], [1])
 m4_define([clutter_minor_version], [1])
-m4_define([clutter_micro_version], [1])
+m4_define([clutter_micro_version], [2])
 
 m4_define([clutter_version], [clutter_major_version.clutter_minor_version.clutter_micro_version])
 
-- 
2.7.4