Control: tags 909173 + patch
Control: tags 909173 + pending

I've prepared an NMU for libepoxy (versioned as 1.5.2-0.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should alter that delay.

The changes are also available here:
https://salsa.debian.org/smcv/libepoxy
or in the form of a merge request:
https://salsa.debian.org/debian/libepoxy/merge_requests/1

I took the opportunity to fix the build-time tests on Debian's version
of xvfb-run, on at least amd64. I don't know whether this will make the
tests pass on all architectures, so I've left it ignoring test failures
on non-Ubuntu systems for now; but if buildd logs indicate that the tests
passed on all release architectures, it would be good to stop ignoring
test failures (i.e. use the Ubuntu case) for all vendors.

    smcv
diffstat for libepoxy-1.5.2 libepoxy-1.5.2

 changelog |   10 ++++++++++
 control   |    5 ++++-
 rules     |    4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff -Nru libepoxy-1.5.2/debian/changelog libepoxy-1.5.2/debian/changelog
--- libepoxy-1.5.2/debian/changelog	2018-09-18 20:09:26.000000000 +0100
+++ libepoxy-1.5.2/debian/changelog	2018-09-19 10:39:51.000000000 +0100
@@ -1,3 +1,13 @@
+libepoxy (1.5.2-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * libepoxy-dev Depends on libgl1-mesa-dev and libegl1-mesa-dev.
+    Those packages provide gl.pc and egl.pc, which are depended on by
+    epoxy.pc since 1.5.2 (Closes: #909173)
+  * Work around #874077 by creating an Xvfb screen where GLX can work
+
+ -- Simon McVittie <s...@debian.org>  Wed, 19 Sep 2018 10:39:51 +0100
+
 libepoxy (1.5.2-0.1) unstable; urgency=medium
 
   * Non-maintainer upload
diff -Nru libepoxy-1.5.2/debian/control libepoxy-1.5.2/debian/control
--- libepoxy-1.5.2/debian/control	2018-09-18 20:09:26.000000000 +0100
+++ libepoxy-1.5.2/debian/control	2018-09-19 10:39:51.000000000 +0100
@@ -21,7 +21,10 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libepoxy0 (= ${binary:Version}), ${misc:Depends}
+Depends: libegl1-mesa-dev,
+         libepoxy0 (= ${binary:Version}),
+         libgl1-mesa-dev,
+         ${misc:Depends}
 Description: OpenGL function pointer management library- development
  It hides the complexity of dlopen(), dlsym(), glXGetProcAddress(),
  eglGetProcAddress(), etc. from the app developer, with very little
diff -Nru libepoxy-1.5.2/debian/rules libepoxy-1.5.2/debian/rules
--- libepoxy-1.5.2/debian/rules	2018-09-18 20:09:26.000000000 +0100
+++ libepoxy-1.5.2/debian/rules	2018-09-19 10:39:51.000000000 +0100
@@ -7,9 +7,9 @@
 # See https://bugs.debian.org/874077
 override_dh_auto_test:
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
-	xvfb-run dh_auto_test
+	xvfb-run -a -s "-screen 0 1024x768x24" dh_auto_test
 else
-	-xvfb-run dh_auto_test
+	-xvfb-run -a -s "-screen 0 1024x768x24" dh_auto_test
 endif
 
 # No symbols for udebs, specify the highest version from symbols file:

Reply via email to