[SCM] grass branch, master, updated. upstream/6.4.1-86-g1dbb5e4

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit 2e25299f8605be1f1bbf3776084b8de327b286f9
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Sun Feb 26 12:45:42 2012 +1300

    re-add autoconf2.13 (even if not used by debian/rules right now, that version of it is mandatory), re-comment out optipng (unused)

diff --git a/debian/control b/debian/control
index c0a2645..9f4a1fd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-depends:
-  autotools-dev,
+  autoconf2.13, autotools-dev,
   debhelper (>= 8), 
   doxygen,
   fakeroot,
@@ -26,7 +26,7 @@ Build-depends:
   libsqlite3-dev,
   libxmu-dev,
 #install optipng if compressing the PNG images in the programmers' manual
-  optipng,
+#  optipng,
   python-dev (>= 2.5), python-support (>= 0.7.1),
   python-wxgtk2.8, libwxgtk2.8-dev,
   tcl-dev (>= 8.5), tk-dev (>= 8.5),
diff --git a/debian/control.in b/debian/control.in
index 99e50e2..7fc23c8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-depends:
-  autotools-dev,
+  autoconf2.13, autotools-dev,
   debhelper (>= 8), 
   doxygen,
   fakeroot,
@@ -26,7 +26,7 @@ Build-depends:
   libsqlite3-dev,
   libxmu-dev,
 #install optipng if compressing the PNG images in the programmers' manual
-  optipng,
+#  optipng,
   python-dev (>= 2.5), python-support (>= 0.7.1),
   python-wxgtk2.8, libwxgtk2.8-dev,
   tcl-dev (>= 8.5), tk-dev (>= 8.5),

-- 
Geographic Resources Analysis Support System