diff -Nru xorg-gtest-0.7.1/debian/changelog xorg-gtest-0.7.1/debian/changelog
--- xorg-gtest-0.7.1/debian/changelog	2019-02-04 11:17:12.000000000 +0000
+++ xorg-gtest-0.7.1/debian/changelog	2019-02-04 20:09:38.000000000 +0000
@@ -1,3 +1,11 @@
+xorg-gtest (0.7.1-5ubuntu1) disco; urgency=medium
+
+  * Disable 0005-Properly-escape-the-D-string-defines.patch until upstream
+    issue https://gitlab.freedesktop.org/xorg/test/xorg-gtest/issues/1 is
+    resolved, to make compiz buildable again.
+
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Mon, 04 Feb 2019 23:09:38 +0300
+
 xorg-gtest (0.7.1-5) unstable; urgency=medium
 
   * debian/rules:
diff -Nru xorg-gtest-0.7.1/debian/control xorg-gtest-0.7.1/debian/control
--- xorg-gtest-0.7.1/debian/control	2019-02-04 11:16:42.000000000 +0000
+++ xorg-gtest-0.7.1/debian/control	2019-02-04 20:09:38.000000000 +0000
@@ -1,6 +1,7 @@
 Source: xorg-gtest
 Priority: optional
-Maintainer: Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
 Uploaders:
  Mike Gabriel <sunweaver@debian.org>
 Build-Depends: automake,
diff -Nru xorg-gtest-0.7.1/debian/patches/series xorg-gtest-0.7.1/debian/patches/series
--- xorg-gtest-0.7.1/debian/patches/series	2018-08-22 10:57:24.000000000 +0000
+++ xorg-gtest-0.7.1/debian/patches/series	2019-02-04 20:09:37.000000000 +0000
@@ -5,4 +5,3 @@
 0002-xserver-improve-error-code-reporting.patch
 0003-doc-update-doxygen-file.patch
 0004-doc-remove-DOT_FONTNAME-from-doxygen.in.patch
-0005-Properly-escape-the-D-string-defines.patch