debian/changelog | 9 ++++++++- debian/rules | 10 +++------- 2 files changed, 11 insertions(+), 8 deletions(-)
New commits: commit 9a6d637545f073051ef8ae09cfe7c44b7a582757 Author: Christopher James Halse Rogers <[email protected]> Date: Thu May 26 12:10:29 2011 +1000 Really build libdrm-intel everywhere. That'll teach me for not having an armel oneiric chroot! diff --git a/debian/changelog b/debian/changelog index 4b9d882..c3169ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdrm (2.4.25-2ubuntu2) oneiric; urgency=low + + * debian/rules: + - Really build libdrm-intel everywhere. Fixes arm/powerpc FTBFS. + + -- Christopher James Halse Rogers <[email protected]> Thu, 26 May 2011 12:09:35 +1000 + libdrm (2.4.25-2ubuntu1) oneiric; urgency=low * Merge from Debian unstable. remaining Ubuntu changes: diff --git a/debian/rules b/debian/rules index a54481a..b1260fe 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,9 @@ ifeq (linux, $(DEB_HOST_ARCH_OS)) NOUVEAU = yes confflags += --enable-radeon RADEON = yes +# Plymouth wants libdrm-intel1, even on architectures where it's guaranteed +# to be useless. Satisfy it's depraved yearnings. + INTEL = yes else confflags += --disable-udev confflags += --disable-libkms @@ -42,13 +45,6 @@ else RADEON = no endif -# Intel is only on x86: -ifneq (,$(filter amd64 i386,$(DEB_HOST_ARCH_CPU))) -ifneq (,$(filter linux kfreebsd,$(DEB_HOST_ARCH_OS))) - INTEL = yes -endif -endif - ifeq ($(INTEL), yes) confflags += --enable-intel else commit 417aa96bff7745c09e1fc23931c9e71bf4eca026 Author: Christopher James Halse Rogers <[email protected]> Date: Thu May 26 09:42:37 2011 +1000 Upload to oneiric diff --git a/debian/changelog b/debian/changelog index 721894c..4b9d882 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libdrm (2.4.25-2ubuntu1) UNRELEASED; urgency=low +libdrm (2.4.25-2ubuntu1) oneiric; urgency=low * Merge from Debian unstable. remaining Ubuntu changes: - debian/rules -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
