[SCM] saga branch, master, updated. f89cbdae4e1f9d75c04b70a7f75eeed58ed60b27

2011-09-01 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit f89cbdae4e1f9d75c04b70a7f75eeed58ed60b27
Merge: a5d85f1f021036528c44717d37661ede0ff42880 
e74d5f5fe484d03aa49d2fe08dcf77b9cb8bdf77
Author: Francesco Paolo Lovergine fran...@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 fran...@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.vandew...@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 fran...@debian.org  Mon, 28 Mar 2011 12:39:13 
+0200
 + -- Francesco Paolo Lovergine fran...@debian.org  Tue, 07 Jun 2011 17:16:33 
+0200
  
  saga (2.0.5+dfsg-0) unstable; urgency=low
  

-- 
Saga GIS

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] saga branch, master, updated. f89cbdae4e1f9d75c04b70a7f75eeed58ed60b27

2011-09-01 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit 7a3cb19d3a7a341a1b6581befbc977bf9d3184cb
Merge: 16c5443282fab8d5b417e63d8656aa2d3b54830b 
4348a03da006f8048ab5b28529c7a4983f14f973
Author: Francesco Paolo Lovergine fran...@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.vandew...@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 fran...@debian.org  Mon, 28 Mar 2011 12:39:13 
+0200
 + -- Francesco Paolo Lovergine fran...@debian.org  Tue, 07 Jun 2011 17:16:33 
+0200
  
  saga (2.0.5+dfsg-0) unstable; urgency=low
  

-- 
Saga GIS

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] saga branch, master, updated. f89cbdae4e1f9d75c04b70a7f75eeed58ed60b27

2011-09-01 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit 16c5443282fab8d5b417e63d8656aa2d3b54830b
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Tue Jun 7 17:16:43 2011 +0200

Moved to 3.9.2 policy.

diff --git a/debian/changelog b/debian/changelog
index bd7c518..e0ed887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,12 +6,12 @@ saga (2.0.6+dfsg-0) unstable; urgency=low
 
   [ 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.
 
- -- Francesco Paolo Lovergine fran...@debian.org  Mon, 28 Mar 2011 12:39:13 
+0200
+ -- Francesco Paolo Lovergine fran...@debian.org  Tue, 07 Jun 2011 17:16:33 
+0200
 
 saga (2.0.5+dfsg-0) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2d52ede..5383731 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian GIS Project 
pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Johan Van de Wauw johan.vandew...@gmail.com, Francesco Paolo 
Lovergine fran...@debian.org
 Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
  libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (=8), 
- libqhull-dev, libhpdf-dev, libvigraimpex-dev
-Standards-Version: 3.9.1
+ libqhull-dev, libhpdf-dev, libvigraimpex
+Standards-Version: 3.9.2
 Homepage: http://www.saga-gis.org/
 Vcs-Git: git://git.debian.org/pkg-grass/saga.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git
@@ -43,7 +43,7 @@ Package: libsaga
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libsaga-2.0.6
+Provides: libsaga-2.0.7
 Description: SAGA GIS development files
  SAGA GIS (System for Automated Geoscientific Analyses) is a geographic
  information system used for editing and analysing spatial data.
diff --git a/debian/control.in b/debian/control.in
index 83d3518..a45f136 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,7 @@ Uploaders: Johan Van de Wauw johan.vandew...@gmail.com, 
Francesco Paolo Loverg
 Build-Depends: libwxgtk2.8-dev, wx-common, libgdal-dev, libexpat-dev,
  libogdi3.2-dev, libproj-dev, libgrib2c-dev, debhelper (=8), 
  libqhull-dev, libhpdf-dev, libvigraimpex
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.saga-gis.org/
 Vcs-Git: git://git.debian.org/pkg-grass/saga.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/saga.git

-- 
Saga GIS

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] saga branch, master, updated. f89cbdae4e1f9d75c04b70a7f75eeed58ed60b27

2011-09-01 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit a5d85f1f021036528c44717d37661ede0ff42880
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Tue Aug 30 17:53:08 2011 +0200

Updated for unstable upload.

diff --git a/debian/changelog b/debian/changelog
index 02c16a0..cf98853 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-saga (2.0.7+dfsg-1) UNRELEASED; urgency=low
+saga (2.0.7+dfsg-1) unstable; urgency=low
 
   [ Johan Van de Wauw ]
   * Imported Upstream version 2.0.7
@@ -6,7 +6,10 @@ saga (2.0.7+dfsg-1) UNRELEASED; urgency=low
   * Fix previous patch
   * Imported Upstream version 2.0.7+dfsg
 
- -- Johan Van de Wauw johan.vandew...@gmail.com  Thu, 16 Jun 2011 14:18:35 
-0400
+  [ Francesco Paolo Lovergine ]
+  * Ready for unstable.
+
+ -- Francesco Paolo Lovergine fran...@debian.org  Tue, 30 Aug 2011 17:51:48 
+0200
 
 saga (2.0.6+dfsg-0) unstable; urgency=low
 

-- 
Saga GIS

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel