[DebianGIS-dev] Bug#374894: diff for 6.0.2-2.1 NMU

[Steinar H. Gunderson]

Package: grass
Version: 6.0.2-2
Severity: normal
Tags: patch

Hi,

Attached is the diff for my grass 6.0.2-2.1 NMU.
-------------- next part --------------
diff -Nru /tmp/9Ex9JbxA9x/grass-6.0.2/debian/changelog /tmp/TS4G7K8zdc/grass-6.0.2/debian/changelog
--- /tmp/9Ex9JbxA9x/grass-6.0.2/debian/changelog	2006-06-22 00:18:44.000000000 +0200
+++ /tmp/TS4G7K8zdc/grass-6.0.2/debian/changelog	2006-06-22 00:18:45.000000000 +0200
@@ -1,3 +1,11 @@
+grass (6.0.2-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Change build-dependency on xlibmesa-gl-dev to libgl1-mesa-swx11-dev;
+    fixes FTBFS, patch from Andreas Jochens. (Closes: #373569)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Thu, 22 Jun 2006 00:14:49 +0200
+
 grass (6.0.2-2) unstable; urgency=low
 
   [ Francesco Paolo Lovergine ]
diff -Nru /tmp/9Ex9JbxA9x/grass-6.0.2/debian/control /tmp/TS4G7K8zdc/grass-6.0.2/debian/control
--- /tmp/9Ex9JbxA9x/grass-6.0.2/debian/control	2006-06-22 00:18:44.000000000 +0200
+++ /tmp/TS4G7K8zdc/grass-6.0.2/debian/control	2006-06-22 00:18:45.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Steve Halasz <debian at adkgis.org>
-Build-depends: flex, bison, libreadline5-dev | libreadline-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 4.0.2), dpatch, libtiff4-dev, tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, xlibmesa-gl-dev, libglu1-xorg-dev | xlibmesa-glu-dev, libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-1.3.1-dev, proj (>= 4.4.7), libjpeg62-dev, libpng12-dev, libpq-dev | postgresql-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev | libmysqlclient14-dev, graphviz
+Build-depends: flex, bison, libreadline5-dev | libreadline-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 4.0.2), dpatch, libtiff4-dev, tcl8.4-dev, tk8.4-dev, fftw3-dev, libxmu-dev, libgl1-mesa-swx11-dev, libglu1-xorg-dev | xlibmesa-glu-dev, libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-1.3.1-dev, proj (>= 4.4.7), libjpeg62-dev, libpng12-dev, libpq-dev | postgresql-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev | libmysqlclient14-dev, graphviz
 Standards-Version: 3.6.2
 
 Package: grass