[SCM] thuban branch, master, updated. upstream/1.2.2-31-g356ea40

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit a74c7be492b21aa6f8426de9b9ec034d3b5b1bbb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Oct 1 13:48:51 2013 +0200

    Refresh patch and add headers for: gdal.patch.

diff --git a/debian/changelog b/debian/changelog
index 2aca078..32701f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ thuban (1.2.2-4) UNRELEASED; urgency=low
     - setup.patch
     - bitmappath.patch
     - wxpython.patch
+    - gdal.patch
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 01 Oct 2013 12:42:46 +0200
 
diff --git a/debian/patches/gdal b/debian/patches/gdal
deleted file mode 100644
index 5a01411..0000000
--- a/debian/patches/gdal
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: thuban/Extensions/ogr/ogrdialog.py
-===================================================================
---- thuban.orig/Extensions/ogr/ogrdialog.py	2011-11-03 16:45:05.000000000 +0100
-+++ thuban/Extensions/ogr/ogrdialog.py	2011-11-03 16:52:54.000000000 +0100
-@@ -14,7 +14,7 @@
- import wx
- 
- try:
--    import ogr
-+    from osgeo import ogr
- except ImportError:
-     ogr = None
- 
-Index: thuban/Extensions/ogr/ogrshapes.py
-===================================================================
---- thuban.orig/Extensions/ogr/ogrshapes.py	2011-11-03 16:45:05.000000000 +0100
-+++ thuban/Extensions/ogr/ogrshapes.py	2011-11-03 16:52:54.000000000 +0100
-@@ -12,7 +12,7 @@
- # $Id: ogrshapes.py 2770 2007-05-22 08:54:41Z bh $
- 
- try:
--    import ogr
-+    from osgeo import ogr
- except ImportError:
-     ogr = None
- 
-Index: thuban/Thuban/Model/layer.py
-===================================================================
---- thuban.orig/Thuban/Model/layer.py	2011-11-03 16:45:05.000000000 +0100
-+++ thuban/Thuban/Model/layer.py	2011-11-03 16:52:54.000000000 +0100
-@@ -395,8 +395,8 @@
- 
- 
- if resource.has_gdal_support():
--    import gdal
--    from gdalconst import GA_ReadOnly
-+    from osgeo import gdal
-+    from osgeo.gdalconst import GA_ReadOnly
- 
- class RasterLayer(BaseLayer):
- 
diff --git a/debian/patches/gdal.patch b/debian/patches/gdal.patch
new file mode 100644
index 0000000..eefba66
--- /dev/null
+++ b/debian/patches/gdal.patch
@@ -0,0 +1,39 @@
+Description: Import ogr and gdal from osgeo module.
+Author: Francesco Paolo Lovergine <frankie at debian.org>
+Last-Update: 2011-11-03
+
+--- a/Extensions/ogr/ogrdialog.py
++++ b/Extensions/ogr/ogrdialog.py
+@@ -14,7 +14,7 @@ import sys, traceback
+ import wx
+ 
+ try:
+-    import ogr
++    from osgeo import ogr
+ except ImportError:
+     ogr = None
+ 
+--- a/Extensions/ogr/ogrshapes.py
++++ b/Extensions/ogr/ogrshapes.py
+@@ -12,7 +12,7 @@ __version__ = "$Revision: 2770 $"
+ # $Id: ogrshapes.py 2770 2007-05-22 08:54:41Z bh $
+ 
+ try:
+-    import ogr
++    from osgeo import ogr
+ except ImportError:
+     ogr = None
+ 
+--- a/Thuban/Model/layer.py
++++ b/Thuban/Model/layer.py
+@@ -395,8 +395,8 @@ class Layer(BaseLayer):
+ 
+ 
+ if resource.has_gdal_support():
+-    import gdal
+-    from gdalconst import GA_ReadOnly
++    from osgeo import gdal
++    from osgeo.gdalconst import GA_ReadOnly
+ 
+ class RasterLayer(BaseLayer):
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c96efde..ae6b71c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ locale.patch
 setup.patch
 bitmappath.patch
 wxpython.patch
-gdal
+gdal.patch

-- 
Yet another interactive geographic data viewer