debian/changelog | 11 +++++++++++
debian/control | 4 +++-
2 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit d66787a76df64fa88da14e404af7ed3861811357
Author: Maarten Lankhorst <maarten.lankho...@canonical.com>
Date: Mon Nov 11 13:02:28 2013 +0100
merge sru from saucy-proposed
diff --git a/debian/changelog b/debian/changelog
index 004df80..9aa4884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libdrm (2.4.46-1ubuntu1) saucy-proposed; urgency=low
+
+ [ Colin Watson ]
+ * Declare libdrm-dev Multi-Arch: same.
+
+ [ Maarten Lankhorst ]
+ * Cherry-pick upstream patch to fix relocations for all cards <nv50.
+ (LP: #1247607)
+
+ -- Maarten Lankhorst <maarten.lankho...@ubuntu.com> Mon, 11 Nov 2013
13:02:28 +0100
+
libdrm (2.4.46-1) unstable; urgency=low
[ Sven Joachim ]
diff --git a/debian/control b/debian/control
index 6729001..b36f07c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
Source: libdrm
Priority: optional
-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends:
debhelper (>= 9),
@@ -30,6 +31,7 @@ Depends:
libdrm-omap1 (= ${binary:Version}) [any-arm],
libkms1 (= ${binary:Version}) [linux-any],
${misc:Depends},
+Multi-Arch: same
Replaces:
linux-libc-dev (<< 2.6.32-10)
Description: Userspace interface to kernel DRM services -- development files
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1vlewp-0001gc...@moszumanska.debian.org
