[PATCH RFC 4/7] Fix path for those special DRI files
This should take into account multi-arch removal and fix the install
paths.
Based on Cyril Brulebois's mesa 7.10 backport for squeeze.
---
debian/changelog | 2 ++
debian/libgl1-mesa-dri.install.in | 2 +-
debian/libgl1-mesa-dri.install.linux.in | 10 +++++-----
debian/rules | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f8963a7..811eb6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mesa (8.0.4~bpo-1+1) UNRELEASED; urgency=low
- Remove DEB_HOST_MULTIARCH from debian/rules.
- Keep the .install.in → .install generation (to ease further
updates), making it just delete “/$(DEB_HOST_MULTIARCH)”.
+ - Replace DEB_HOST_MULTIARCH with lib for the DRI-related entries,
+ those are special… (debian/libgl1-mesa-dri.install*.in)
- Remove Multi-Arch and Pre-Depends fields.
- Revert debhelper version bump accordingly.
* Support upgrades from squeeze and to wheezy:
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index 4a66df4..83a24d8 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,2 +1,2 @@
# If this part gets modified, make sure to update .install.$os as well:
-build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+build/dri/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in
index ee1acd8..cf1000e 100644
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ b/debian/libgl1-mesa-dri.install.linux.in
@@ -1,8 +1,8 @@
# Keep this part in sync with libgl1-mesa-dri.install:
-build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+build/dri/lib/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
# This part is Linux-specific:
-build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/vmwgfx_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+build/dri/lib/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+build/dri/lib/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+build/dri/lib/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+build/dri/lib/gallium/vmwgfx_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/rules b/debian/rules
index 69ec940..3106764 100755
--- a/debian/rules
+++ b/debian/rules
@@ -304,7 +304,7 @@ binary-arch: install
# If the llvmpipe driver was built, copy it to the package dir
ifneq (,$(filter swrast,$(GALLIUM_DRIVERS)))
- dh_install -plibgl1-mesa-dri build/dri/gallium/swrast_dri.so \
+ dh_install -plibgl1-mesa-dri build/dri/lib/gallium/swrast_dri.so \
usr/lib/dri
endif
--
1.7.10.3
Reply to: