[DebianGIS-dev] r2114 - in packages/thuban/trunk: . Extensions/ogr Thuban Thuban/Model Thuban/UI debian debian/patches

frankie at alioth.debian.org frankie at alioth.debian.org
Tue Mar 31 07:54:04 UTC 2009


Author: frankie
Date: 2009-03-31 07:54:04 +0000 (Tue, 31 Mar 2009)
New Revision: 2114

Added:
   packages/thuban/trunk/debian/patches/gdal.dpatch
Modified:
   packages/thuban/trunk/Extensions/ogr/ogrdialog.py
   packages/thuban/trunk/Extensions/ogr/ogrshapes.py
   packages/thuban/trunk/Thuban/Model/layer.py
   packages/thuban/trunk/Thuban/Model/resource.py
   packages/thuban/trunk/Thuban/UI/resource.py
   packages/thuban/trunk/Thuban/__init__.py
   packages/thuban/trunk/debian/changelog
   packages/thuban/trunk/debian/compat
   packages/thuban/trunk/debian/control
   packages/thuban/trunk/debian/patches/00list
   packages/thuban/trunk/debian/patches/wxpython.dpatch
   packages/thuban/trunk/setup.py
   packages/thuban/trunk/thuban.py
Log:
New upstream release.


Modified: packages/thuban/trunk/Extensions/ogr/ogrdialog.py
===================================================================
--- packages/thuban/trunk/Extensions/ogr/ogrdialog.py	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/Extensions/ogr/ogrdialog.py	2009-03-31 07:54:04 UTC (rev 2114)
@@ -14,7 +14,7 @@
 import wx
 
 try:
-    import ogr
+    from osgeo import ogr
 except ImportError:
     ogr = None
 

Modified: packages/thuban/trunk/Extensions/ogr/ogrshapes.py
===================================================================
--- packages/thuban/trunk/Extensions/ogr/ogrshapes.py	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/Extensions/ogr/ogrshapes.py	2009-03-31 07:54:04 UTC (rev 2114)
@@ -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
 

Modified: packages/thuban/trunk/Thuban/Model/layer.py
===================================================================
--- packages/thuban/trunk/Thuban/Model/layer.py	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/Thuban/Model/layer.py	2009-03-31 07:54:04 UTC (rev 2114)
@@ -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):
 

Modified: packages/thuban/trunk/Thuban/Model/resource.py
===================================================================
--- packages/thuban/trunk/Thuban/Model/resource.py	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/Thuban/Model/resource.py	2009-03-31 07:54:04 UTC (rev 2114)
@@ -27,10 +27,16 @@
 from Thuban.Model.proj import Projection, ProjFile
 from xml.sax import SAXParseException
 
-projdir = \
-        os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Projections")
+# The directory where the default projections are stored has to be changed
+# for
+# the debian package to be conformant with the FHS
+#projdir = \
+#        os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Projections")
+projdir = "/usr/share/thuban/Resources/Projections"
 
 
+
+
 PROJ_EXT = ".proj"
 
 # Determine the status of GDAL support. If GDAL is supported

Modified: packages/thuban/trunk/Thuban/UI/resource.py
===================================================================
--- packages/thuban/trunk/Thuban/UI/resource.py	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/Thuban/UI/resource.py	2009-03-31 07:54:04 UTC (rev 2114)
@@ -18,7 +18,10 @@
 import wx
 
 
-bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Bitmaps")
+# The directory where the toolbar icons are stored has to be changed for
+# the debian package to be conformant with the FHS
+#bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "Resources", "Bitmaps")
+bitmapdir = "/usr/share/thuban/Resources/Bitmaps"
 bitmap_extensions = {wx.BITMAP_TYPE_XPM: ".xpm",
                      wx.BITMAP_TYPE_ANY: ""}
 

Modified: packages/thuban/trunk/Thuban/__init__.py
===================================================================
--- packages/thuban/trunk/Thuban/__init__.py	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/Thuban/__init__.py	2009-03-31 07:54:04 UTC (rev 2114)
@@ -42,9 +42,13 @@
 
 # Thedirectory holding the translation files (actually they're in
 # language specific subdirectories of _message_dir)
-_message_dir = os.path.join(os.path.dirname(__file__), os.pardir, "Resources",
-                            "Locale")
 
+# The directory where the default projections are stored has to be changed
+# for the debian package to be conformant with the FHS
+#_message_dir = os.path.join(os.path.dirname(__file__), os.pardir, "Resources",
+#                            "Locale")
+_message_dir = "/usr/share/thuban/Resources/Locale"
+
 def _(s):
     """Return a localized version of the the string s
 

Modified: packages/thuban/trunk/debian/changelog
===================================================================
--- packages/thuban/trunk/debian/changelog	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/debian/changelog	2009-03-31 07:54:04 UTC (rev 2114)
@@ -13,8 +13,11 @@
   * Changed build-dep: proj -> libproj-dev
   * Fixed watch file.
   * Added wxpython patch to select 2.8 version.
+  * Added gdal patch to use osgeo namespace for gdal/ogr.
+  * Added recommended: python-mapscript for mapserver extension.
+  * Debhelper level set to 7.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 30 Mar 2009 14:41:46 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 30 Mar 2009 23:06:10 +0200
 
 thuban (1.2.0-2) unstable; urgency=low
 

Modified: packages/thuban/trunk/debian/compat
===================================================================
--- packages/thuban/trunk/debian/compat	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/debian/compat	2009-03-31 07:54:04 UTC (rev 2114)
@@ -1 +1 @@
-4
+7

Modified: packages/thuban/trunk/debian/control
===================================================================
--- packages/thuban/trunk/debian/control	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/debian/control	2009-03-31 07:54:04 UTC (rev 2114)
@@ -3,16 +3,16 @@
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>=5.0.0), python-dev, python-wxgtk2.8, libproj-dev, python-xmlbase,
- libgdal1-dev, dpatch, wx2.8-headers, libwxgtk2.8-dev, docbook-utils, python-support (>= 0.6),
+Build-Depends: debhelper (>= 7), python-dev, python-wxgtk2.6, libproj-dev, python-xmlbase,
+ libgdal1-dev, dpatch, libwxgtk2.6-dev, docbook-utils, python-support (>= 0.6),
  docbook-xml
 Standards-Version: 3.8.1
 Homepage: http://thuban.intevation.org
 
 Package: thuban
 Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, gdal-bin, python-wxgtk2.8, python-xmlbase, python-sqlite
-Recommends: python-psycopg, python-gdal
+Depends: ${shlibs:Depends}, ${python:Depends}, gdal-bin, python-wxgtk2.6, python-xmlbase, python-sqlite
+Recommends: python-psycopg, python-gdal, python-mapscript
 Description: an interactive geographic data viewer 
  Thuban can read geographic data in the shapefile format. Main features of
  thuban are the layer management and the possibility to navigate on the

Modified: packages/thuban/trunk/debian/patches/00list
===================================================================
--- packages/thuban/trunk/debian/patches/00list	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/debian/patches/00list	2009-03-31 07:54:04 UTC (rev 2114)
@@ -1,4 +1,5 @@
 locale
 setup.py
 bitmappath
-#wxpython
+wxpython
+gdal

Added: packages/thuban/trunk/debian/patches/gdal.dpatch
===================================================================
--- packages/thuban/trunk/debian/patches/gdal.dpatch	                        (rev 0)
+++ packages/thuban/trunk/debian/patches/gdal.dpatch	2009-03-31 07:54:04 UTC (rev 2114)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gdal.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/Extensions/ogr/ogrdialog.py trunk/Extensions/ogr/ogrdialog.py
+--- trunk~/Extensions/ogr/ogrdialog.py	2009-03-30 17:20:42.000000000 +0200
++++ trunk/Extensions/ogr/ogrdialog.py	2009-03-30 21:43:39.000000000 +0200
+@@ -14,7 +14,7 @@
+ import wx
+ 
+ try:
+-    import ogr
++    from osgeo import ogr
+ except ImportError:
+     ogr = None
+ 
+diff -urNad trunk~/Extensions/ogr/ogrshapes.py trunk/Extensions/ogr/ogrshapes.py
+--- trunk~/Extensions/ogr/ogrshapes.py	2009-03-30 17:20:42.000000000 +0200
++++ trunk/Extensions/ogr/ogrshapes.py	2009-03-30 21:44:39.000000000 +0200
+@@ -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
+ 
+diff -urNad trunk~/Thuban/Model/layer.py trunk/Thuban/Model/layer.py
+--- trunk~/Thuban/Model/layer.py	2009-03-30 17:20:42.000000000 +0200
++++ trunk/Thuban/Model/layer.py	2009-03-30 21:42:44.000000000 +0200
+@@ -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):
+ 


Property changes on: packages/thuban/trunk/debian/patches/gdal.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/thuban/trunk/debian/patches/wxpython.dpatch
===================================================================
--- packages/thuban/trunk/debian/patches/wxpython.dpatch	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/debian/patches/wxpython.dpatch	2009-03-31 07:54:04 UTC (rev 2114)
@@ -12,8 +12,8 @@
  # Read the file COPYING coming with Thuban for details.
  
  import sys, os
-+import wx
-+wx.select("2.8")
++import wxversion
++wxversion.select("2.6")
 +
  import Thuban
  

Modified: packages/thuban/trunk/setup.py
===================================================================
--- packages/thuban/trunk/setup.py	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/setup.py	2009-03-31 07:54:04 UTC (rev 2114)
@@ -47,7 +47,7 @@
     # Unix like system.
    
     # Directories where Proj4 is installed
-    proj4_prefix = "/usr/local/"
+    proj4_prefix = "/usr/"
     proj4_incdir =  os.path.join(proj4_prefix, "include")
     proj4_libdir =  os.path.join(proj4_prefix, "lib")
     proj4_lib = "proj"
@@ -1195,7 +1195,7 @@
                   # same directory.
                   "install_lib": "$base/lib/thuban",
                   "install_scripts": "$base/lib/thuban",
-                  "install_data": "$base/lib/thuban",
+                  "install_data": "$prefix/share/thuban",
                   # Don't print warning messages about the lib dir not
                   # being on Python's path. The libraries are Thuban
                   # specific and are installed just for Thuban. They'll

Modified: packages/thuban/trunk/thuban.py
===================================================================
--- packages/thuban/trunk/thuban.py	2009-03-31 07:53:35 UTC (rev 2113)
+++ packages/thuban/trunk/thuban.py	2009-03-31 07:54:04 UTC (rev 2114)
@@ -8,6 +8,9 @@
 # Read the file COPYING coming with Thuban for details.
 
 import sys, os
+import wxversion
+wxversion.select("2.6")
+
 import Thuban
 
 # Put the Lib dir into the path. The Lib dir contains some extra non




More information about the Pkg-grass-devel mailing list