[PATCH 4/7] libgl1-mesa(-swx11)-dev.install.in: Install the correct pkgconfig/gl.pc files.

[Jon Severinsson <jon@severinsson.net>]

Previously the swx11 file was installed in dri dev package, and no pc file was installed in the swx11 dev package.
---
 debian/changelog                        |    1 +
 debian/libgl1-mesa-dev.install.in       |    2 +-
 debian/libgl1-mesa-swx11-dev.install.in |    1 +
 debian/not-installed                    |    1 -
 4 filer ändrade, 3 tillägg(+), 2 borttagningar(-)

diff --git a/debian/changelog b/debian/changelog
index 2484e575..c5bc8124 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 liosmesa6.
+  * 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 6c9b794e..1eebcc9d 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 8318ac8f..e925ddd9 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 e9eb46dd..03e30064 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 \
-- 
1.7.10.4