diff -Nru libepoxy-1.2/debian/changelog libepoxy-1.2/debian/changelog
--- libepoxy-1.2/debian/changelog	2014-05-14 00:57:55.000000000 +0000
+++ libepoxy-1.2/debian/changelog	2015-05-06 04:38:17.000000000 +0000
@@ -1,3 +1,18 @@
+libepoxy (1.2-1+ppa2) vivid; urgency=medium
+
+  * debian/patches/fix-null-extensions.patch:
+    - Workaround glGetStringi(GL_EXTENSIONS, i) returning NULL for some unknown
+      reason
+
+ -- Robert Ancell <robert.ancell@canonical.com>  Wed, 06 May 2015 16:35:34 +1200
+
+libepoxy (1.2-1+ppa1) vivid; urgency=low
+
+  * Add support for DEP-8 tests.
+  * Fix eglCreateSyncKHR.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com>  Wed, 10 Sep 2014 12:46:54 +0200
+
 libepoxy (1.2-1) unstable; urgency=low
 
   * Upgrade to upstream v1.2 release.
diff -Nru libepoxy-1.2/debian/control libepoxy-1.2/debian/control
--- libepoxy-1.2/debian/control	2014-05-14 00:57:55.000000000 +0000
+++ libepoxy-1.2/debian/control	2015-01-07 15:35:33.000000000 +0000
@@ -1,6 +1,7 @@
 Source: libepoxy
 Priority: optional
-Maintainer: Eric Anholt <eric@anholt.net>
+Maintainer: Ubuntu Developers <ubuntu-devel@ubuntu.com>
+#Maintainer: Eric Anholt <eric@anholt.net>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                autotools-dev,
diff -Nru libepoxy-1.2/debian/libepoxy0.symbols libepoxy-1.2/debian/libepoxy0.symbols
--- libepoxy-1.2/debian/libepoxy0.symbols	2014-05-14 00:57:55.000000000 +0000
+++ libepoxy-1.2/debian/libepoxy0.symbols	2014-12-11 12:47:47.000000000 +0000
@@ -25,7 +25,6 @@
  epoxy_eglCreateStreamProducerSurfaceKHR@Base 1.0
  epoxy_eglCreateStreamSyncNV@Base 1.0
  epoxy_eglCreateSync64KHR@Base 1.0
- epoxy_eglCreateSync@Base 1.2
  epoxy_eglCreateSyncKHR@Base 1.0
  epoxy_eglCreateWindowSurface@Base 1.0
  epoxy_eglDestroyContext@Base 1.0
diff -Nru libepoxy-1.2/debian/patches/fix-egl-khr-fence-sync.patch libepoxy-1.2/debian/patches/fix-egl-khr-fence-sync.patch
--- libepoxy-1.2/debian/patches/fix-egl-khr-fence-sync.patch	1970-01-01 00:00:00.000000000 +0000
+++ libepoxy-1.2/debian/patches/fix-egl-khr-fence-sync.patch	2015-01-07 15:25:23.000000000 +0000
@@ -0,0 +1,35 @@
+Description: Fix EGL_KHR_fence_sync
+
+Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- libepoxy-1.2.orig/registry/egl.xml
++++ libepoxy-1.2/registry/egl.xml
+@@ -1624,10 +1624,14 @@
+         </extension>
+         <extension name="EGL_KHR_fence_sync" protect="KHRONOS_SUPPORT_INT64" supported="egl">
+             <require>
+-                <!-- @ Most interfaces defined by EGL_KHR_reusable sync -->
++                <!-- @ Most interfaces also defined by EGL_KHR_reusable sync -->
+                 <enum name="EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR"/>
+                 <enum name="EGL_SYNC_CONDITION_KHR"/>
+                 <enum name="EGL_SYNC_FENCE_KHR"/>
++                <command name="eglCreateSyncKHR"/>
++                <command name="eglDestroySyncKHR"/>
++                <command name="eglClientWaitSyncKHR"/>
++                <command name="eglGetSyncAttribKHR"/>
+             </require>
+         </extension>
+         <extension name="EGL_KHR_get_all_proc_addresses" supported="egl"/>
diff -Nru libepoxy-1.2/debian/patches/fixup-null-fail.patch libepoxy-1.2/debian/patches/fixup-null-fail.patch
--- libepoxy-1.2/debian/patches/fixup-null-fail.patch	1970-01-01 00:00:00.000000000 +0000
+++ libepoxy-1.2/debian/patches/fixup-null-fail.patch	2014-09-10 11:07:26.000000000 +0000
@@ -0,0 +1,19 @@
+--- a/test/egl_without_glx.c
++++ b/test/egl_without_glx.c
+@@ -54,13 +54,13 @@
+ {
+     void * (*dlopen_unwrapped)(const char *filename, int flag);
+ 
+-    if (!strcmp(filename, "libGL.so.1"))
++    if (filename && !strcmp(filename, "libGL.so.1"))
+         return NULL;
+ #if GLES_VERSION == 2
+-    if (!strcmp(filename, "libGLESv1_CM.so.1"))
++    if (filename && !strcmp(filename, "libGLESv1_CM.so.1"))
+         return NULL;
+ #else
+-    if (!strcmp(filename, "libGLESv2.so.2"))
++    if (filename && !strcmp(filename, "libGLESv2.so.2"))
+         return NULL;
+ #endif
+ 
diff -Nru libepoxy-1.2/debian/patches/series libepoxy-1.2/debian/patches/series
--- libepoxy-1.2/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ libepoxy-1.2/debian/patches/series	2015-05-06 04:37:58.000000000 +0000
@@ -0,0 +1,3 @@
+fixup-null-fail.patch
+fix-egl-khr-fence-sync.patch
+workaround-null-extensions.patch
diff -Nru libepoxy-1.2/debian/patches/workaround-null-extensions.patch libepoxy-1.2/debian/patches/workaround-null-extensions.patch
--- libepoxy-1.2/debian/patches/workaround-null-extensions.patch	1970-01-01 00:00:00.000000000 +0000
+++ libepoxy-1.2/debian/patches/workaround-null-extensions.patch	2015-05-06 04:37:41.000000000 +0000
@@ -0,0 +1,13 @@
+Index: libepoxy-1.2/src/dispatch_common.c
+===================================================================
+--- libepoxy-1.2.orig/src/dispatch_common.c
++++ libepoxy-1.2/src/dispatch_common.c
+@@ -312,7 +312,7 @@ epoxy_extension_in_string(const char *ex
+ static bool
+ epoxy_internal_has_gl_extension(const char *ext, bool invalid_op_mode)
+ {
+-    if (epoxy_gl_version() < 30) {
++    if (1) {//epoxy_gl_version() < 30) {
+         const char *exts = (const char *)glGetString(GL_EXTENSIONS);
+         if (!exts)
+             return invalid_op_mode;
diff -Nru libepoxy-1.2/debian/tests/control libepoxy-1.2/debian/tests/control
--- libepoxy-1.2/debian/tests/control	1970-01-01 00:00:00.000000000 +0000
+++ libepoxy-1.2/debian/tests/control	2014-09-10 10:51:57.000000000 +0000
@@ -0,0 +1,4 @@
+# These tests require support for
+
+Test-Command: xvfb-run make check
+Restrictions: build-needed