diff -Nru cogl-1.10.2/debian/changelog cogl-1.10.2/debian/changelog
--- cogl-1.10.2/debian/changelog	2013-03-16 11:07:52.000000000 +0000
+++ cogl-1.10.2/debian/changelog	2014-01-13 00:26:41.000000000 +0000
@@ -1,3 +1,13 @@
+cogl (1.10.2-7+rpi1) wheezy-staging; urgency=low
+
+  * Switch to regular opengl (as is used by debian on non-arm platoforms), we
+    don't have an accelerated x11 compatible opengl es on the Pi and building
+    this against opengl es causes problems with the mesa opengl es conflicting
+    with the raspberry pi foundation's non-x11 compatible opengl es.
+    (LP: 1268378)
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 13 Jan 2014 00:24:47 +0000
+
 cogl (1.10.2-7) unstable; urgency=high
 
   [ Josselin Mouette ]
diff -Nru cogl-1.10.2/debian/control cogl-1.10.2/debian/control
--- cogl-1.10.2/debian/control	2013-03-16 11:23:09.000000000 +0000
+++ cogl-1.10.2/debian/control	2014-01-13 00:45:02.000000000 +0000
@@ -7,13 +7,12 @@
 Section: libs
 Priority: optional
 Maintainer: Rico Tzschichholz <ricotz@ubuntu.com>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
 Build-Depends: debhelper (>= 8.1.3~),
                cdbs (>= 0.4.93~),
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.13),
-               libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf],
-               libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf],
+               libgl1-mesa-dev (>= 7.1~rc3-1~),
                libcairo2-dev (>= 1.10),
                libpango1.0-dev (>= 1.28.3-5),
                libgdk-pixbuf2.0-dev (>= 2.0),
@@ -31,8 +30,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
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -60,8 +58,7 @@
 Architecture: any
 Depends: libcogl9 (= ${binary:Version}),
          gir1.2-cogl-1.0 (= ${binary:Version}),
-         libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf],
-         libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf],
+         libgl1-mesa-dev (>= 7.1~rc3-1~),
          libglib2.0-dev (>= 2.28.0),
          libdrm-dev [!hurd-any],
          libgdk-pixbuf2.0-dev (>= 2.0),
diff -Nru cogl-1.10.2/debian/control.in cogl-1.10.2/debian/control.in
--- cogl-1.10.2/debian/control.in	2013-03-16 11:04:35.000000000 +0000
+++ cogl-1.10.2/debian/control.in	2014-01-13 00:44:49.000000000 +0000
@@ -7,8 +7,7 @@
                cdbs (>= 0.4.93~),
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.13),
-               libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf],
-               libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf],
+               libgl1-mesa-dev (>= 7.1~rc3-1~),
                libcairo2-dev (>= 1.10),
                libpango1.0-dev (>= 1.28.3-5),
                libgdk-pixbuf2.0-dev (>= 2.0),
@@ -26,8 +25,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
 Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
@@ -55,8 +53,7 @@
 Architecture: any
 Depends: libcogl9 (= ${binary:Version}),
          gir1.2-cogl-1.0 (= ${binary:Version}),
-         libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf],
-         libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf],
+         libgl1-mesa-dev (>= 7.1~rc3-1~),
          libglib2.0-dev (>= 2.28.0),
          libdrm-dev [!hurd-any],
          libgdk-pixbuf2.0-dev (>= 2.0),
diff -Nru cogl-1.10.2/debian/libcogl9.symbols cogl-1.10.2/debian/libcogl9.symbols
--- cogl-1.10.2/debian/libcogl9.symbols	2013-03-16 10:48:50.000000000 +0000
+++ cogl-1.10.2/debian/libcogl9.symbols	2014-01-13 00:38:28.000000000 +0000
@@ -136,7 +136,6 @@
  cogl_double_to_fixed@Base 1.7.4
  cogl_double_to_int@Base 1.7.4
  cogl_double_to_uint@Base 1.7.4
-(arch=armel armhf)#include "libcogl9.symbols.egl"
  cogl_end_gl@Base 1.7.4
  cogl_error_get_type@Base 1.7.4
  cogl_euler_copy@Base 1.7.4
diff -Nru cogl-1.10.2/debian/rules cogl-1.10.2/debian/rules
--- cogl-1.10.2/debian/rules	2013-03-16 10:48:50.000000000 +0000
+++ cogl-1.10.2/debian/rules	2014-01-13 00:09:55.000000000 +0000
@@ -18,8 +18,8 @@
 	--enable-introspection=yes \
 	--with-gles2-libname=libGLESv2.so.2
 
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
-        DEB_CONFIGURE_EXTRA_FLAGS += --enable-gl=no --enable-gles2=yes
-endif
+#ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
+#        DEB_CONFIGURE_EXTRA_FLAGS += --enable-gl=no --enable-gles2=yes
+#endif
 
 common-binary-predeb-arch:: list-missing