summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Nusinow <dnusinow@debian.org>2006-01-21 23:32:52 +0000
committerDavid Nusinow <dnusinow@debian.org>2006-01-21 23:32:52 +0000
commit7703d9293f2b523edfb0327aba2263e9507783a5 (patch)
treeb1a4dd5be5440a36ce340ceefefa630c8ae6e97c
parentbcf560e4b89bc5b9043a540a7e4b7b6dc2486bce (diff)
downloadmesa-7703d9293f2b523edfb0327aba2263e9507783a5.tar.gz
Incorporate other NMU for xlibs-dev transition
-rw-r--r--debian/changelog15
1 files changed, 12 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 3a0669911c4..df0eb3f0b63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
mesa (6.4.1-1) unstable; urgency=low
[ Marcelo E. Magallon <mmagallo@debian.org> ]
- * debian/control: build-depend on xutils (closes: #326466)
+ * debian/control: build-depend on xutils
* include/GL/glx{int,proto,md,tokens}.h: missing upstream (closes: bug#326466)
* debian/libgl1-mesa-dri-dev.install: install GLX include files here, too.
* debian/rules: GLU and GLW don't have arch-specific targets.
@@ -18,7 +18,7 @@ mesa (6.4.1-1) unstable; urgency=low
libglu1-mesa-dev; it should be the other way around. (closes: #336565)
* Add Build-Depends on pkg-config to get flags from libdrm, and libexpat-dev
for DRI configuration. Break out xlibs-dev Build-Depends to the
- individual libraries required. (closes: #347129)
+ individual libraries required.
* Bump libdrm-dev Build-Depends to >> 1.0.5, in order to get new
via_drm.h to build the unichrome DRI driver.
* Configs: pare DRI drivers down to a sensible set for each architecture.
@@ -35,12 +35,21 @@ mesa (6.4.1-1) unstable; urgency=low
+ Add new files required by xorg-server GL build to mesa-swrast-source.
* NMU to begin getting Xorg 7.0 in to Debian
* Change libgl1-mesa-swrast Depends on libx11-6-dev to libx11-dev.
- (closes: #347205)
* Change libgl1-mesa-swrast to be named libgl1-mesa-swx11
* Change libgl1-mesa to be named libgl1-mesa-glx
-- David Nusinow <dnusinow@debian.org> Thu, 19 Jan 2006 18:44:04 -0500
+mesa (6.3.2-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Adjust Build-Depends:
+ + xlibs transition (Closes: #347129).
+ + xutils, xlibmesa-gl-dev (Closes: #326466).
+ * mesag-dev: Depends: libx11-dev (Closes: #347205).
+
+ -- Christoph Berg <myon@debian.org> Fri, 20 Jan 2006 20:45:43 +0100
+
mesa (6.3.2-2) unstable; urgency=low
* debian/rules: build only whatever needs to be build according to