diff -Nru cairo-1.12.16/debian/changelog cairo-1.12.16/debian/changelog
--- cairo-1.12.16/debian/changelog	2013-09-17 14:37:36.000000000 +0000
+++ cairo-1.12.16/debian/changelog	2014-01-15 21:47:18.000000000 +0000
@@ -1,3 +1,9 @@
+cairo (1.12.16-2+rpi1) jessie-staging; urgency=medium
+
+  * Disable egl to avoid conflicts with raspberry pi foundation libraries.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 15 Jan 2014 21:45:25 +0000
+
 cairo (1.12.16-2) unstable; urgency=low
 
   [ Cyril Brulebois ]
diff -Nru cairo-1.12.16/debian/control cairo-1.12.16/debian/control
--- cairo-1.12.16/debian/control	2013-09-17 14:37:36.000000000 +0000
+++ cairo-1.12.16/debian/control	2014-01-15 21:48:27.000000000 +0000
@@ -23,10 +23,10 @@
                libxcb-render0-dev (>= 1.6),
                libxcb-shm0-dev,
                libgl1-mesa-dev,
-               libegl1-mesa-dev [!hurd-any],
                libglib2.0-dev,
                zlib1g-dev,
                liblzo2-dev
+Build-Conflicts: libegl1-mesa
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/collab-maint/cairo.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/cairo.git
@@ -50,7 +50,6 @@
          libxcb-render0-dev (>= 1.6),
          libxcb-shm0-dev,
          libgl1-mesa-dev,
-         libegl1-mesa-dev [!hurd-any],
          libglib2.0-dev,
          ${shlibs:Depends},
          ${misc:Depends}
diff -Nru cairo-1.12.16/debian/libcairo2.symbols cairo-1.12.16/debian/libcairo2.symbols
--- cairo-1.12.16/debian/libcairo2.symbols	2013-09-17 14:37:36.000000000 +0000
+++ cairo-1.12.16/debian/libcairo2.symbols	2014-01-15 22:19:21.000000000 +0000
@@ -35,9 +35,9 @@
  cairo_device_status@Base 1.10.0
  cairo_device_to_user@Base 1.2.4
  cairo_device_to_user_distance@Base 1.2.4
- (arch=!hurd-any)cairo_egl_device_create@Base 1.12.14-5~
- (arch=!hurd-any)cairo_egl_device_get_context@Base 1.12.16
- (arch=!hurd-any)cairo_egl_device_get_display@Base 1.12.16
+# (arch=!hurd-any)cairo_egl_device_create@Base 1.12.14-5~
+# (arch=!hurd-any)cairo_egl_device_get_context@Base 1.12.16
+# (arch=!hurd-any)cairo_egl_device_get_display@Base 1.12.16
  cairo_fill@Base 1.2.4
  cairo_fill_extents@Base 1.2.4
  cairo_fill_preserve@Base 1.2.4
@@ -96,7 +96,7 @@
  cairo_get_user_data@Base 1.4.10
  cairo_gl_device_set_thread_aware@Base 1.12.14-5~
  cairo_gl_surface_create@Base 1.12.14-5~
- (arch=!hurd-any)cairo_gl_surface_create_for_egl@Base 1.12.14-5~
+# (arch=!hurd-any)cairo_gl_surface_create_for_egl@Base 1.12.14-5~
  cairo_gl_surface_create_for_texture@Base 1.12.14-5~
  cairo_gl_surface_create_for_window@Base 1.12.14-5~
  cairo_gl_surface_get_height@Base 1.12.14-5~