debian/control | 44 ++++++++++------------------------ debian/libegl-mesa-dev.install | 4 --- debian/libegl-mesa-dev.install.linux | 8 ------ debian/libegl1-mesa-dev.install | 4 +++ debian/libegl1-mesa-dev.install.linux | 8 ++++++ debian/libgl1-mesa-dev.install | 1 debian/libglx-mesa-dev.docs | 4 --- debian/libglx-mesa-dev.install | 10 ------- debian/mesa-common-dev.docs | 4 +++ debian/mesa-common-dev.install | 10 +++++++ debian/rules | 2 - 11 files changed, 41 insertions(+), 58 deletions(-)
New commits: commit 096cd7eb3cc269996d7198936cc637c01e621e21 Author: Timo Aaltonen <[email protected]> Date: Mon Feb 6 20:29:10 2017 +0200 revert renaming libegl1-mesa-dev -> libegl-mesa-dev diff --git a/debian/control b/debian/control index 28c84a5..c1faac4 100644 --- a/debian/control +++ b/debian/control @@ -132,7 +132,7 @@ Description: free implementation of the EGL API -- runtime This package contains modules to interface with the existing system GLX or DRI2 drivers to provide OpenGL via EGL. -Package: libegl-mesa-dev +Package: libegl1-mesa-dev Section: libdevel Architecture: any Depends: @@ -156,9 +156,6 @@ Depends: libx11-xcb-dev, libwayland-dev (>= 1.11.0) [linux-any], ${misc:Depends}, -Provides: libegl1-mesa-dev -Replaces: libegl1-mesa-dev -Breaks: libegl1-mesa-dev Multi-Arch: same Description: free implementation of the EGL API -- development files This package contains the development environment required for compiling @@ -169,15 +166,6 @@ Description: free implementation of the EGL API -- development files This package provides the development environment for compiling programs against the EGL library. -Package: libegl1-mesa-dev -Section: libdevel -Architecture: any -Depends: ${misc:Depends}, - libegl-mesa-dev, -Multi-Arch: same -Description: transitional dummy package - This is a transitional dummy package, it can be safely removed. - Package: libwayland-egl1-mesa Section: libs Architecture: linux-any @@ -207,7 +195,7 @@ Package: libgles2-mesa-dev Section: libdevel Architecture: any Depends: - libegl-mesa-dev, + libegl1-mesa-dev, libglvnd-dev, ${misc:Depends}, Multi-Arch: same diff --git a/debian/libegl-mesa-dev.install b/debian/libegl-mesa-dev.install deleted file mode 100644 index d3348c7..0000000 --- a/debian/libegl-mesa-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -# This file gets tweaked in an os-specific fashion (see libegl-mesa-dev.install.linux) -usr/include/EGL -usr/include/KHR -usr/lib/*/pkgconfig/egl.pc diff --git a/debian/libegl-mesa-dev.install.linux b/debian/libegl-mesa-dev.install.linux deleted file mode 100644 index 44718ee..0000000 --- a/debian/libegl-mesa-dev.install.linux +++ /dev/null @@ -1,8 +0,0 @@ -# OS-independent part (from libegl-mesa-dev.install): -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 b/debian/libegl1-mesa-dev.install new file mode 100644 index 0000000..42ea622 --- /dev/null +++ b/debian/libegl1-mesa-dev.install @@ -0,0 +1,4 @@ +# This file gets tweaked in an os-specific fashion (see libegl1-mesa-dev.install.linux) +usr/include/EGL +usr/include/KHR +usr/lib/*/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..f339bde --- /dev/null +++ b/debian/libegl1-mesa-dev.install.linux @@ -0,0 +1,8 @@ +# OS-independent part (from libegl1-mesa-dev.install): +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 commit 3f9c991ccc9b807d4581319841516e8f1036a67d Author: Timo Aaltonen <[email protected]> Date: Mon Feb 6 20:13:57 2017 +0200 drop libgl1-mesa-dev transitional pkg, whoops diff --git a/debian/control b/debian/control index ca880a9..28c84a5 100644 --- a/debian/control +++ b/debian/control @@ -325,15 +325,6 @@ Description: free implementation of the OpenGL API -- GLX development files For a complete description of Mesa, please look at the libglx-mesa0 package. -Package: libgl1-mesa-dev -Section: libdevel -Architecture: any -Depends: ${misc:Depends}, - libglx-mesa-dev, -Multi-Arch: same -Description: transitional dummy package - This is a transitional dummy package, it can be safely removed. - Package: mesa-common-dev Section: libdevel Architecture: any commit d701c2f5d398620d01447e724833ec55365cd527 Author: Timo Aaltonen <[email protected]> Date: Mon Feb 6 20:12:24 2017 +0200 add mesa-common-dev.install diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install new file mode 100644 index 0000000..d48bf15 --- /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/lib/*/pkgconfig/dri.pc + commit 217cad4181fd5da943dca52a357b9150aec588e9 Author: Timo Aaltonen <[email protected]> Date: Mon Feb 6 20:07:32 2017 +0200 revert libgl1-mesa-dev rename to libglx-mesa-dev diff --git a/debian/control b/debian/control index d2b4fe6..ca880a9 100644 --- a/debian/control +++ b/debian/control @@ -287,7 +287,7 @@ Description: free implementation of the OpenGL API -- DRI modules For a complete description of Mesa, please look at the libglx-mesa0 package. -Package: libglx-mesa-dev +Package: libgl1-mesa-dev Section: libdevel Architecture: any Depends: @@ -311,9 +311,8 @@ Depends: x11proto-gl-dev (>= 1.4.14), ${misc:Depends}, Conflicts: libgl-dev -Replaces: libgl-dev, libgl1-mesa-dev -Provides: libgl-dev, libgl1-mesa-dev -Breaks: libgl1-mesa-dev +Replaces: libgl-dev +Provides: libgl-dev Multi-Arch: same Description: free implementation of the OpenGL API -- GLX development files This version of Mesa provides GLX and DRI capabilities: it is capable of diff --git a/debian/libgl1-mesa-dev.install b/debian/libgl1-mesa-dev.install new file mode 100644 index 0000000..cdee1b1 --- /dev/null +++ b/debian/libgl1-mesa-dev.install @@ -0,0 +1 @@ +usr/lib/*/pkgconfig/gl.pc diff --git a/debian/libglx-mesa-dev.install b/debian/libglx-mesa-dev.install deleted file mode 100644 index cdee1b1..0000000 --- a/debian/libglx-mesa-dev.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/pkgconfig/gl.pc commit 051d97e2f3906168091b3a73b211f798a18d2fee Author: Timo Aaltonen <[email protected]> Date: Mon Feb 6 20:01:42 2017 +0200 revert merging mesa-common-dev with libglx-mesa-dev diff --git a/debian/control b/debian/control index 56e95f7..d2b4fe6 100644 --- a/debian/control +++ b/debian/control @@ -291,6 +291,7 @@ Package: libglx-mesa-dev Section: libdevel Architecture: any Depends: + mesa-common-dev (= ${binary:Version}), libglx-mesa0 (= ${binary:Version}), libglvnd-dev, libdrm-dev (>= 2.4.74) [!hurd-any], @@ -338,11 +339,14 @@ Package: mesa-common-dev Section: libdevel Architecture: any Depends: - libglx-mesa-dev, + libx11-dev, + libdrm-dev (>= 2.4.65) [!hurd-any], ${misc:Depends}, Multi-Arch: same -Description: transitional dummy package - This is a transitional dummy package, it can be safely removed. +Description: Developer documentation for Mesa + This package includes the specifications for the Mesa-specific OpenGL + extensions, the complete set of release notes and the development header + files common to all Mesa packages. Package: libosmesa6 Section: libs @@ -366,7 +370,7 @@ Section: libdevel Architecture: any Depends: libosmesa6 (= ${binary:Version}), - libglx-mesa-dev, + mesa-common-dev (= ${binary:Version}) | libgl-dev, ${misc:Depends}, Conflicts: libosmesa-dev Replaces: libosmesa-dev diff --git a/debian/libglx-mesa-dev.docs b/debian/libglx-mesa-dev.docs deleted file mode 100644 index f6af380..0000000 --- a/debian/libglx-mesa-dev.docs +++ /dev/null @@ -1,4 +0,0 @@ -docs/*.html -docs/relnotes/* -docs/specs/*.spec -docs/specs/OLD/*.spec diff --git a/debian/libglx-mesa-dev.install b/debian/libglx-mesa-dev.install index da2b853..cdee1b1 100644 --- a/debian/libglx-mesa-dev.install +++ b/debian/libglx-mesa-dev.install @@ -1,10 +1 @@ -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 usr/lib/*/pkgconfig/gl.pc diff --git a/debian/mesa-common-dev.docs b/debian/mesa-common-dev.docs new file mode 100644 index 0000000..f6af380 --- /dev/null +++ b/debian/mesa-common-dev.docs @@ -0,0 +1,4 @@ +docs/*.html +docs/relnotes/* +docs/specs/*.spec +docs/specs/OLD/*.spec diff --git a/debian/rules b/debian/rules index 1efae71..71b398a 100755 --- a/debian/rules +++ b/debian/rules @@ -170,7 +170,7 @@ allpkg = $(shell dh_listpackages -a) override_dh_installchangelogs: dh_installchangelogs -a - dh_installchangelogs -plibglx-mesa-dev + dh_installchangelogs -pmesa-common-dev override_dh_install: # Also get rid of other files which aren't installed. Do not
