diff options
| author | Jon Severinsson <jon@severinsson.net> | 2013-08-21 23:19:01 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-08-22 10:41:58 +0200 |
| commit | 22f172cba8ef32c7d0611710868877a42a1aead7 (patch) | |
| tree | ab6bc2568d635c01e08a5346e153a8162f4f353b | |
| parent | 1d54b6cd35e879e07516e95054bb37021f42f4b3 (diff) | |
| download | mesa-22f172cba8ef32c7d0611710868877a42a1aead7.tar.gz | |
libgl1-mesa(-swx11)-dev.install.in: Install the correct pkgconfig/gl.pc files.
Previously the swx11 file was installed in dri dev package, and no pc file was installed in the swx11 dev package.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/libgl1-mesa-dev.install.in | 2 | ||||
| -rw-r--r-- | debian/libgl1-mesa-swx11-dev.install.in | 1 | ||||
| -rw-r--r-- | debian/not-installed | 1 |
4 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 95bd5b3344..46e75412eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mesa (9.2~rc1-2) UNRELEASED; urgency=low * control: Recommend libtxc-dxtn-s2tc0 | libtxc-dxtn0, not just the virtual libtxc-dxtn0. * control: Bump libdrm-dev build-dependency to 2.4.45. * control: Add versioned libglapi-mesa dependency to libosmesa6. + * libgl1-mesa(-swx11)-dev.install.in: Install the correct pkgconfig/gl.pc files. -- Jon Severinsson <jon@severinsson.net> Tue, 20 Aug 2013 18:00:00 +0200 diff --git a/debian/libgl1-mesa-dev.install.in b/debian/libgl1-mesa-dev.install.in index 6c9b794e17..1eebcc9d94 100644 --- a/debian/libgl1-mesa-dev.install.in +++ b/debian/libgl1-mesa-dev.install.in @@ -1,2 +1,2 @@ dri/usr/lib/${DEB_HOST_MULTIARCH}/libGL.so usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc +dri/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig diff --git a/debian/libgl1-mesa-swx11-dev.install.in b/debian/libgl1-mesa-swx11-dev.install.in index 8318ac8f4a..e925ddd9e2 100644 --- a/debian/libgl1-mesa-swx11-dev.install.in +++ b/debian/libgl1-mesa-swx11-dev.install.in @@ -1,2 +1,3 @@ usr/lib/${DEB_HOST_MULTIARCH}/libGL.a usr/lib/${DEB_HOST_MULTIARCH}/libGL.so +usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/gl.pc diff --git a/debian/not-installed b/debian/not-installed index e9eb46dd95..03e300646b 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -4,7 +4,6 @@ NOT_INSTALLED := \ dri/usr/include/GL/wglext.h \ dri/usr/include/GL/wmesa.h \ - dri/usr/lib/*/pkgconfig/gl.pc \ usr/include/GL/glext.h \ usr/include/GL/gl.h \ usr/include/GL/gl_mangle.h \ |