debian/control, debian/libcairo2.symbols, debian/rules:

* debian/control,
  debian/libcairo2.symbols,
  debian/rules:
  + Temporarily disable the OpenGL/EGL backend, since that makes us
    block on mesa / libdrm / linux-2.6 to migrate to testing, and
    we're blocking the gobject-introspection transition, and we don't
    want to tie them. It will be re-enabled soon after we migrate.
    There shouldn't be anything depending on these symbols yet, so this
    should be safe.

4 files changed, 31 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index a3722b4..983d547 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+cairo (1.10.2-5) UNRELEASED; urgency=low
+
+  * debian/control,
+    debian/libcairo2.symbols,
+    debian/rules:
+    + Temporarily disable the OpenGL/EGL backend, since that makes us
+      block on mesa / libdrm / linux-2.6 to migrate to testing, and
+      we're blocking the gobject-introspection transition, and we don't
+      want to tie them. It will be re-enabled soon after we migrate.
+      There shouldn't be anything depending on these symbols yet, so this
+      should be safe.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 25 Mar 2011 16:46:50 +0000
+
 cairo (1.10.2-4) unstable; urgency=low
 
   * Brown paper bug release.
diff --git a/debian/control b/debian/control
index 2b00551..750d2b7 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,8 @@ Build-Depends: debhelper (>= 7),
                libxcb1-dev (>= 1.4),
                libxcb-render0-dev (>= 0.9.92),
                libxcb-shm0-dev,
-               libgl1-mesa-dev,
-               libegl1-mesa-dev [!hurd-any],
+#               libgl1-mesa-dev,
+#               libegl1-mesa-dev [!hurd-any],
                libglib2.0-dev,
                zlib1g-dev
 Standards-Version: 3.8.4
@@ -45,8 +45,8 @@ Depends: libcairo2 (= ${binary:Version}),
          libxcb1-dev (>= 1.4),
          libxcb-render0-dev (>= 0.9.92),
          libxcb-shm0-dev,
-         libgl1-mesa-dev,
-         libegl1-mesa-dev [!hurd-any],
+#         libgl1-mesa-dev,
+#         libegl1-mesa-dev [!hurd-any],
          libglib2.0-dev,
          ${shlibs:Depends},
          ${misc:Depends}
diff --git a/debian/libcairo2.symbols b/debian/libcairo2.symbols
index b37d49a..1eca412 100644
--- a/debian/libcairo2.symbols
+++ b/debian/libcairo2.symbols
@@ -28,7 +28,7 @@ libcairo.so.2 libcairo2 #MINVER#
  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.10.2-2~
+# (arch=!hurd-any)cairo_egl_device_create@Base 1.10.2-2~
  cairo_fill@Base 1.2.4
  cairo_fill_extents@Base 1.2.4
  cairo_fill_preserve@Base 1.2.4
@@ -82,17 +82,17 @@ libcairo.so.2 libcairo2 #MINVER#
  cairo_get_target@Base 1.2.4
  cairo_get_tolerance@Base 1.2.4
  cairo_get_user_data@Base 1.4.10
- cairo_gl_surface_create@Base 1.10.2-2~
- (arch=!hurd-any)cairo_gl_surface_create_for_egl@Base 1.10.2-2~
- cairo_gl_surface_create_for_texture@Base 1.10.2-2~
- cairo_gl_surface_create_for_window@Base 1.10.2-2~
- cairo_gl_surface_get_height@Base 1.10.2-2~
- cairo_gl_surface_get_width@Base 1.10.2-2~
- cairo_gl_surface_set_size@Base 1.10.2-2~
- cairo_gl_surface_swapbuffers@Base 1.10.2-2~
- cairo_glx_device_create@Base 1.10.2-2~
- cairo_glx_device_get_context@Base 1.10.2-2~
- cairo_glx_device_get_display@Base 1.10.2-2~
+# cairo_gl_surface_create@Base 1.10.2-2~
+# (arch=!hurd-any)cairo_gl_surface_create_for_egl@Base 1.10.2-2~
+# cairo_gl_surface_create_for_texture@Base 1.10.2-2~
+# cairo_gl_surface_create_for_window@Base 1.10.2-2~
+# cairo_gl_surface_get_height@Base 1.10.2-2~
+# cairo_gl_surface_get_width@Base 1.10.2-2~
+# cairo_gl_surface_set_size@Base 1.10.2-2~
+# cairo_gl_surface_swapbuffers@Base 1.10.2-2~
+# cairo_glx_device_create@Base 1.10.2-2~
+# cairo_glx_device_get_context@Base 1.10.2-2~
+# cairo_glx_device_get_display@Base 1.10.2-2~
  cairo_glyph_allocate@Base 1.7.2
  cairo_glyph_extents@Base 1.2.4
  cairo_glyph_free@Base 1.7.2
diff --git a/debian/rules b/debian/rules
index fe8bc01..04b6438 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,8 +54,7 @@ endif
 main_configure_flags += \
 $(configure_flags) \
 --enable-xlib --enable-svg \
---enable-xcb --enable-perf-utils \
---enable-gl
+--enable-xcb --enable-perf-utils # --enable-gl
 
 udeb_configure_flags += \
 $(configure_flags) \