[SCM] saga branch, master, updated. f89cbdae4e1f9d75c04b70a7f75eeed58ed60b27

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit f89cbdae4e1f9d75c04b70a7f75eeed58ed60b27
Merge: a5d85f1f021036528c44717d37661ede0ff42880 e74d5f5fe484d03aa49d2fe08dcf77b9cb8bdf77
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Sep 1 10:28:51 2011 +0200

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

diff --combined debian/changelog
index cf98853,6f8b3eb..ce8b297
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,13 -3,14 +3,14 @@@ saga (2.0.7+dfsg-1) unstable; urgency=l
    [ Johan Van de Wauw ]
    * Imported Upstream version 2.0.7
    * Delete .svn files prior when creating dfsg-free tarball
-   * Fix previous patch
-   * Imported Upstream version 2.0.7+dfsg
- 
-   [ Francesco Paolo Lovergine ]
-   * Ready for unstable.
- 
-  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 30 Aug 2011 17:51:48 +0200
+   * Fix gcc 4.6 build issues
+   * Use debian version of grib2
+   * Bump standards version
+   * Enable building of python plugin
+   * Add support for opening *.las files
+   * Adjust grid_gridding to use qhull
+ 
+  -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Tue, 30 Aug 2011 15:39:35 -0400
  
  saga (2.0.6+dfsg-0) unstable; urgency=low
  
@@@ -24,14 -25,14 +25,14 @@@
  
    [ Francesco Paolo Lovergine ]
    * Dropped obsolete pre-squeeze proj alternative build-dep.
 -  * Policy bumped to current 3.9.1, without changes.
 +  * Policy bumped to current 3.9.2, without changes.
    * Dropped cdbs dependency, now using debhelper dh_* rules.
    * Using source 3.0 format with quilt support.
    * Debhelper level set to 8.
    * Some packaging changes.
    * Added missing changelog note.
  
 - -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 28 Mar 2011 12:39:13 +0200
 + -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 07 Jun 2011 17:16:33 +0200
  
  saga (2.0.5+dfsg-0) unstable; urgency=low
  

-- 
Saga GIS