[SCM] grass branch, master, updated. upstream/6.4.1-106-gd9fdb4d

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 6b2ff6e7a8b25196ba20d38cbe68880e9e6094fa
Merge: d1e41c2a00a7588b10b6c6b133fe101b198cb6df 7448d4a5cb65d223d6b2e104e990a64943f71ec3
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue May 29 14:26:31 2012 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/grass

diff --combined debian/control
index 31e7cab,a4b6c74..3f1e71d
--- a/debian/control
+++ b/debian/control
@@@ -14,7 -14,7 +14,7 @@@ Build-depends
    libcairo2-dev,
    libfftw3-dev,
    libfreetype6-dev,
 -  libgdal1-dev (>= 1.5.0),
 +  libgdal-dev| libgdal1-dev (>= 1.5.0),
    libglu1-mesa-dev | libglu1-xorg-dev, 
    libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev,
    libmysqlclient-dev | libmysqlclient15-dev,
@@@ -27,9 -27,8 +27,9 @@@
    libxmu-dev,
  #install optipng if compressing the PNG images in the programmers' manual
  #  optipng,
-   python (>= 2.6.6-3~),
+   python (>= 2.6.6-3~), python-dev,
    python-wxgtk2.8, libwxgtk2.8-dev,
 +  python-dev,
    tcl-dev (>= 8.5), tk-dev (>= 8.5),
    unixodbc-dev
  Standards-Version: 3.9.3
diff --combined debian/control.in
index c6a6e48,aec5b85..9f43996
--- a/debian/control.in
+++ b/debian/control.in
@@@ -14,7 -14,7 +14,7 @@@ Build-depends
    libcairo2-dev,
    libfftw3-dev,
    libfreetype6-dev,
 -  libgdal1-dev (>= 1.5.0),
 +  libgdal-dev| libgdal1-dev (>= 1.5.0),
    libglu1-mesa-dev | libglu1-xorg-dev, 
    libjpeg-dev, libpng12-dev, libtiff5-dev | libtiff4-dev,
    libmysqlclient-dev | libmysqlclient15-dev,
@@@ -27,9 -27,8 +27,9 @@@
    libxmu-dev,
  #install optipng if compressing the PNG images in the programmers' manual
  #  optipng,
-   python (>= 2.6.6-3~),
+   python (>= 2.6.6-3~), python-dev,
    python-wxgtk2.8, libwxgtk2.8-dev,
 +  python-dev,
    tcl-dev (>= 8.5), tk-dev (>= 8.5),
    unixodbc-dev
  Standards-Version: 3.9.3

-- 
Geographic Resources Analysis Support System