[SCM] grass branch, master, updated. upstream/6.4.0-16-g0ceb0a9

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 0ceb0a979a2e1c77a62757fa91cefaa46536056a
Merge: eb35c5a69c6bbc08033307964d7bb19ef7aa5d3d b85e1693fbdd618f047287a08ff3b64beb0d40b5
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Apr 12 22:51:50 2011 +0200

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

diff --combined debian/changelog
index a8aca59,6e5563a..6d5585d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,11 @@@
  grass (6.4.1~rc2-1) unstable; urgency=low
  
    * New upstream release candidate.
 +  * Now build-dep on libjpeg-dev and current libreadline6-dev.
+   * Removed patch swig: obsolete.
++  * Policy bumped to 3.9.2, without changes.
  
-  -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 20 Mar 2011 11:58:47 +0100
 - -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 23 Mar 2011 16:20:03 +0100
++ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 12 Apr 2011 22:51:13 +0200
  
  grass (6.4.0-2) unstable; urgency=low
  
diff --combined debian/control
index 0e14a64,c8e2351..27aa713
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,9 +3,9 @@@ Section: scienc
  Priority: optional
  Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
  Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 -Build-depends: flex, bison,libreadline-dev | libreadline5-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), 
 +Build-depends: flex, bison,libreadline-dev | libreadline6-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 7), 
   libtiff4-dev, tcl-dev (>= 8.5), tk-dev (>= 8.5), libfftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, 
 - libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg62-dev, 
 + libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>= 1.5.0), libproj-dev, proj-bin, libjpeg-dev, 
   libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
   libcairo2-dev, libwxgtk2.8-dev, python-dev (>= 2.5), swig
  Standards-Version: 3.9.1
@@@ -22,7 -22,7 +22,7 @@@ Depends: ${shlibs:Depends}, xterm | x-t
  Suggests: grass-doc, gdal-bin, proj-bin, e00compr, avce00, gpsbabel, gpstrans,
   gnuplot, xml2, wget | curl, netpbm
  Recommends: ghostscript
- Provides: grass641~rc2
+ Provides: grass641-2
  Description: Geographic Resources Analysis Support System 
   Commonly referred to as GRASS, this is a Geographic Information
   System (GIS) used for geospatial data management and analysis,

-- 
Geographic Resources Analysis Support System