Move clutter-util.h into the deprecated section

clutter/Makefile.am

@@ -114,12 +114,11 @@ source_h =					\
 	$(srcdir)/clutter-state.h		\
 	$(srcdir)/clutter-table-layout.h	\
 	$(srcdir)/clutter-texture.h 		\
-	$(srcdir)/clutter-text.h			\
+	$(srcdir)/clutter-text.h		\
 	$(srcdir)/clutter-text-buffer.h		\
 	$(srcdir)/clutter-timeline.h 		\
 	$(srcdir)/clutter-types.h		\
 	$(srcdir)/clutter-units.h 		\
-	$(srcdir)/clutter-util.h 		\
 	$(NULL)
 
 source_c = \
@@ -258,6 +257,7 @@ deprecated_h = \
 	$(srcdir)/deprecated/clutter-texture.h			\
 	$(srcdir)/deprecated/clutter-timeline.h 		\
 	$(srcdir)/deprecated/clutter-timeout-pool.h 		\
+	$(srcdir)/deprecated/clutter-util.h 			\
 	$(NULL)
 
 # deprecated source code

clutter/clutter-deprecated.h

@@ -30,6 +30,7 @@
 #include "deprecated/clutter-texture.h"
 #include "deprecated/clutter-timeline.h"
 #include "deprecated/clutter-timeout-pool.h"
+#include "deprecated/clutter-util.h"
 
 #undef __CLUTTER_DEPRECATED_H_INSIDE__
 

clutter/clutter-util.c

@@ -36,7 +36,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "clutter-util.h"
+#include "deprecated/clutter-util.h"
 #include "clutter-main.h"
 
 /**

clutter/clutter.h

@@ -97,7 +97,6 @@
 #include "clutter-text.h"
 #include "clutter-timeline.h"
 #include "clutter-units.h"
-#include "clutter-util.h"
 #include "clutter-version.h"
 
 #include "clutter-enum-types.h"

clutter/deprecated/clutter-util.h

@@ -32,7 +32,7 @@
 
 G_BEGIN_DECLS
 
-CLUTTER_DEPRECATED
+CLUTTER_DEPRECATED_IN_1_2
 gint clutter_util_next_p2 (gint a);
 
 G_END_DECLS