debian/changelog | 2 ++ debian/libegl1-mesa-dev.install | 5 +++++ debian/libegl1-mesa-dev.install.in | 5 ----- debian/libegl1-mesa-dev.install.linux | 9 +++++++++ debian/libegl1-mesa-dev.install.linux.in | 9 --------- debian/libegl1-mesa.install | 1 + debian/libegl1-mesa.install.in | 1 - debian/libgbm-dev.install | 3 +++ debian/libgbm-dev.install.in | 3 --- debian/libgbm1.install | 1 + debian/libgbm1.install.in | 1 - debian/libgl1-mesa-dev.install | 2 ++ debian/libgl1-mesa-dev.install.in | 2 -- debian/libgl1-mesa-dri.install | 1 + debian/libgl1-mesa-dri.install.in | 1 - debian/libgl1-mesa-glx.install | 1 + debian/libgl1-mesa-glx.install.in | 1 - debian/libglapi-mesa.install | 1 + debian/libglapi-mesa.install.in | 1 - debian/libgles1-mesa-dev.install | 3 +++ debian/libgles1-mesa-dev.install.in | 3 --- debian/libgles1-mesa.install | 1 + debian/libgles1-mesa.install.in | 1 - debian/libgles2-mesa-dev.install | 4 ++++ debian/libgles2-mesa-dev.install.in | 4 ---- debian/libgles2-mesa.install | 1 + debian/libgles2-mesa.install.in | 1 - debian/libosmesa6-dev.install | 3 +++ debian/libosmesa6-dev.install.in | 3 --- debian/libosmesa6.install | 1 + debian/libosmesa6.install.in | 1 - debian/libwayland-egl1-mesa.install | 3 +++ debian/libwayland-egl1-mesa.install.in | 3 --- debian/libxatracker-dev.install | 5 +++++ debian/libxatracker-dev.install.in | 5 ----- debian/libxatracker2.install | 1 + debian/libxatracker2.install.in | 1 - debian/mesa-common-dev.install | 9 +++++++++ debian/mesa-common-dev.install.in | 9 --------- debian/mesa-opencl-icd.install | 3 +++ debian/mesa-opencl-icd.install.in | 3 --- debian/rules | 8 -------- 42 files changed, 60 insertions(+), 66 deletions(-)
New commits: commit 218807ecb09de3fc3261762a581ac790f397ed66 Author: Timo Aaltonen <[email protected]> Date: Wed Feb 24 12:55:25 2016 +0200 rules, install: Move *install.in to *install and use a wildcard to install files behind multiarch path. diff --git a/debian/changelog b/debian/changelog index c03a20c..3c0dd58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ mesa (11.2.0~rc1-1) UNRELEASED; urgency=medium everything in one pass nowadays. * control: Bump libdrm-dev build-dep to 2.4.67 for freedreno. * rules: Migrate to dh. + * rules, install: Move *install.in to *install and use a wildcard to + install files behind multiarch path. -- Timo Aaltonen <[email protected]> Tue, 23 Feb 2016 09:48:38 +0200 diff --git a/debian/libegl1-mesa-dev.install b/debian/libegl1-mesa-dev.install new file mode 100644 index 0000000..130aa2b --- /dev/null +++ b/debian/libegl1-mesa-dev.install @@ -0,0 +1,5 @@ +# This file gets tweaked in an os-specific fashion (see libegl1-mesa-dev.install.linux.in) +usr/lib/*/libEGL.so +usr/include/EGL +usr/include/KHR +usr/lib/*/pkgconfig/egl.pc diff --git a/debian/libegl1-mesa-dev.install.in b/debian/libegl1-mesa-dev.install.in deleted file mode 100644 index 46c4b30..0000000 --- a/debian/libegl1-mesa-dev.install.in +++ /dev/null @@ -1,5 +0,0 @@ -# This file gets tweaked in an os-specific fashion (see libegl1-mesa-dev.install.linux.in) -usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so -usr/include/EGL -usr/include/KHR -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc diff --git a/debian/libegl1-mesa-dev.install.linux b/debian/libegl1-mesa-dev.install.linux new file mode 100644 index 0000000..4b9bdef --- /dev/null +++ b/debian/libegl1-mesa-dev.install.linux @@ -0,0 +1,9 @@ +# OS-independent part (from libegl1-mesa-dev.install): +usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so +usr/include/EGL +usr/include/KHR +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc + +# Wayland support, only on Linux: +usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc diff --git a/debian/libegl1-mesa-dev.install.linux.in b/debian/libegl1-mesa-dev.install.linux.in deleted file mode 100644 index da59843..0000000 --- a/debian/libegl1-mesa-dev.install.linux.in +++ /dev/null @@ -1,9 +0,0 @@ -# OS-independent part (from libegl1-mesa-dev.install.in): -usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so -usr/include/EGL -usr/include/KHR -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/egl.pc - -# Wayland support, only on Linux: -usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/wayland-egl.pc diff --git a/debian/libegl1-mesa.install b/debian/libegl1-mesa.install new file mode 100644 index 0000000..1df9b19 --- /dev/null +++ b/debian/libegl1-mesa.install @@ -0,0 +1 @@ +usr/lib/*/libEGL.so.1* diff --git a/debian/libegl1-mesa.install.in b/debian/libegl1-mesa.install.in deleted file mode 100644 index 685a0fc..0000000 --- a/debian/libegl1-mesa.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libEGL.so.1* diff --git a/debian/libgbm-dev.install b/debian/libgbm-dev.install new file mode 100644 index 0000000..0b6e2d1 --- /dev/null +++ b/debian/libgbm-dev.install @@ -0,0 +1,3 @@ +usr/lib/*/libgbm.so +usr/lib/*/pkgconfig/gbm.pc +usr/include/gbm.h diff --git a/debian/libgbm-dev.install.in b/debian/libgbm-dev.install.in deleted file mode 100644 index ff5554f..0000000 --- a/debian/libgbm-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gbm.pc -usr/include/gbm.h diff --git a/debian/libgbm1.install b/debian/libgbm1.install new file mode 100644 index 0000000..4854230 --- /dev/null +++ b/debian/libgbm1.install @@ -0,0 +1 @@ +usr/lib/*/libgbm.so.1* diff --git a/debian/libgbm1.install.in b/debian/libgbm1.install.in deleted file mode 100644 index 21647b3..0000000 --- a/debian/libgbm1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libgbm.so.1* diff --git a/debian/libgl1-mesa-dev.install b/debian/libgl1-mesa-dev.install new file mode 100644 index 0000000..a8c371e --- /dev/null +++ b/debian/libgl1-mesa-dev.install @@ -0,0 +1,2 @@ +usr/lib/*/libGL.so +usr/lib/*/pkgconfig/gl.pc diff --git a/debian/libgl1-mesa-dev.install.in b/debian/libgl1-mesa-dev.install.in deleted file mode 100644 index d915191..0000000 --- a/debian/libgl1-mesa-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libGL.so -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc diff --git a/debian/libgl1-mesa-dri.install b/debian/libgl1-mesa-dri.install new file mode 100644 index 0000000..88e155a --- /dev/null +++ b/debian/libgl1-mesa-dri.install @@ -0,0 +1 @@ +etc/drirc diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in deleted file mode 100644 index 88e155a..0000000 --- a/debian/libgl1-mesa-dri.install.in +++ /dev/null @@ -1 +0,0 @@ -etc/drirc diff --git a/debian/libgl1-mesa-glx.install b/debian/libgl1-mesa-glx.install new file mode 100644 index 0000000..6fc3110 --- /dev/null +++ b/debian/libgl1-mesa-glx.install @@ -0,0 +1 @@ +usr/lib/*/libGL.so.* diff --git a/debian/libgl1-mesa-glx.install.in b/debian/libgl1-mesa-glx.install.in deleted file mode 100644 index d333e7b..0000000 --- a/debian/libgl1-mesa-glx.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libGL.so.* diff --git a/debian/libglapi-mesa.install b/debian/libglapi-mesa.install new file mode 100644 index 0000000..e93d0c3 --- /dev/null +++ b/debian/libglapi-mesa.install @@ -0,0 +1 @@ +usr/lib/*/libglapi.so.0* diff --git a/debian/libglapi-mesa.install.in b/debian/libglapi-mesa.install.in deleted file mode 100644 index 4b4c352..0000000 --- a/debian/libglapi-mesa.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so.0* diff --git a/debian/libgles1-mesa-dev.install b/debian/libgles1-mesa-dev.install new file mode 100644 index 0000000..bfd9652 --- /dev/null +++ b/debian/libgles1-mesa-dev.install @@ -0,0 +1,3 @@ +usr/lib/*/libGLESv1_CM.so +usr/include/GLES +usr/lib/*/pkgconfig/glesv1_cm.pc diff --git a/debian/libgles1-mesa-dev.install.in b/debian/libgles1-mesa-dev.install.in deleted file mode 100644 index 045c99d..0000000 --- a/debian/libgles1-mesa-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so -usr/include/GLES -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv1_cm.pc diff --git a/debian/libgles1-mesa.install b/debian/libgles1-mesa.install new file mode 100644 index 0000000..705bd19 --- /dev/null +++ b/debian/libgles1-mesa.install @@ -0,0 +1 @@ +usr/lib/*/libGLESv1_CM.so.1* diff --git a/debian/libgles1-mesa.install.in b/debian/libgles1-mesa.install.in deleted file mode 100644 index d38774b..0000000 --- a/debian/libgles1-mesa.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libGLESv1_CM.so.1* diff --git a/debian/libgles2-mesa-dev.install b/debian/libgles2-mesa-dev.install new file mode 100644 index 0000000..2c0b837 --- /dev/null +++ b/debian/libgles2-mesa-dev.install @@ -0,0 +1,4 @@ +usr/lib/*/libGLESv2.so +usr/include/GLES2 +usr/include/GLES3 +usr/lib/*/pkgconfig/glesv2.pc diff --git a/debian/libgles2-mesa-dev.install.in b/debian/libgles2-mesa-dev.install.in deleted file mode 100644 index acb5b84..0000000 --- a/debian/libgles2-mesa-dev.install.in +++ /dev/null @@ -1,4 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so -usr/include/GLES2 -usr/include/GLES3 -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/glesv2.pc diff --git a/debian/libgles2-mesa.install b/debian/libgles2-mesa.install new file mode 100644 index 0000000..a6891c6 --- /dev/null +++ b/debian/libgles2-mesa.install @@ -0,0 +1 @@ +usr/lib/*/libGLESv2.so.2* diff --git a/debian/libgles2-mesa.install.in b/debian/libgles2-mesa.install.in deleted file mode 100644 index 0d23b83..0000000 --- a/debian/libgles2-mesa.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libGLESv2.so.2* diff --git a/debian/libosmesa6-dev.install b/debian/libosmesa6-dev.install new file mode 100644 index 0000000..30ac369 --- /dev/null +++ b/debian/libosmesa6-dev.install @@ -0,0 +1,3 @@ +usr/include/GL/osmesa.h +usr/lib/*/libOSMesa.so +usr/lib/*/pkgconfig/osmesa.pc diff --git a/debian/libosmesa6-dev.install.in b/debian/libosmesa6-dev.install.in deleted file mode 100644 index bd7a488..0000000 --- a/debian/libosmesa6-dev.install.in +++ /dev/null @@ -1,3 +0,0 @@ -usr/include/GL/osmesa.h -usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/osmesa.pc diff --git a/debian/libosmesa6.install b/debian/libosmesa6.install new file mode 100644 index 0000000..e1986f0 --- /dev/null +++ b/debian/libosmesa6.install @@ -0,0 +1 @@ +usr/lib/*/libOSMesa.so.* diff --git a/debian/libosmesa6.install.in b/debian/libosmesa6.install.in deleted file mode 100644 index 1ada4d5..0000000 --- a/debian/libosmesa6.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libOSMesa.so.* diff --git a/debian/libwayland-egl1-mesa.install b/debian/libwayland-egl1-mesa.install new file mode 100644 index 0000000..2e6d1a1 --- /dev/null +++ b/debian/libwayland-egl1-mesa.install @@ -0,0 +1,3 @@ +# Wayland support, only on Linux: +usr/lib/*/libwayland-egl.so.1 +usr/lib/*/libwayland-egl.so.1.0.0 diff --git a/debian/libwayland-egl1-mesa.install.in b/debian/libwayland-egl1-mesa.install.in deleted file mode 100644 index e8a0f81..0000000 --- a/debian/libwayland-egl1-mesa.install.in +++ /dev/null @@ -1,3 +0,0 @@ -# Wayland support, only on Linux: -usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1 -usr/lib/${DEB_HOST_MULTIARCH}/libwayland-egl.so.1.0.0 diff --git a/debian/libxatracker-dev.install b/debian/libxatracker-dev.install new file mode 100644 index 0000000..71a5eb0 --- /dev/null +++ b/debian/libxatracker-dev.install @@ -0,0 +1,5 @@ +usr/lib/*/libxatracker.so +usr/lib/*/pkgconfig/xatracker.pc +usr/include/xa_composite.h +usr/include/xa_context.h +usr/include/xa_tracker.h diff --git a/debian/libxatracker-dev.install.in b/debian/libxatracker-dev.install.in deleted file mode 100644 index cc6933c..0000000 --- a/debian/libxatracker-dev.install.in +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libxatracker.so -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/xatracker.pc -usr/include/xa_composite.h -usr/include/xa_context.h -usr/include/xa_tracker.h diff --git a/debian/libxatracker2.install b/debian/libxatracker2.install new file mode 100644 index 0000000..80c85e0 --- /dev/null +++ b/debian/libxatracker2.install @@ -0,0 +1 @@ +usr/lib/*/libxatracker.so.2* diff --git a/debian/libxatracker2.install.in b/debian/libxatracker2.install.in deleted file mode 100644 index 883239a..0000000 --- a/debian/libxatracker2.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/${DEB_HOST_MULTIARCH}/libxatracker.so.2* diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install new file mode 100644 index 0000000..d9eb292 --- /dev/null +++ b/debian/mesa-common-dev.install @@ -0,0 +1,9 @@ +usr/include/GL/gl.h +usr/include/GL/glcorearb.h +usr/include/GL/glext.h +usr/include/GL/gl_mangle.h +usr/include/GL/glx.h +usr/include/GL/glxext.h +usr/include/GL/glx_mangle.h +usr/include/GL/internal/dri_interface.h +usr/lib/*/pkgconfig/dri.pc diff --git a/debian/mesa-common-dev.install.in b/debian/mesa-common-dev.install.in deleted file mode 100644 index 93617ee..0000000 --- a/debian/mesa-common-dev.install.in +++ /dev/null @@ -1,9 +0,0 @@ -usr/include/GL/gl.h -usr/include/GL/glcorearb.h -usr/include/GL/glext.h -usr/include/GL/gl_mangle.h -usr/include/GL/glx.h -usr/include/GL/glxext.h -usr/include/GL/glx_mangle.h -usr/include/GL/internal/dri_interface.h -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/dri.pc diff --git a/debian/mesa-opencl-icd.install b/debian/mesa-opencl-icd.install new file mode 100644 index 0000000..0784638 --- /dev/null +++ b/debian/mesa-opencl-icd.install @@ -0,0 +1,3 @@ +etc/OpenCL/vendors/mesa.icd +usr/lib/*/gallium-pipe/*.so +usr/lib/*/libMesaOpenCL* diff --git a/debian/mesa-opencl-icd.install.in b/debian/mesa-opencl-icd.install.in deleted file mode 100644 index 278bd50..0000000 --- a/debian/mesa-opencl-icd.install.in +++ /dev/null @@ -1,3 +0,0 @@ -etc/OpenCL/vendors/mesa.icd -usr/lib/${DEB_HOST_MULTIARCH}/gallium-pipe/*.so -usr/lib/${DEB_HOST_MULTIARCH}/libMesaOpenCL* diff --git a/debian/rules b/debian/rules index 71c09c4..80015f2 100755 --- a/debian/rules +++ b/debian/rules @@ -159,14 +159,6 @@ override_dh_auto_configure: --disable-silent-rules \ $(confflags) -override_dh_auto_install: - dh_auto_install - for file in debian/*.in; \ - do \ - sed -e"s,\$${DEB_HOST_MULTIARCH},$(DEB_HOST_MULTIARCH),g" \ - $${file} > $${file%%.in}; \ - done - allpkg = $(shell dh_listpackages -s) override_dh_installchangelogs:
