[clutter] Move clutter-util.h into the deprecated section

[Emmanuele Bassi <ebassi src gnome org>]

commit 0ee7170dbb56dba21e7404acc1e2151a1558e38c
Author: Emmanuele Bassi <ebassi linux intel com>
Date:   Mon Feb 27 15:56:12 2012 +0000

    Move clutter-util.h into the deprecated section

 clutter/Makefile.am                     |    4 ++--
 clutter/clutter-deprecated.h            |    1 +
 clutter/clutter-util.c                  |    2 +-
 clutter/clutter.h                       |    1 -
 clutter/{ => deprecated}/clutter-util.h |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index a15dc17..4c942ef 100644
--- a/clutter/Makefile.am
+++ b/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
diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index 8f6a1e0..44c5274 100644
--- a/clutter/clutter-deprecated.h
+++ b/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__
 
diff --git a/clutter/clutter-util.c b/clutter/clutter-util.c
index 6b94d3f..2c754a0 100644
--- a/clutter/clutter-util.c
+++ b/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"
 
 /**
diff --git a/clutter/clutter.h b/clutter/clutter.h
index 7f5d517..eb5c7c0 100644
--- a/clutter/clutter.h
+++ b/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"
diff --git a/clutter/clutter-util.h b/clutter/deprecated/clutter-util.h
similarity index 97%
rename from clutter/clutter-util.h
rename to clutter/deprecated/clutter-util.h
index 26fb7d8..ff9b325 100644
--- a/clutter/clutter-util.h
+++ b/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