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

@@ -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

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 \

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)

cogl-pango/cogl-pango-2.0-experimental.pc.in

@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+apiversion=1.0
+requires=@COGL_PKG_REQUIRES@ cogl-1.0
+
+Name: Cogl
+Description: An object oriented GL/GLES Abstraction/Utility Layer
+Version: @COGL_1_VERSION@
+Libs: -L${libdir} -lcoglpango
+Cflags: -I${includedir}/cogl
+Requires: ${requires}

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)

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
 )

doc/reference/Makefile.am

@@ -1 +1 @@
-SUBDIRS = cogl cogl-2.0
+SUBDIRS = cogl cogl-2.0-experimental