[cogl] Make it clearer that the 2.0 API is experimental

[Robert Bragg <rbragg src gnome org>]

commit 3729bf27697308142dbadcb9eea1b1d59b28e65d
Author: Robert Bragg <robert linux intel com>
Date:   Fri Jun 10 18:47:12 2011 +0100

    Make it clearer that the 2.0 API is experimental
    
    This explicitly renames the cogl-2.0 reference manual to
    cogl-2.0-experimental and renames the cogl-2.0 pkg-config file to
    cogl-2.0-experimental.pc. Hopefully this should avoid
    miss-understandings.

 .gitignore                                         |   26 ++++++++++----------
 build/autotools/Makefile.am.release                |    8 ++++--
 cogl-pango/Makefile.am                             |    2 +-
 .../cogl-pango-2.0-experimental.pc.in              |   10 ++++----
 cogl/Makefile.am                                   |    2 +-
 cogl/{cogl.pc.in => cogl-2.0-experimental.pc.in}   |    0
 configure.ac                                       |    8 +++---
 doc/reference/Makefile.am                          |    2 +-
 .../Makefile.am                                    |    0
 .../blend-strings.xml                              |    0
 .../cogl-docs.xml.in                               |    0
 .../cogl-sections.txt                              |    0
 .../cogl_ortho.png                                 |  Bin 12650 -> 12650 bytes
 .../fill-rule-even-odd.png                         |  Bin 3121 -> 3121 bytes
 .../fill-rule-non-zero.png                         |  Bin 3143 -> 3143 bytes
 .../quad-indices-order.png                         |  Bin 2620 -> 2620 bytes
 .../quad-indices-triangles.png                     |  Bin 8018 -> 8018 bytes
 17 files changed, 30 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e0ea46..a233dfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,19 +42,19 @@ depcomp
 /doc/reference/cogl/cogl-docs.xml
 /doc/reference/cogl/*.stamp
 /doc/reference/cogl/*.bak
-/doc/reference/cogl-2.0/cogl-*.txt
-!/doc/reference/cogl-2.0/cogl-sections.txt
-/doc/reference/cogl-2.0/html
-/doc/reference/cogl-2.0/tmpl
-/doc/reference/cogl-2.0/xml
-/doc/reference/cogl-2.0/cogl.args
-/doc/reference/cogl-2.0/cogl.hierarchy
-/doc/reference/cogl-2.0/cogl.interfaces
-/doc/reference/cogl-2.0/cogl.prerequisites
-/doc/reference/cogl-2.0/cogl.signals
-/doc/reference/cogl-2.0/cogl-docs.xml
-/doc/reference/cogl-2.0/*.stamp
-/doc/reference/cogl-2.0/*.bak
+/doc/reference/cogl-2.0-experimental/cogl-*.txt
+!/doc/reference/cogl-2.0-experimental/cogl-sections.txt
+/doc/reference/cogl-2.0-experimental/html
+/doc/reference/cogl-2.0-experimental/tmpl
+/doc/reference/cogl-2.0-experimental/xml
+/doc/reference/cogl-2.0-experimental/cogl.args
+/doc/reference/cogl-2.0-experimental/cogl.hierarchy
+/doc/reference/cogl-2.0-experimental/cogl.interfaces
+/doc/reference/cogl-2.0-experimental/cogl.prerequisites
+/doc/reference/cogl-2.0-experimental/cogl.signals
+/doc/reference/cogl-2.0-experimental/cogl-docs.xml
+/doc/reference/cogl-2.0-experimental/*.stamp
+/doc/reference/cogl-2.0-experimental/*.bak
 /examples/hello
 /examples/x11-foreign
 gtk-doc.make
diff --git a/build/autotools/Makefile.am.release b/build/autotools/Makefile.am.release
index 2abbaaf..0534286 100644
--- a/build/autotools/Makefile.am.release
+++ b/build/autotools/Makefile.am.release
@@ -113,8 +113,10 @@ release-message:
 	@cat .README-section-02
 	@echo ""
 	@echo "Documentation:"
-	@echo "      Cogl: $(RELEASE_DOC_URL)/cogl/$(COGL_MAJOR_VERSION).$(COGL_MINOR_VERSION)/"
-	@echo "      Cogl : $(RELEASE_DOC_URL)/cogl-2.0/$(COGL_MAJOR_VERSION).$(COGL_MINOR_VERSION)/"
+	@echo "      Cogl:"
+	@echo "        $(RELEASE_DOC_URL)/cogl/$(COGL_MAJOR_VERSION).$(COGL_MINOR_VERSION)/"
+	@echo "      Cogl experimental 2.0:"
+	@echo "        $(RELEASE_DOC_URL)/cogl-2.0-experimental/$(COGL_MAJOR_VERSION).$(COGL_MINOR_VERSION)/"
 	@echo ""
 	@echo "  - The Cogl library exports a stable 1.x API (For third-party Clutter"
 	@echo "    developers to write custom actors) and an experimental 2.0 API which allows"
@@ -145,7 +147,7 @@ release-publish: release-check
 	$(MAKE) $(AM_MAKEFLAGS) release-tag
 	$(MAKE) $(AM_MAKEFLAGS) release-upload
 	$(MAKE) $(AM_MAKEFLAGS) release-message
-	
+
 .PHONY: \
 	release-check \
 	release-message \
diff --git a/cogl-pango/Makefile.am b/cogl-pango/Makefile.am
index 1fecab7..b57e147 100644
--- a/cogl-pango/Makefile.am
+++ b/cogl-pango/Makefile.am
@@ -47,7 +47,7 @@ cogl_pangoheadersdir = $(includedir)/cogl/cogl-pango
 cogl_pangoheaders_HEADERS = $(source_h)
 
 pc_files = cogl-pango-1.0.pc \
-	   cogl-pango-$(COGL_API_VERSION).pc
+	   cogl-pango-$(COGL_API_VERSION)-experimental.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pc_files)
diff --git a/cogl/cogl.pc.in b/cogl-pango/cogl-pango-2.0-experimental.pc.in
similarity index 51%
copy from cogl/cogl.pc.in
copy to cogl-pango/cogl-pango-2.0-experimental.pc.in
index a2b4a4b..0f5d982 100644
--- a/cogl/cogl.pc.in
+++ b/cogl-pango/cogl-pango-2.0-experimental.pc.in
@@ -2,12 +2,12 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
-apiversion= COGL_API_VERSION@
-requires= COGL_PKG_REQUIRES@
+apiversion=1.0
+requires= COGL_PKG_REQUIRES@ cogl-1.0
 
 Name: Cogl
 Description: An object oriented GL/GLES Abstraction/Utility Layer
-Version: @COGL_VERSION@
-Libs: -L${libdir} -lcogl
-Cflags: -I${includedir}/cogl -DCOGL_ENABLE_EXPERIMENTAL_2_0_API
+Version: @COGL_1_VERSION@
+Libs: -L${libdir} -lcoglpango
+Cflags: -I${includedir}/cogl
 Requires: ${requires}
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 8a7abb4..c3e2d72 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -43,7 +43,7 @@ pc_files = \
 	cogl-1.0.pc \
 	cogl-gl-1.0.pc
 
-pc_files += cogl-$(COGL_API_VERSION).pc
+pc_files += cogl-$(COGL_API_VERSION)-experimental.pc
 
 cogl-gl-1.0.pc: cogl-1.0.pc
 	$(QUIET_GEN)cp -f $< $(@F)
diff --git a/cogl/cogl.pc.in b/cogl/cogl-2.0-experimental.pc.in
similarity index 100%
rename from cogl/cogl.pc.in
rename to cogl/cogl-2.0-experimental.pc.in
diff --git a/configure.ac b/configure.ac
index 26f7d41..42bbbf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -858,17 +858,17 @@ Makefile
 README
 cogl/Makefile
 cogl/cogl-1.0.pc
-cogl/cogl-$COGL_MAJOR_VERSION.0.pc:cogl/cogl.pc.in
+cogl/cogl-2.0-experimental.pc
 cogl/cogl-defines.h
 cogl-pango/Makefile
 cogl-pango/cogl-pango-1.0.pc
-cogl-pango/cogl-pango-$COGL_MAJOR_VERSION.0.pc:cogl-pango/cogl-pango.pc.in
+cogl-pango/cogl-pango-2.0-experimental.pc
 doc/Makefile
 doc/reference/Makefile
 doc/reference/cogl/Makefile
 doc/reference/cogl/cogl-docs.xml
-doc/reference/cogl-2.0/Makefile
-doc/reference/cogl-2.0/cogl-docs.xml
+doc/reference/cogl-2.0-experimental/Makefile
+doc/reference/cogl-2.0-experimental/cogl-docs.xml
 examples/Makefile
 po/Makefile.in
 )
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index fd332b4..8cf6d05 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -1 +1 @@
-SUBDIRS = cogl cogl-2.0
+SUBDIRS = cogl cogl-2.0-experimental
diff --git a/doc/reference/cogl-2.0/Makefile.am b/doc/reference/cogl-2.0-experimental/Makefile.am
similarity index 100%
rename from doc/reference/cogl-2.0/Makefile.am
rename to doc/reference/cogl-2.0-experimental/Makefile.am
diff --git a/doc/reference/cogl-2.0/blend-strings.xml b/doc/reference/cogl-2.0-experimental/blend-strings.xml
similarity index 100%
rename from doc/reference/cogl-2.0/blend-strings.xml
rename to doc/reference/cogl-2.0-experimental/blend-strings.xml
diff --git a/doc/reference/cogl-2.0/cogl-docs.xml.in b/doc/reference/cogl-2.0-experimental/cogl-docs.xml.in
similarity index 100%
rename from doc/reference/cogl-2.0/cogl-docs.xml.in
rename to doc/reference/cogl-2.0-experimental/cogl-docs.xml.in
diff --git a/doc/reference/cogl-2.0/cogl-sections.txt b/doc/reference/cogl-2.0-experimental/cogl-sections.txt
similarity index 100%
rename from doc/reference/cogl-2.0/cogl-sections.txt
rename to doc/reference/cogl-2.0-experimental/cogl-sections.txt
diff --git a/doc/reference/cogl-2.0/cogl_ortho.png b/doc/reference/cogl-2.0-experimental/cogl_ortho.png
similarity index 100%
rename from doc/reference/cogl-2.0/cogl_ortho.png
rename to doc/reference/cogl-2.0-experimental/cogl_ortho.png
diff --git a/doc/reference/cogl-2.0/fill-rule-even-odd.png b/doc/reference/cogl-2.0-experimental/fill-rule-even-odd.png
similarity index 100%
rename from doc/reference/cogl-2.0/fill-rule-even-odd.png
rename to doc/reference/cogl-2.0-experimental/fill-rule-even-odd.png
diff --git a/doc/reference/cogl-2.0/fill-rule-non-zero.png b/doc/reference/cogl-2.0-experimental/fill-rule-non-zero.png
similarity index 100%
rename from doc/reference/cogl-2.0/fill-rule-non-zero.png
rename to doc/reference/cogl-2.0-experimental/fill-rule-non-zero.png
diff --git a/doc/reference/cogl-2.0/quad-indices-order.png b/doc/reference/cogl-2.0-experimental/quad-indices-order.png
similarity index 100%
rename from doc/reference/cogl-2.0/quad-indices-order.png
rename to doc/reference/cogl-2.0-experimental/quad-indices-order.png
diff --git a/doc/reference/cogl-2.0/quad-indices-triangles.png b/doc/reference/cogl-2.0-experimental/quad-indices-triangles.png
similarity index 100%
rename from doc/reference/cogl-2.0/quad-indices-triangles.png
rename to doc/reference/cogl-2.0-experimental/quad-indices-triangles.png