Author: frankie Date: 2009-03-31 07:54:36 +0000 (Tue, 31 Mar 2009) New Revision: 2115
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/setup.py packages/thuban/trunk/thuban.py Log: Sorry, trashed with patches the source tree. Modified: packages/thuban/trunk/Extensions/ogr/ogrdialog.py =================================================================== --- packages/thuban/trunk/Extensions/ogr/ogrdialog.py 2009-03-31 07:54:04 UTC (rev 2114) +++ packages/thuban/trunk/Extensions/ogr/ogrdialog.py 2009-03-31 07:54:36 UTC (rev 2115) @@ -14,7 +14,7 @@ import wx try: - from osgeo import ogr + 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:54:04 UTC (rev 2114) +++ packages/thuban/trunk/Extensions/ogr/ogrshapes.py 2009-03-31 07:54:36 UTC (rev 2115) @@ -12,7 +12,7 @@ # $Id: ogrshapes.py 2770 2007-05-22 08:54:41Z bh $ try: - from osgeo import ogr + 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:54:04 UTC (rev 2114) +++ packages/thuban/trunk/Thuban/Model/layer.py 2009-03-31 07:54:36 UTC (rev 2115) @@ -395,8 +395,8 @@ if resource.has_gdal_support(): - from osgeo import gdal - from osgeo.gdalconst import GA_ReadOnly + import gdal + from 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:54:04 UTC (rev 2114) +++ packages/thuban/trunk/Thuban/Model/resource.py 2009-03-31 07:54:36 UTC (rev 2115) @@ -27,16 +27,10 @@ from Thuban.Model.proj import Projection, ProjFile from xml.sax import SAXParseException -# 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" +projdir = \ + os.path.join(Thuban.__path__[0], os.pardir, "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:54:04 UTC (rev 2114) +++ packages/thuban/trunk/Thuban/UI/resource.py 2009-03-31 07:54:36 UTC (rev 2115) @@ -18,10 +18,7 @@ import wx -# 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" +bitmapdir = os.path.join(Thuban.__path__[0], os.pardir, "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:54:04 UTC (rev 2114) +++ packages/thuban/trunk/Thuban/__init__.py 2009-03-31 07:54:36 UTC (rev 2115) @@ -42,13 +42,9 @@ # 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/setup.py =================================================================== --- packages/thuban/trunk/setup.py 2009-03-31 07:54:04 UTC (rev 2114) +++ packages/thuban/trunk/setup.py 2009-03-31 07:54:36 UTC (rev 2115) @@ -47,7 +47,7 @@ # Unix like system. # Directories where Proj4 is installed - proj4_prefix = "/usr/" + proj4_prefix = "/usr/local/" 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": "$prefix/share/thuban", + "install_data": "$base/lib/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:54:04 UTC (rev 2114) +++ packages/thuban/trunk/thuban.py 2009-03-31 07:54:36 UTC (rev 2115) @@ -8,9 +8,6 @@ # 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 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel