diff -u mesa-13.0.3/debian/changelog mesa-13.0.3/debian/changelog --- mesa-13.0.3/debian/changelog +++ mesa-13.0.3/debian/changelog @@ -1,3 +1,13 @@ +mesa (13.0.3-1ubuntu2) zesty; urgency=medium + + * rules: Drop forcing -O2 to fix ppc64el ftbfs, gcc got fixed already. + (LP: #1605796) + * control: Fix dependencies for ubuntuBSD. (LP: #1565080) + * compat,rules: Don't bump compat to 10, breaks applying patches + before autoreconf which we need for the Mir EGL platform. + + -- Timo Aaltonen Thu, 12 Jan 2017 09:49:20 +0200 + mesa (13.0.3-1ubuntu1) zesty; urgency=medium * Merge from Debian. diff -u mesa-13.0.3/debian/compat mesa-13.0.3/debian/compat --- mesa-13.0.3/debian/compat +++ mesa-13.0.3/debian/compat @@ -1 +1 @@ -10 +9 diff -u mesa-13.0.3/debian/control mesa-13.0.3/debian/control --- mesa-13.0.3/debian/control +++ mesa-13.0.3/debian/control @@ -38,8 +38,8 @@ libxcb-randr0-dev, libxcb-sync-dev, libxshmfence-dev (>= 1.1), - libmirclient-dev, - mir-client-platform-mesa-dev, + libmirclient-dev [linux-any], + mir-client-platform-mesa-dev [linux-any], python, python-mako, flex, @@ -155,7 +155,7 @@ libxcb-sync-dev, libxshmfence-dev, libx11-xcb-dev, - libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el], + libmirclient-dev [!arm64 !powerpc !ppc64 !ppc64el !kfreebsd-any !hurd-any], libwayland-dev (>= 1.2.0) [linux-any], ${misc:Depends}, Multi-Arch: same diff -u mesa-13.0.3/debian/rules mesa-13.0.3/debian/rules --- mesa-13.0.3/debian/rules +++ mesa-13.0.3/debian/rules @@ -12,7 +12,7 @@ ifeq (,$(filter $(DEB_HOST_ARCH), armhf)) buildflags = \ - $(shell DEB_CFLAGS_MAINT_APPEND="-Wall -O2" DEB_CXXFLAGS_MAINT_APPEND="-Wall -O2" dpkg-buildflags --export=configure) + $(shell DEB_CFLAGS_MAINT_APPEND=-Wall DEB_CXXFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure) else # Workaround for a variant of LP: #725126 buildflags = \ @@ -231,7 +231,8 @@ dh_makeshlibs -a -- -c4 %: - dh $@ --with quilt \ + dh $@ --with quilt,autoreconf \ + --parallel \ --builddirectory=build/ # For maintainer use only, generate a tarball: