diff options
| author | Cyril Brulebois <kibi@debian.org> | 2011-07-02 11:51:02 +0200 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2011-07-02 11:51:02 +0200 |
| commit | 64c731a92b3ea749be1a59afd77bb3171b3cca2e (patch) | |
| tree | 5e1175f3b858e5869776eaa327d1b1671f58ad64 | |
| parent | 84f2ef116edb1919a68e9d0cd80e9b6ca04d5d74 (diff) | |
Drop 20-workaround-36986.diff, fixed upstream.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/20-workaround-36986.diff | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index 986076ce2..8070b17f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xorg-server (2:1.10.2.902-1) UNRELEASED; urgency=low * New upstream release (1.10.3 rc2): - DIX: Set backgroundState correctly for root window (Closes: #632134). + * Drop 20-workaround-36986.diff, fixed upstream. -- Cyril Brulebois <kibi@debian.org> Sat, 02 Jul 2011 11:34:25 +0200 diff --git a/debian/patches/20-workaround-36986.diff b/debian/patches/20-workaround-36986.diff deleted file mode 100644 index 24b3cb9c4..000000000 --- a/debian/patches/20-workaround-36986.diff +++ /dev/null @@ -1,14 +0,0 @@ -Workaround fdo#36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986> ---- a/test/input.c -+++ b/test/input.c -@@ -1213,8 +1213,10 @@ - - g_assert(v); - g_assert(v->numAxes == num_axes); -+#if 0 - g_assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0); - g_assert(((void*)v->axes - (void*)v) % sizeof(double) == 0); -+#endif - num_axes ++; - } - diff --git a/debian/patches/series b/debian/patches/series index a9c30f654..2e0f947ba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ 07-xfree86-fix-build-with-xv-disabled.diff #13_debian_add_xkbpath_env_variable.diff 15-nouveau.diff -20-workaround-36986.diff |