mesa: Changes to 'glvnd-wip'
debian/control | 46 ++++++++++++++++++++++++-----------------
debian/libglx-mesa-dev.docs | 4 +++
debian/libglx-mesa-dev.install | 9 ++++++++
debian/mesa-common-dev.docs | 4 ---
debian/mesa-common-dev.install | 9 --------
debian/rules | 2 -
6 files changed, 41 insertions(+), 33 deletions(-)
New commits:
commit d2df2368501eae1a2a3b62daca7ddb383613567e
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Feb 6 18:39:56 2017 +0200
add depends t o libglvnd-dev
diff --git a/debian/control b/debian/control
index a33417d..ffd2935 100644
--- a/debian/control
+++ b/debian/control
@@ -137,6 +137,7 @@ Section: libdevel
Architecture: any
Depends:
libegl-mesa0 (= ${binary:Version}),
+ libglvnd-dev,
libwayland-egl1-mesa (= ${binary:Version}) [linux-any],
libdrm-dev (>= 2.4.74) [!hurd-any],
x11proto-dri2-dev (>= 2.6),
@@ -208,6 +209,7 @@ Architecture: any
Depends:
libgles2-mesa (= ${binary:Version}),
libegl-mesa-dev,
+ libglvnd-dev,
${misc:Depends},
Multi-Arch: same
Description: free implementation of the OpenGL|ES 2.x API -- development files
@@ -291,6 +293,7 @@ Section: libdevel
Architecture: any
Depends:
libglx-mesa0 (= ${binary:Version}),
+ libglvnd-dev,
libdrm-dev (>= 2.4.74) [!hurd-any],
libx11-dev,
libx11-xcb-dev,
commit 80754dec10e940bdef6ffd2db71bf2a559034e91
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Mon Feb 6 18:37:53 2017 +0200
merge mesa-common-dev to libglx-mesa-dev, add transitional packages for lib{egl1,gl1}-mesa-dev, libgles2-mesa, mesa-common-dev
diff --git a/debian/control b/debian/control
index d782679..a33417d 100644
--- a/debian/control
+++ b/debian/control
@@ -168,6 +168,15 @@ 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
@@ -187,20 +196,11 @@ Package: libgles2-mesa
Section: libs
Architecture: any
Depends:
- libglapi-mesa (= ${binary:Version}),
libgles2,
- ${shlibs:Depends},
${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
Multi-Arch: same
-Description: free implementation of the OpenGL|ES 2.x API -- runtime
- OpenGL|ES is a cross-platform API for full-function 2D and 3D graphics on
- embedded systems - including consoles, phones, appliances and vehicles.
- It contains a subset of OpenGL plus a number of extensions for the
- special needs of embedded systems.
- .
- OpenGL|ES 2.x provides an API for programmable hardware including vertex
- and fragment shaders.
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
Package: libgles2-mesa-dev
Section: libdevel
@@ -290,7 +290,6 @@ Package: libglx-mesa-dev
Section: libdevel
Architecture: any
Depends:
- mesa-common-dev (= ${binary:Version}),
libglx-mesa0 (= ${binary:Version}),
libdrm-dev (>= 2.4.74) [!hurd-any],
libx11-dev,
@@ -324,18 +323,24 @@ 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
Depends:
- libx11-dev,
- libdrm-dev (>= 2.4.65) [!hurd-any],
+ libglx-mesa-dev,
${misc:Depends},
Multi-Arch: same
-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.
+Description: transitional dummy package
+ This is a transitional dummy package, it can be safely removed.
Package: libosmesa6
Section: libs
@@ -359,7 +364,7 @@ Section: libdevel
Architecture: any
Depends:
libosmesa6 (= ${binary:Version}),
- mesa-common-dev (= ${binary:Version}) | libgl-dev,
+ libglx-mesa-dev,
${misc:Depends},
Conflicts: libosmesa-dev
Replaces: libosmesa-dev
diff --git a/debian/libglx-mesa-dev.docs b/debian/libglx-mesa-dev.docs
new file mode 100644
index 0000000..f6af380
--- /dev/null
+++ b/debian/libglx-mesa-dev.docs
@@ -0,0 +1,4 @@
+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 cdee1b1..da2b853 100644
--- a/debian/libglx-mesa-dev.install
+++ b/debian/libglx-mesa-dev.install
@@ -1 +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
usr/lib/*/pkgconfig/gl.pc
diff --git a/debian/mesa-common-dev.docs b/debian/mesa-common-dev.docs
deleted file mode 100644
index f6af380..0000000
--- a/debian/mesa-common-dev.docs
+++ /dev/null
@@ -1,4 +0,0 @@
-docs/*.html
-docs/relnotes/*
-docs/specs/*.spec
-docs/specs/OLD/*.spec
diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install
deleted file mode 100644
index d9eb292..0000000
--- a/debian/mesa-common-dev.install
+++ /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/*/pkgconfig/dri.pc
diff --git a/debian/rules b/debian/rules
index 71b398a..1efae71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -170,7 +170,7 @@ allpkg = $(shell dh_listpackages -a)
override_dh_installchangelogs:
dh_installchangelogs -a
- dh_installchangelogs -pmesa-common-dev
+ dh_installchangelogs -plibglx-mesa-dev
override_dh_install:
# Also get rid of other files which aren't installed. Do not
Reply to: