Comment 20 for bug 20880

Hi,

here's the diff for the NMU I'm just uploading:

debdiff mesa_6.3.2-2.dsc /srv/pbuilder/result/mesa_6.3.2-2.1.dsc
 control | 4 ++--
 changelog | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff -u mesa-6.3.2/debian/control mesa-6.3.2/debian/control
--- mesa-6.3.2/debian/control
+++ mesa-6.3.2/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Mesa package maintainers <email address hidden>
 Uploaders: Marcelo E. Magallon <email address hidden>
 Standards-Version: 3.6.1
-Build-Depends: lesstif2-dev, xlibs-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev, libdirectfb-dev
+Build-Depends: lesstif2-dev, grep-dctrl, debhelper (>> 4), build-essential (>= 11), libdrm-dev, libdirectfb-dev, libx11-dev, libxext-dev, libxt-dev, libxxf86vm-dev, x-dev, xutils, xlibmesa-gl-dev

 Package: mesag3
 Section: libs
@@ -26,7 +26,7 @@
 Package: mesag-dev
 Section: libdevel
 Architecture: any
-Depends: mesag3 (= ${Source-Version}), libc6-dev, libx11-6-dev | xlibs-dev (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), mesa-common-dev (= ${Source-Version}), lesstif2-dev
+Depends: mesag3 (= ${Source-Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${Source-Version}), lesstif2-dev
 Provides: libgl-dev, mesag3-widgets, mesag-widgets-dev, libglw-dev
 Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev
 Replaces: libgl-dev
diff -u mesa-6.3.2/debian/changelog mesa-6.3.2/debian/changelog
--- mesa-6.3.2/debian/changelog
+++ mesa-6.3.2/debian/changelog
@@ -1,3 +1,13 @@
+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 <email address hidden> 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

Christoph
--
<email address hidden> | http://www.df7cb.de/