summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTimo Aaltonen <tjaalton@cc.hut.fi>2009-06-01 22:26:27 +0300
committerTimo Aaltonen <tjaalton@cc.hut.fi>2009-06-01 22:26:27 +0300
commitf3496a3cbdee0ff1de03f63436dee88071815b39 (patch)
tree6470ce6ab5bfd842dcb6dcdd5102ada2994de235 /debian
parent4bcb9cc14f1133b9ff6225de8d340d34b9aa5642 (diff)
mesa-common-dev.install: Don't install glxew.h, conflicts with libglew.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/mesa-common-dev.install4
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 9fb89439616..500f173ceef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mesa (7.5~rc2-1) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* New upstream release candidate.
* rules: Disable EGL.
+ * mesa-common-dev.install: Don't install glxew.h, conflicts with libglew.
[ Julien Cristau ]
* Update patches:
diff --git a/debian/mesa-common-dev.install b/debian/mesa-common-dev.install
index f4181b91b0e..e8a92492187 100644
--- a/debian/mesa-common-dev.install
+++ b/debian/mesa-common-dev.install
@@ -1,5 +1,7 @@
usr/include/GL/gl.h
usr/include/GL/glext.h
usr/include/GL/gl_mangle.h
-usr/include/GL/glx*.h
+usr/include/GL/glx.h
+usr/include/GL/glxext.h
+usr/include/GL/glx_mangle.h
usr/include/GL/internal/dri_interface.h