debian/rules | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 13a0d3cefd9e4cd4d13396354699e546e06578ee
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Thu Jul 7 14:41:12 2011 +1000
Fix r300g even harder.
Manually install it after the generic dh_install call so that it overwrites
the r300c that gets picked up from libgl1-mesa-dri.install.linux.in.
Otherwise r300_dri in libgl1-mesa-dri is always the classic driver.
diff --git a/debian/rules b/debian/rules
index d221f36..4c9b91a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -305,10 +305,10 @@ endif
# No need for this .so, libglapi is just a convenience library:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
+ dh_install -s --fail-missing
ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
dh_install -plibgl1-mesa-dri
build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
endif
- dh_install -s --fail-missing
dh_installman -s
dh_lintian -s
dh_link -s
commit 879b23a5e7450b1200e72110a8ac0858a9de3a16
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Thu Jul 7 14:37:37 2011 +1000
Fix r300g handling more.
The package is libgl1-mesa-dri, not libgl1-mesa-dri.install!
diff --git a/debian/rules b/debian/rules
index ee95d5b..d221f36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -306,7 +306,7 @@ endif
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
ifneq (,$(filter r300,$(GALLIUM_DRIVERS)))
- dh_install -plibgl1-mesa-dri.install
build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
+ dh_install -plibgl1-mesa-dri
build/dri/$(DEB_HOST_MULTIARCH)/gallium/r300_dri.so
usr/lib/${DEB_HOST_MULTIARCH}/dri
endif
dh_install -s --fail-missing
dh_installman -s
--
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/e1qeglv-0006ua...@vasks.debian.org
