[SCM] postgis branch, ubuntu/oneiric, updated. upstream/2.0.1-26-g6500830

[Jerome Villeneuve Larouche]

The following commit has been merged in the ubuntu/oneiric branch:
commit e3b0a67e7c39b004bf3caffda4b1f0d5d7033127
Merge: 429b9af0ddae902383f9377c9f36e702296da84e 22ccf92f12f7773648cdc5cdfcf068b716cfed89
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Thu Sep 6 12:43:29 2012 +0000

    2.0.1 Release
    
    Merge branch 'master' into ubuntu/oneiric
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 0da8850,88afb7e..d07c51c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,16 @@@
- postgis (1.5.3-3~oneiric1) oneiric; urgency=low
++postgis (2.0.1-2~oneiric1) oneiric; urgency=low
 +
-   * Launchpad release for Oneiric
++  * Launchpad build for Oneiric
 +
-  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 08 Jun 2012 18:03:56 +0000
++ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Thu, 06 Sep 2012 12:42:28 +0000
++
+ postgis (2.0.1-1) unstable; urgency=low
+ 
+   * New upstream release, 2.0.1
+   * Removed old patches
+   * Added Makefile.comments patch
+ 
+  -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 17 Aug 2012 14:56:22 +0000
  
  postgis (1.5.3-2) unstable; urgency=low
  

-- 
PostGIS for PostgreSQL