[SCM] grass branch, master, updated. upstream/6.4.1-82-g2c35360

[Francesco P. Lovergine]

The following commit has been merged in the master branch:
commit 2c35360da725ee20dc08f53e3c1d9f15dc00f894
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date:   Sat Feb 25 19:27:21 2012 +0100

    Restored Hamish changes erroneously done in debian/control.

diff --git a/debian/changelog b/debian/changelog
index 6deb4a9..d8624e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ grass (6.4.2-1) unstable; urgency=low
   [ Francesco Paolo Lovergine ]
   * Moved to use TIFF 4.0.1 instead of the legacy flavor.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 25 Feb 2012 18:55:41 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 25 Feb 2012 19:21:24 +0100
 
 grass (6.4.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 385d47d..c0a2645 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:
-  autoconf2.13, autotools-dev,
+  autotools-dev,
   debhelper (>= 8), 
   doxygen,
   fakeroot,
@@ -25,23 +25,25 @@ Build-depends:
   libreadline-dev | libreadline6-dev,
   libsqlite3-dev,
   libxmu-dev,
+#install optipng if compressing the PNG images in the programmers' manual
+  optipng,
   python-dev (>= 2.5), python-support (>= 0.7.1),
   python-wxgtk2.8, libwxgtk2.8-dev,
   tcl-dev (>= 8.5), tk-dev (>= 8.5),
   unixodbc-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Conflicts: wx2.6-headers
 Homepage: http://grass.osgeo.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/grass.git
 
 Package: grass
-Section: science
+Section: metapackages
 Architecture: all
 Depends: grass-core, grass-gui
 Recommends: grass-doc
 Suggests: grass-dev
-Description: GRASS GIS (The Geographic Resources Analysis Support System)
+Description: Geographic Resources Analysis Support System (GRASS GIS)
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
@@ -136,9 +138,9 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Suggests: grass
-Description: The GRASS GIS Programmers' Manual
+Description: GRASS GIS Programmers' Manual
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
diff --git a/debian/control.in b/debian/control.in
index f7494f8..99e50e2 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:
-  autoconf2.13, autotools-dev,
+  autotools-dev,
   debhelper (>= 8), 
   doxygen,
   fakeroot,
@@ -25,23 +25,25 @@ Build-depends:
   libreadline-dev | libreadline6-dev,
   libsqlite3-dev,
   libxmu-dev,
+#install optipng if compressing the PNG images in the programmers' manual
+  optipng,
   python-dev (>= 2.5), python-support (>= 0.7.1),
   python-wxgtk2.8, libwxgtk2.8-dev,
   tcl-dev (>= 8.5), tk-dev (>= 8.5),
   unixodbc-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Build-Conflicts: wx2.6-headers
 Homepage: http://grass.osgeo.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/grass.git
 Vcs-Git: git://git.debian.org/git/pkg-grass/grass.git
 
 Package: grass
-Section: science
+Section: metapackages
 Architecture: all
 Depends: grass-core, grass-gui
 Recommends: grass-doc
 Suggests: grass-dev
-Description: GRASS GIS (The Geographic Resources Analysis Support System)
+Description: Geographic Resources Analysis Support System (GRASS GIS)
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and
@@ -136,9 +138,9 @@ Description: GRASS GIS user documentation
 Package: grass-dev-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Suggests: grass
-Description: The GRASS GIS Programmers' Manual
+Description: GRASS GIS Programmers' Manual
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
  image processing, graphics/map production, spatial modeling, and

-- 
Geographic Resources Analysis Support System