[SCM] saga branch, master, updated. f89cbdae4e1f9d75c04b70a7f75eeed58ed60b27

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 7a3cb19d3a7a341a1b6581befbc977bf9d3184cb
Merge: 16c5443282fab8d5b417e63d8656aa2d3b54830b 4348a03da006f8048ab5b28529c7a4983f14f973
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Aug 30 17:50:24 2011 +0200

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

diff --combined debian/changelog
index e0ed887,db7dd7a..02c16a0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,34 +1,34 @@@
+ saga (2.0.7+dfsg-1) UNRELEASED; urgency=low
+ 
+   [ 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
+ 
+  -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Thu, 16 Jun 2011 14:18:35 -0400
+ 
  saga (2.0.6+dfsg-0) unstable; urgency=low
  
    [ Johan Van de Wauw ]
    * Update to 2.0.6 
    * Add libvigra-impex-dev - enables extra modules
+   * Add break/replace to avoid apt problems
+   * Revert to the right descriptions in debian/control
+   * Update saga_depends to 2.0.6
+   * Switch build system from cdbs to dh7
+   * Add patch from autoreconf result
  
    [ 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