2008-07-15 Emmanuele Bassi <ebassi@openedhand.com>

	* configure.ac: Post-release bump to 0.8.1.

diff --git a/AUTHORS b/AUTHORS
index c579817..251901f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,3 @@
 Iain Holmes <iain@openedhand.com>
+Emmanuele Bassi <ebassi@openedhand.com>
+Neil Roberts <neil@openedhand.com>

diff --git a/ChangeLog b/ChangeLog
index 263f986..4b4f6e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-07-15  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       * configure.ac: Post-release bump to 0.8.1.
+
+======== Clutter-GTK 0.8.0 ====================================================
+
+2008-07-15  Emmanuele Bassi  <ebassi@openedhand.com>
+
+       * configure.ac:
+       * README:
+       * NEWS: Release 0.8.0
+
 2008-07-04  Emmanuele Bassi  <ebassi@openedhand.com>
 
        * clutter-gtk.pc.in: Fix the inclusion directory

diff --git a/Makefile.am b/Makefile.am
index cb7efb9..3fc5e32 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 SUBDIRS = clutter-gtk doc examples
 
-clutter-gtk-0.7.pc: clutter-gtk.pc
-       @cp -f clutter-gtk.pc clutter-gtk-0.7.pc
+clutter-gtk-0.8.pc: clutter-gtk.pc
+       @cp -f clutter-gtk.pc clutter-gtk-0.8.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = clutter-gtk-0.7.pc
+pkgconfig_DATA = clutter-gtk-0.8.pc
 
-CLEANFILES = clutter-gtk-0.7.pc
+CLEANFILES = clutter-gtk-0.8.pc
 
 DISTCLEANFILES = clutter-gtk.pc
 

diff --git a/NEWS b/NEWS
index b9f9c19..61e5a5c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Clutter-GTK 0.8.0 15/07/2008
+============================
+
+ - Require clutter-x11 0.8.0 or clutter-win32 0.8.0
+ - Support the Clutter win32 backend
+ - Support multiple GtkClutterEmbed widgets
+ - Add utility functions for integrating with GTK+ themes, GTK+ stock icons,
+   icon themes and GdkPixbuf
+ - Do not open a second Display connection on X11
+
 Clutter-GTK 0.6.0 18/02/2008
 ============================
 

diff --git a/README b/README
index 6dbc6a3..b7d7afa 100644 (file)
--- a/README
+++ b/README
@@ -4,9 +4,6 @@ Clutter-GTK is a library providing facilities to integrate Clutter into GTK+
 applications. It provides a GTK+ widget, GtkClutterEmbed, for embedding the
 default ClutterStage into any GtkContainer.
 
-Because of limitations inside Clutter, it is only possible to embed a single
-ClutterStage.
-
 Requirements:
 
   Clutter >= 0.8.0 (X11 backend) or >= 0.8.0 (Win32 backend)

diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
index c3a53fd..d516d09 100644 (file)
--- a/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@ -9,11 +9,11 @@ INCLUDES = \
        $(CLUTTER_CFLAGS)                       \
        $(GTK_CFLAGS)
 
-lib_LTLIBRARIES = libclutter-gtk-0.7.la
+lib_LTLIBRARIES = libclutter-gtk-0.8.la
 
-libclutter_gtk_0_7_la_SOURCES = gtk-clutter-embed.c gtk-clutter-util.c
-libclutter_gtk_0_7_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
-libclutter_gtk_0_7_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+libclutter_gtk_0_8_la_SOURCES = gtk-clutter-embed.c gtk-clutter-util.c
+libclutter_gtk_0_8_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
+libclutter_gtk_0_8_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
 
-cluttergtkheadersdir = $(includedir)/clutter-0.7/clutter-gtk
+cluttergtkheadersdir = $(includedir)/clutter-0.8/clutter-gtk
 cluttergtkheaders_HEADERS = gtk-clutter-embed.h gtk-clutter-util.h

diff --git a/clutter-gtk/gtk-clutter-embed.h b/clutter-gtk/gtk-clutter-embed.h
index 0735e21..435bf3a 100644 (file)
--- a/clutter-gtk/gtk-clutter-embed.h
+++ b/clutter-gtk/gtk-clutter-embed.h
@@ -26,6 +26,7 @@
 #include <gtk/gtkwidget.h>
 #include <clutter/clutter-main.h>
 #include <clutter/clutter-actor.h>
+#include <clutter-gtk/gtk-clutter-util.h>
 
 G_BEGIN_DECLS
 

diff --git a/clutter-gtk/gtk-clutter-util.h b/clutter-gtk/gtk-clutter-util.h
index 539b1f7..7557426 100644 (file)
--- a/clutter-gtk/gtk-clutter-util.h
+++ b/clutter-gtk/gtk-clutter-util.h
@@ -22,8 +22,8 @@
 #ifndef __GTK_CLUTTER_UTIL_H__
 #define __GTK_CLUTTER_UTIL_H__
 
-#include <gtk/gtkwidget.h>
-#include <clutter/clutter-color.h>
+#include <gtk/gtk.h>
+#include <clutter/clutter.h>
 
 G_BEGIN_DECLS
 

diff --git a/configure.ac b/configure.ac
index 9c5d463..dd36394 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # An odd micro number indicates in-progress development, (eg. from CVS)
 # An even micro number indicates a released version.
 m4_define([clutter_major_version], [0])
-m4_define([clutter_minor_version], [7])
+m4_define([clutter_minor_version], [8])
 m4_define([clutter_micro_version], [0])
 
 m4_define([clutter_version],
@@ -67,7 +67,7 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([memset munmap strcasecmp strdup])
 
-CLUTTER_REQUIRED=0.7.0
+CLUTTER_REQUIRED=0.8.0
 
 cluttergtkflavour=x11
 AC_ARG_WITH([flavour],
@@ -79,12 +79,12 @@ case $cluttergtkflavour in
 
   x11)
     AC_DEFINE([HAVE_CLUTTER_GTK_X11], 1, [Using the X11 flavour])
-    PKG_CHECK_MODULES(CLUTTER, clutter-x11-0.7 >= $CLUTTER_REQUIRED)
+    PKG_CHECK_MODULES(CLUTTER, clutter-x11-0.8 >= $CLUTTER_REQUIRED)
     ;;
     
   win32)
     AC_DEFINE([HAVE_CLUTTER_GTK_WIN32], 1, [Using the Win32 flavour])
-    PKG_CHECK_MODULES(CLUTTER, clutter-win32-0.7 >= $CLUTTER_REQUIRED)
+    PKG_CHECK_MODULES(CLUTTER, clutter-win32-0.8 >= $CLUTTER_REQUIRED)
     ;;
     
   *)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 87d7740..6402291 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -12,10 +12,10 @@ INCLUDES = \
 AM_CPPFLAGS = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
 
 common_deps = \
-       $(top_builddir)/clutter-gtk/libclutter-gtk-0.7.la
+       $(top_builddir)/clutter-gtk/libclutter-gtk-0.8.la
 
 common_ldadd = \
-       $(top_builddir)/clutter-gtk/libclutter-gtk-0.7.la \
+       $(top_builddir)/clutter-gtk/libclutter-gtk-0.8.la \
        $(CLUTTER_LIBS) \
        $(GTK_LIBS)