mesa: Changes to 'debian-experimental'
debian/changelog | 16 ++++++++++++++++
debian/control | 2 +-
debian/copyright | 14 +++++++++-----
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 | 10 ++++++++++
debian/mesa-common-dev.install.in | 10 ----------
debian/mesa-opencl-icd.install | 3 +++
debian/mesa-opencl-icd.install.in | 3 ---
debian/mesa-vulkan-drivers.postinst | 6 ------
debian/mesa-vulkan-drivers.postrm | 6 ------
debian/mesa-vulkan-drivers.triggers | 1 +
debian/rules | 10 +++++-----
47 files changed, 91 insertions(+), 82 deletions(-)
New commits:
commit 779c78acebf8e62e7a2468f0acc77b3ffada3980
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Wed Jul 20 09:07:58 2016 +0200
control: Only build-dep on libgcrypt20-dev on architectures where we build mesa-vulkan-drivers.
diff --git a/debian/changelog b/debian/changelog
index f25090c..d976418 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mesa (12.0.1-4) UNRELEASED; urgency=medium
compression type for dpkg-deb nowadays.
* Replace mesa-vulkan-drivers.post{inst,rm} with mesa-vulkan-
drivers.triggers.
+ * control: Only build-dep on libgcrypt20-dev on architectures where we
+ build mesa-vulkan-drivers.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 19 Jul 2016 11:04:19 +0200
diff --git a/debian/control b/debian/control
index 06cce61..91a0382 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
libxxf86vm-dev,
libexpat1-dev,
dpkg-dev (>= 1.16.1),
- libgcrypt20-dev [!hurd-any],
+ libgcrypt20-dev [linux-amd64 linux-i386 linux-x32],
libxfixes-dev,
libxdamage-dev,
libxext-dev,
commit 8eff93f3cbedc69913207bf87d85d9c40b76c8f3
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jul 19 15:50:49 2016 +0200
Replace mesa-vulkan-drivers.post{inst,rm} with mesa-vulkan-drivers.triggers.
Fixes the following lintian error and warnings:
E: mesa-vulkan-drivers: package-must-activate-ldconfig-trigger
usr/lib/x86_64-linux-gnu/libvulkan_intel.so
W: mesa source: maintainer-script-lacks-debhelper-token
debian/mesa-vulkan-drivers.postinst
W: mesa source: maintainer-script-lacks-debhelper-token
debian/mesa-vulkan-drivers.postrm
W: mesa-vulkan-drivers: maintscript-calls-ldconfig postinst
W: mesa-vulkan-drivers: maintscript-calls-ldconfig postrm
diff --git a/debian/changelog b/debian/changelog
index 0f2266d..f25090c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ mesa (12.0.1-4) UNRELEASED; urgency=medium
* Replace almost all dynamic debhelper config files with static files.
* rules: Drop unneeded override_dh_builddeb, xz is the default
compression type for dpkg-deb nowadays.
+ * Replace mesa-vulkan-drivers.post{inst,rm} with mesa-vulkan-
+ drivers.triggers.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 19 Jul 2016 11:04:19 +0200
diff --git a/debian/mesa-vulkan-drivers.postinst b/debian/mesa-vulkan-drivers.postinst
deleted file mode 100644
index a32bc94..0000000
--- a/debian/mesa-vulkan-drivers.postinst
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-if [ "$1" = "configure" ]; then
- ldconfig
-fi
-
diff --git a/debian/mesa-vulkan-drivers.postrm b/debian/mesa-vulkan-drivers.postrm
deleted file mode 100644
index 52e070d..0000000
--- a/debian/mesa-vulkan-drivers.postrm
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-if [ "$1" = "remove" ]; then
- ldconfig
-fi
-
diff --git a/debian/mesa-vulkan-drivers.triggers b/debian/mesa-vulkan-drivers.triggers
new file mode 100644
index 0000000..dd86603
--- /dev/null
+++ b/debian/mesa-vulkan-drivers.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig
commit 2fd88ef3bac759f2b6f8fe57eb39b130a38532d5
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jul 19 15:27:50 2016 +0200
rules: Drop unneeded override_dh_builddeb, xz is the default compression type for dpkg-deb nowadays.
diff --git a/debian/changelog b/debian/changelog
index 8af3c36..0f2266d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mesa (12.0.1-4) UNRELEASED; urgency=medium
* rules: Replace deprecated debhelper option -s with -a.
* copyright: Sync with docs/license.html.
* Replace almost all dynamic debhelper config files with static files.
+ * rules: Drop unneeded override_dh_builddeb, xz is the default
+ compression type for dpkg-deb nowadays.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 19 Jul 2016 11:04:19 +0200
diff --git a/debian/rules b/debian/rules
index 5fe4f97..31ae0b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,9 +207,6 @@ override_dh_install:
override_dh_makeshlibs:
dh_makeshlibs -a -- -c4
-override_dh_builddeb:
- dh_builddeb -a -- -Zxz
-
%:
dh $@ --with quilt,autoreconf \
--parallel \
commit 8468daf8bc02f80dff7cc519def6d9f527a90829
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jul 19 15:22:29 2016 +0200
Replace almost all dynamic debhelper config files with static files.
diff --git a/debian/changelog b/debian/changelog
index e3710e9..8af3c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mesa (12.0.1-4) UNRELEASED; urgency=medium
dropped with the migration to dh.
* rules: Replace deprecated debhelper option -s with -a.
* copyright: Sync with docs/license.html.
+ * Replace almost all dynamic debhelper config files with static files.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 19 Jul 2016 11:04:19 +0200
diff --git a/debian/libegl1-mesa-dev.install b/debian/libegl1-mesa-dev.install
new file mode 100644
index 0000000..62d648f
--- /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)
+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..faf9836
--- /dev/null
+++ b/debian/libegl1-mesa-dev.install.linux
@@ -0,0 +1,9 @@
+# OS-independent part (from libegl1-mesa-dev.install):
+usr/lib/*/libEGL.so
+usr/include/EGL
+usr/include/KHR
+usr/lib/*/pkgconfig/egl.pc
+
+# Wayland support, only on Linux:
+usr/lib/*/libwayland-egl.so
+usr/lib/*/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..af8bf40
--- /dev/null
+++ b/debian/mesa-common-dev.install
@@ -0,0 +1,10 @@
+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/include/GL/mesa_glinterop.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 abd8124..0000000
--- a/debian/mesa-common-dev.install.in
+++ /dev/null
@@ -1,10 +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/include/GL/mesa_glinterop.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*
commit 1f6f4a491884a166457175f9d46928b23c28a96a
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jul 19 11:24:30 2016 +0200
copyright: Sync with docs/license.html.
diff --git a/debian/changelog b/debian/changelog
index 2a51742..e3710e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mesa (12.0.1-4) UNRELEASED; urgency=medium
* rules: Pass -c4 to dpkg-gensymbols through dh_makeshlibs, got
dropped with the migration to dh.
* rules: Replace deprecated debhelper option -s with -a.
+ * copyright: Sync with docs/license.html.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 19 Jul 2016 11:04:19 +0200
diff --git a/debian/copyright b/debian/copyright
index fdde430..8b2c18b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,10 +12,10 @@ For more information see:
-------------------------------------------------------------------------------
The Mesa distribution consists of several components. Different copyrights and
-licenses apply to different components. For example, some demo programs are
-copyrighted by SGI, some of the Mesa device drivers are copyrighted by their
-authors. See below for a list of Mesa's main components and the license for
-each.
+licenses apply to different components. For example, the GLX client code uses
+the SGI Free Software License B, and some of the Mesa device drivers are
+copyrighted by their authors. See below for a list of Mesa's main components
+and the license for each.
The core Mesa library is licensed according to the terms of the MIT license.
This allows integration with the XFree86, Xorg and DRI projects.
@@ -52,13 +52,17 @@ Mesa Component Licenses
Component Location License
------------------------------------------------------------------
-Main Mesa code src/mesa/ Mesa (MIT)
+Main Mesa code src/mesa/ MIT
Device drivers src/mesa/drivers/* MIT, generally
+Gallium code src/gallium/ MIT
+
Ext headers include/GL/glext.h Khronos
include/GL/glxext.h
+GLX client code src/glx/ SGI Free Software License B
+
C11 thread include/c11/threads*.h Boost (permissive)
emulation
commit 4efb905f75745d5de6cc909097e6b8090e00b5c7
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jul 19 11:07:33 2016 +0200
rules: Replace deprecated debhelper option -s with -a.
diff --git a/debian/changelog b/debian/changelog
index 411275b..2a51742 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mesa (12.0.1-4) UNRELEASED; urgency=medium
* rules: Pass -c4 to dpkg-gensymbols through dh_makeshlibs, got
dropped with the migration to dh.
+ * rules: Replace deprecated debhelper option -s with -a.
-- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 19 Jul 2016 11:04:19 +0200
diff --git a/debian/rules b/debian/rules
index fc9b3a5..5fe4f97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,10 +155,10 @@ override_dh_auto_install:
override_dh_auto_test:
-allpkg = $(shell dh_listpackages -s)
+allpkg = $(shell dh_listpackages -a)
override_dh_installchangelogs:
- dh_installchangelogs -s
+ dh_installchangelogs -a
dh_installchangelogs -pmesa-common-dev
override_dh_install:
@@ -195,7 +195,7 @@ override_dh_install:
debian/mesa-va-drivers/usr/lib/${DEB_HOST_MULTIARCH}/dri/
endif
- dh_install -s --fail-missing
+ dh_install -a --fail-missing
# Install bug control and script:
set -e; for p in $(allpkg); do \
@@ -208,7 +208,7 @@ override_dh_makeshlibs:
dh_makeshlibs -a -- -c4
override_dh_builddeb:
- dh_builddeb -s -- -Zxz
+ dh_builddeb -a -- -Zxz
%:
dh $@ --with quilt,autoreconf \
commit db1ca680ff4bea2edbead87d6271ec74318065eb
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Tue Jul 19 11:04:36 2016 +0200
rules: Pass -c4 to dpkg-gensymbols through dh_makeshlibs, got dropped with the migration to dh.
diff --git a/debian/changelog b/debian/changelog
index 251ab61..411275b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (12.0.1-4) UNRELEASED; urgency=medium
+
+ * rules: Pass -c4 to dpkg-gensymbols through dh_makeshlibs, got
+ dropped with the migration to dh.
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Tue, 19 Jul 2016 11:04:19 +0200
+
mesa (12.0.1-3) experimental; urgency=medium
* rules, control: Build mesa-vulkan-drivers only on linux-
diff --git a/debian/rules b/debian/rules
index f6bf0e3..fc9b3a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -204,6 +204,9 @@ override_dh_install:
install -m 755 debian/local/script debian/$$p/usr/share/bug/$$p; \
done
+override_dh_makeshlibs:
+ dh_makeshlibs -a -- -c4
+
override_dh_builddeb:
dh_builddeb -s -- -Zxz
Reply to: