Revert disabling the OpenGL/EGL backend temporarily.

This reverts commit 0dc596c70f0ce207d1af63c8e09504b1dfe69f3a.

Conflicts:

	debian/changelog

4 files changed, 23 insertions, 17 deletions

diff --git a/debian/changelog b/debian/changelog
index df333d3..b40d104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ cairo (1.11.2-1) UNRELEASED; urgency=low
       anyway, so overriding temporarily is OK.
   * debian/rules:
     + Call dh_lintian -i/-s accordingly.
+  * debian/control,
+    debian/libcairo2.symbols,
+    debian/rules:
+    + Enable the OpenGL/EGL backend again (temporarily disabled in
+      1.10.2-5).
 
  -- Cyril Brulebois <kibi@debian.org>  Sun, 19 Jun 2011 22:42:20 +0200
 
diff --git a/debian/control b/debian/control
index 00a87a5..e25974d 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 1eca412..b37d49a 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 df8d0ab..9daa46b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,8 @@ 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) \