diff -Nru cogl-1.18.2/debian/changelog cogl-1.18.2/debian/changelog
--- cogl-1.18.2/debian/changelog	2014-07-12 07:23:10.000000000 +0000
+++ cogl-1.18.2/debian/changelog	2014-07-30 06:26:36.000000000 +0000
@@ -1,3 +1,10 @@
+cogl (1.18.2-1+rpi1) jessie-staging; urgency=medium
+
+  * Switch to regular opengl and disable egl/gles to avoid conflicting with
+    raspberry pi foundation libraries.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 30 Jul 2014 06:26:12 +0000
+
 cogl (1.18.2-1) unstable; urgency=medium
 
   [ Samuel Thibault ]
diff -Nru cogl-1.18.2/debian/control cogl-1.18.2/debian/control
--- cogl-1.18.2/debian/control	2014-07-12 07:23:37.000000000 +0000
+++ cogl-1.18.2/debian/control	2014-07-30 06:29:42.000000000 +0000
@@ -14,7 +14,6 @@
                gtk-doc-tools (>= 1.13),
                libgbm-dev [linux-any],
                libgl1-mesa-dev (>= 7.1~rc3-1~),
-               libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
                libcairo2-dev (>= 1.10),
                libpango1.0-dev (>= 1.28.3-5),
                libgdk-pixbuf2.0-dev (>= 2.0),
@@ -34,8 +33,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgl1-mesa-glx [!armel !armhf ],
-         libgles2-mesa [armel armhf] | libgles2 [armel armhf]
+         libgl1-mesa-glx
 Recommends: libcogl-common
 Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx
 Pre-Depends: ${misc:Pre-Depends}
@@ -66,7 +64,6 @@
 Depends: libcogl20 (= ${binary:Version}),
          gir1.2-cogl-1.0 (= ${binary:Version}),
          libgl1-mesa-dev (>= 7.1~rc3-1~),
-         libgles2-mesa-dev (>= 7.1~rc3-1~) [!hurd-any] | libgles2-dev [!hurd-any],
          libglib2.0-dev (>= 2.28.0),
          libdrm-dev [!hurd-any],
          libwayland-dev [linux-any],
@@ -230,7 +227,7 @@
  dynamic bindings for libcogl-pango.
 
 Package: libcogl-gles2-20
-Architecture: linux-any kfreebsd-any
+Architecture: kfreebsd-any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgl1-mesa-glx [!armel !armhf ],
@@ -250,7 +247,7 @@
 
 Package: libcogl-gles2-dev
 Section: libdevel
-Architecture: linux-any kfreebsd-any
+Architecture: kfreebsd-any
 Depends: libcogl-gles2-20 (= ${binary:Version}),
          libcogl-dev (= ${binary:Version}),
          ${misc:Depends},
diff -Nru cogl-1.18.2/debian/control.in cogl-1.18.2/debian/control.in
--- cogl-1.18.2/debian/control.in	2014-03-26 11:46:28.000000000 +0000
+++ cogl-1.18.2/debian/control.in	2014-07-30 06:26:36.000000000 +0000
@@ -9,7 +9,6 @@
                gtk-doc-tools (>= 1.13),
                libgbm-dev [linux-any],
                libgl1-mesa-dev (>= 7.1~rc3-1~),
-               libgles2-mesa-dev (>= 7.1~rc3-1~) | libgles2-dev,
                libcairo2-dev (>= 1.10),
                libpango1.0-dev (>= 1.28.3-5),
                libgdk-pixbuf2.0-dev (>= 2.0),
@@ -29,8 +28,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libgl1-mesa-glx [!armel !armhf ],
-         libgles2-mesa [armel armhf] | libgles2 [armel armhf]
+         libgl1-mesa-glx
 Recommends: libcogl-common
 Suggests: libgles2-mesa | libgles2, libgl1-mesa-glx
 Pre-Depends: ${misc:Pre-Depends}
@@ -61,7 +59,6 @@
 Depends: libcogl20 (= ${binary:Version}),
          gir1.2-cogl-1.0 (= ${binary:Version}),
          libgl1-mesa-dev (>= 7.1~rc3-1~),
-         libgles2-mesa-dev (>= 7.1~rc3-1~) [!hurd-any] | libgles2-dev [!hurd-any],
          libglib2.0-dev (>= 2.28.0),
          libdrm-dev [!hurd-any],
          libwayland-dev [linux-any],
@@ -225,7 +222,7 @@
  dynamic bindings for libcogl-pango.
 
 Package: libcogl-gles2-20
-Architecture: linux-any kfreebsd-any
+Architecture: kfreebsd-any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgl1-mesa-glx [!armel !armhf ],
@@ -245,7 +242,7 @@
 
 Package: libcogl-gles2-dev
 Section: libdevel
-Architecture: linux-any kfreebsd-any
+Architecture: kfreebsd-any
 Depends: libcogl-gles2-20 (= ${binary:Version}),
          libcogl-dev (= ${binary:Version}),
          ${misc:Depends},
diff -Nru cogl-1.18.2/debian/libcogl20.symbols cogl-1.18.2/debian/libcogl20.symbols
--- cogl-1.18.2/debian/libcogl20.symbols	2014-07-12 07:22:18.000000000 +0000
+++ cogl-1.18.2/debian/libcogl20.symbols	2014-07-30 06:28:01.000000000 +0000
@@ -158,8 +158,6 @@
  cogl_double_to_fixed@Base 1.17.4
  cogl_double_to_int@Base 1.17.4
  cogl_double_to_uint@Base 1.17.4
- cogl_egl_context_get_egl_context@Base 1.18.0
- cogl_egl_context_get_egl_display@Base 1.17.4
  cogl_end_gl@Base 1.17.4
  cogl_error_copy@Base 1.17.4
  cogl_error_free@Base 1.17.4
@@ -341,12 +339,6 @@
  cogl_is_texture_rectangle@Base 1.17.4
  cogl_is_vertex_buffer@Base 1.17.4
  cogl_is_vertex_buffer_indices@Base 1.17.4
- (arch=linux-any)cogl_kms_display_queue_modes_reset@Base 1.17.4
- (arch=linux-any)cogl_kms_display_set_ignore_crtc@Base 1.18.2
- (arch=linux-any)cogl_kms_display_set_layout@Base 1.17.4
- (arch=linux-any)cogl_kms_renderer_get_gbm@Base 1.18.2
- (arch=linux-any)cogl_kms_renderer_get_kms_fd@Base 1.17.4
- (arch=linux-any)cogl_kms_renderer_set_kms_fd@Base 1.18.0
  cogl_material_alpha_func_get_type@Base 1.17.4
  cogl_material_copy@Base 1.17.4
  cogl_material_filter_get_type@Base 1.17.4
@@ -809,16 +801,6 @@
  cogl_vertex_buffer_unref@Base 1.17.4
  cogl_vertices_mode_get_type@Base 1.17.4
  cogl_viewport@Base 1.17.4
- (arch=linux-any)cogl_wayland_display_set_compositor_display@Base 1.17.4
- (arch=linux-any)cogl_wayland_onscreen_get_shell_surface@Base 1.17.4
- (arch=linux-any)cogl_wayland_onscreen_get_surface@Base 1.17.4
- (arch=linux-any)cogl_wayland_onscreen_resize@Base 1.17.4
- (arch=linux-any)cogl_wayland_onscreen_set_foreign_surface@Base 1.17.4
- (arch=linux-any)cogl_wayland_renderer_get_display@Base 1.17.4
- (arch=linux-any)cogl_wayland_renderer_set_event_dispatch_enabled@Base 1.17.4
- (arch=linux-any)cogl_wayland_renderer_set_foreign_display@Base 1.17.4
- (arch=linux-any)cogl_wayland_texture_2d_new_from_buffer@Base 1.17.4
- (arch=linux-any)cogl_wayland_texture_set_region_from_shm_buffer@Base 1.17.4
  cogl_winding_get_type@Base 1.17.4
  cogl_winsys_feature_get_type@Base 1.17.4
  cogl_x11_onscreen_get_visual_xid@Base 1.17.4
diff -Nru cogl-1.18.2/debian/rules cogl-1.18.2/debian/rules
--- cogl-1.18.2/debian/rules	2014-03-26 11:46:28.000000000 +0000
+++ cogl-1.18.2/debian/rules	2014-07-30 06:26:36.000000000 +0000
@@ -21,23 +21,23 @@
 	--enable-introspection=yes \
 	--enable-gl=yes
 
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
-        DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gles2
-else
+#ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
+#        DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gles2
+#else
         DEB_CONFIGURE_EXTRA_FLAGS += --with-default-driver=gl
-endif
+#endif
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--enable-xlib-egl-platform=yes \
-	--enable-cogl-gles2=yes \
-	--with-gles2-libname=libGLESv2.so.2 \
-	--enable-gles2=yes
+#DEB_CONFIGURE_EXTRA_FLAGS += \
+#	--enable-xlib-egl-platform=yes \
+#	--enable-cogl-gles2=yes \
+#	--with-gles2-libname=libGLESv2.so.2 \
+#	--enable-gles2=yes
 
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-DEB_CONFIGURE_EXTRA_FLAGS += \
-	--enable-wayland-egl-platform \
-	--enable-wayland-egl-server \
-	--enable-kms-egl-platform=yes
-endif
+#ifeq ($(DEB_HOST_ARCH_OS),linux)
+#DEB_CONFIGURE_EXTRA_FLAGS += \
+#	--enable-wayland-egl-platform \
+#	--enable-wayland-egl-server \
+#	--enable-kms-egl-platform=yes
+#endif
 
 common-binary-predeb-arch:: list-missing