From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Tue, 7 Aug 2007 14:54:31 +0000 (+0000)
Subject: 2007-08-07  Emmanuele Bassi  <ebassi@openedhand.com>
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=4d34a239b95daefa3a60f6e843956ae6608c1bfb;p=clutter-gtk

2007-08-07  Emmanuele Bassi  <ebassi@openedhand.com>

	* configure.ac: Bump up to 0.4.0; require clutter-glx-0.4.

	* clutter-gtk.pc.in:
	* Makefile.am:
	* clutter-gtk/Makefile.am: Update.
---

diff --git a/ChangeLog b/ChangeLog
index b75f358..65bcb2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-07  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* configure.ac: Bump up to 0.4.0; require clutter-glx-0.4.
+
+	* clutter-gtk.pc.in:
+	* Makefile.am:
+	* clutter-gtk/Makefile.am: Update.
+
 2007-08-03  Chris Lord,,,  <chris@openedhand.com>
 
 	* doc/reference/Makefile.am:
diff --git a/Makefile.am b/Makefile.am
index 11a626e..fd3a7df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 SUBDIRS = clutter-gtk doc examples
 
-clutter-gtk-0.3.pc: clutter-gtk.pc
-	@cp -f clutter-gtk.pc clutter-gtk-0.3.pc
+clutter-gtk-0.4.pc: clutter-gtk.pc
+	@cp -f clutter-gtk.pc clutter-gtk-0.4.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = clutter-gtk-0.3.pc
+pkgconfig_DATA = clutter-gtk-0.4.pc
 
-CLEANFILES = clutter-gtk-0.3.pc
+CLEANFILES = clutter-gtk-0.4.pc
 
 DISTCLEANFILES = clutter-gtk.pc
 
diff --git a/clutter-gtk.pc.in b/clutter-gtk.pc.in
index a8b32f2..6d8f6c5 100644
--- a/clutter-gtk.pc.in
+++ b/clutter-gtk.pc.in
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: clutter-gtk
 Description: GTK+ widget for Clutter
 Version: @VERSION@
-Libs: -L${libdir} -lclutter-gtk-0.3
-Cflags: -I${includedir}/clutter-0.3/clutter-gtk
-Requires: clutter-0.3 gtk+-2.0
+Libs: -L${libdir} -lclutter-gtk-0.4
+Cflags: -I${includedir}/clutter-0.4/clutter-gtk
+Requires: clutter-0.4 gtk+-2.0
diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
index 4def1dc..7564604 100644
--- a/clutter-gtk/Makefile.am
+++ b/clutter-gtk/Makefile.am
@@ -9,11 +9,11 @@ INCLUDES = \
 	$(CLUTTER_CFLAGS) 			\
 	$(GTK_CFLAGS)
 
-lib_LTLIBRARIES = libclutter-gtk-0.3.la
+lib_LTLIBRARIES = libclutter-gtk-0.4.la
 
-libclutter_gtk_0_3_la_SOURCES = clutter-gtk.c
-libclutter_gtk_0_3_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
-libclutter_gtk_0_3_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
+libclutter_gtk_0_4_la_SOURCES = clutter-gtk.c
+libclutter_gtk_0_4_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
+libclutter_gtk_0_4_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
 
-cluttergtkheadersdir = $(includedir)/clutter-0.3/clutter-gtk
+cluttergtkheadersdir = $(includedir)/clutter-0.4/clutter-gtk
 cluttergtkheaders_HEADERS = clutter-gtk.h
diff --git a/configure.ac b/configure.ac
index 933d42c..1b64047 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 # 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], [3])
-m4_define([clutter_micro_version], [1])
+m4_define([clutter_minor_version], [4])
+m4_define([clutter_micro_version], [0])
 
 m4_define([clutter_version],
           [clutter_major_version.clutter_minor_version.clutter_micro_version])
@@ -67,9 +67,9 @@ AC_FUNC_MALLOC
 AC_FUNC_MMAP
 AC_CHECK_FUNCS([memset munmap strcasecmp strdup])
 
-CLUTTER_REQUIRED=0.3.0
+CLUTTER_REQUIRED=0.4.0
 
-PKG_CHECK_MODULES(CLUTTER, clutter-glx-0.3 >= $CLUTTER_REQUIRED)
+PKG_CHECK_MODULES(CLUTTER, clutter-glx-0.4 >= $CLUTTER_REQUIRED)
 AC_SUBST(CLUTTER_CFLAGS)
 AC_SUBST(CLUTTER_LIBS)