debian/changelog                       |    2 ++
 debian/libgl1-mesa-dri.install.hurd.in |    2 ++
 debian/libgl1-mesa-dri.install.in      |    2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit ab11d0ea2e7b1b016881881d1fe8abb7b235da1c
Author: Andreas Boll <andreas.boll....@gmail.com>
Date:   Wed Jun 5 19:59:05 2013 +0200

    debian: Fix build regression on !hurd
    
    Fix it with libgl1-mesa-dri.install.hurd.in, where we don't install
    drirc.
    
    Regression introduced with 27dfc3f8c417856ac5c1f96c5ea244d396bd3617
    
    Fixes this build error:
    dh_install: dri/etc/drirc exists in debian/tmp but is not installed to
    anywhere

diff --git a/debian/changelog b/debian/changelog
index f9a41ba..95457ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mesa (9.1.3-3) UNRELEASED; urgency=low
 
   * debian/not-installed: Remove /etc/drirc, it's shipped since 8.0.5-1.
     Fixes build on hurd.
+  * debian: Fix build regression on !hurd.
+    Fix it with libgl1-mesa-dri.install.hurd.in, where we don't install drirc.
 
  -- Andreas Boll <andreas.boll....@gmail.com>  Tue, 04 Jun 2013 11:36:30 +0200
 
diff --git a/debian/libgl1-mesa-dri.install.hurd.in 
b/debian/libgl1-mesa-dri.install.hurd.in
new file mode 100644
index 0000000..5eda011
--- /dev/null
+++ b/debian/libgl1-mesa-dri.install.hurd.in
@@ -0,0 +1,2 @@
+dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so 
usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* 
usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libgl1-mesa-dri.install.in 
b/debian/libgl1-mesa-dri.install.in
index eb32c2f..83aee85 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,4 +1,4 @@
-build/dri/src/mesa/drivers/dri/common/drirc etc
+dri/etc/drirc etc
 dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so 
usr/lib/${DEB_HOST_MULTIARCH}/dri
 dri/usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so 
usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe
 dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* 
usr/lib/${DEB_HOST_MULTIARCH}/


-- 
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/e1ukicw-0001dc...@vasks.debian.org

Reply via email to