debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cb700a7cca1f2f8ebad57dd62e54a36a5b7f14dd
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Sep 15 12:25:53 2014 +0200
bump version
diff --git a/debian/changelog b/debian/changelog
index 64e5722..09fb41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (10.3.0~rc3-2ubuntu1) UNRELEASED; urgency=low
+
+ * Merge from released debian-experimental.
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 12 Aug 2014
09:38:49 +0200
+
mesa (10.3.0~rc3-2) experimental; urgency=medium
[ Andreas Boll ]
@@ -24,15 +30,6 @@ mesa (10.3.0~rc3-1) experimental; urgency=medium
-- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 08 Sep 2014
15:50:42 +0200
-mesa (10.3~rc2-0ubuntu1) UNRELEASED; urgency=low
-
- * Merge from unreleased debian-experimental.
- * Add patch to fix ftbfs.
- - Revert build failure causer.
- - Add fixup-ppc-ftbfs.patch
-
- -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Tue, 12 Aug 2014
09:38:49 +0200
-
mesa (10.2.6-1ubuntu1) utopic; urgency=medium
* Drop 101_ubuntu_hidden_glname.patch.
diff --git a/debian/patches/fixup-ppc-ftbfs.patch
b/debian/patches/fixup-ppc-ftbfs.patch
deleted file mode 100644
index 49c2d91..0000000
--- a/debian/patches/fixup-ppc-ftbfs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/gallium/auxiliary/util/u_math.h
b/src/gallium/auxiliary/util/u_math.h
-index 25bcfb5..d703bf0 100644
---- a/src/gallium/auxiliary/util/u_math.h
-+++ b/src/gallium/auxiliary/util/u_math.h
-@@ -40,6 +40,7 @@
-
-
- #include "pipe/p_compiler.h"
-+#include "u_debug.h"
-
-
- #ifdef __cplusplus
-@@ -807,7 +808,7 @@ util_memcpy_cpu_to_le32(void * restrict dest, const void *
restrict src, size_t
- {
- #ifdef PIPE_ARCH_BIG_ENDIAN
- size_t i, e;
-- assert(n % 4 == 0);
-+ debug_assert(n % 4 == 0);
-
- for (i = 0, e = n / 4; i < e; i++) {
- uint32_t * restrict d = (uint32_t* restrict)dest;
diff --git a/debian/patches/series b/debian/patches/series
index d4befae..8a081b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
# Ubuntu patches.
egl-platform-mir.patch
i915-dont-default-to-2.1.patch
-fixup-ppc-ftbfs.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/e1xtts9-0006iq...@moszumanska.debian.org
