libdrm: Changes to 'ubuntu'
debian/changelog | 6 ++++++
debian/libdrm-dev.links | 5 -----
debian/libdrm-dev.links.in | 5 +++++
debian/rules | 5 +++--
4 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit d67ab9b5773c590cbb877c7404a3ba94e1335ae9
Author: Steve Langasek <steve.langasek@linaro.org>
Date: Sat Mar 19 21:00:30 2011 -0700
Fix up libdrm-dev symlinks for multiarch.
diff --git a/debian/changelog b/debian/changelog
index 45825fb..319c05a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdrm (2.4.23-1ubuntu5) UNRELEASED; urgency=low
+
+ * Fix up libdrm-dev symlinks for multiarch.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Sat, 19 Mar 2011 20:59:37 -0700
+
libdrm (2.4.23-1ubuntu4) natty; urgency=low
* Build for multiarch.
diff --git a/debian/libdrm-dev.links b/debian/libdrm-dev.links
deleted file mode 100644
index b104b83..0000000
--- a/debian/libdrm-dev.links
+++ /dev/null
@@ -1,5 +0,0 @@
-/lib/libdrm.so.2 /usr/lib/libdrm.so
-/lib/libdrm_intel.so.1 /usr/lib/libdrm_intel.so
-/lib/libdrm_nouveau.so.1 /usr/lib/libdrm_nouveau.so
-/lib/libdrm_radeon.so.1 /usr/lib/libdrm_radeon.so
-/lib/libkms.so.1 /usr/lib/libkms.so
diff --git a/debian/libdrm-dev.links.in b/debian/libdrm-dev.links.in
new file mode 100644
index 0000000..f3b4f97
--- /dev/null
+++ b/debian/libdrm-dev.links.in
@@ -0,0 +1,5 @@
+/lib/${DEB_HOST_MULTIARCH}/libdrm.so.2 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm.so
+/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm_intel.so
+/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm_nouveau.so
+/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libdrm_radeon.so
+/lib/${DEB_HOST_MULTIARCH}/libkms.so.1 /usr/lib/${DEB_HOST_MULTIARCH}/libkms.so
diff --git a/debian/rules b/debian/rules
index 80a1435..afa0b6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,7 +103,7 @@ clean: xsfclean
rm -f libdrm.pc libdrm/config.h.in
rm -f debian/libdrm-intel1.install debian/libdrm-nouveau1a.install \
debian/libdrm-radeon1.install debian/libdrm2.install \
- debian/libkms1.install
+ debian/libkms1.install debian/libdrm-dev.links
dh_clean
@@ -112,7 +112,8 @@ install: build
dh_testroot
dh_prep
for file in libdrm-intel1.install libdrm-nouveau1a.install \
- libdrm-radeon1.install libdrm2.install libkms1.install; \
+ libdrm-radeon1.install libdrm2.install libkms1.install \
+ libdrm-dev.links; \
do \
sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
debian/$${file}.in > debian/$$file; \
Reply to: