Author: frankie Date: 2009-03-30 12:42:16 +0000 (Mon, 30 Mar 2009) New Revision: 2108
Modified: 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/control packages/thuban/trunk/debian/watch packages/thuban/trunk/setup.py Log: New upstream release. Modified: packages/thuban/trunk/Thuban/Model/resource.py =================================================================== --- packages/thuban/trunk/Thuban/Model/resource.py 2009-03-30 12:01:32 UTC (rev 2107) +++ packages/thuban/trunk/Thuban/Model/resource.py 2009-03-30 12:42:16 UTC (rev 2108) @@ -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-30 12:01:32 UTC (rev 2107) +++ packages/thuban/trunk/Thuban/UI/resource.py 2009-03-30 12:42:16 UTC (rev 2108) @@ -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-30 12:01:32 UTC (rev 2107) +++ packages/thuban/trunk/Thuban/__init__.py 2009-03-30 12:42:16 UTC (rev 2108) @@ -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-30 12:01:32 UTC (rev 2107) +++ packages/thuban/trunk/debian/changelog 2009-03-30 12:42:16 UTC (rev 2108) @@ -1,18 +1,20 @@ thuban (1.2.1-1) unstable; urgency=low + [ Paul Wise ] + + * Switch to the new Homepage field + [ Francesco Paolo Lovergine ] - * (NOT RELEASED YET) New upstream release. + * New upstream release. * Policy bumped to 3.8.1. * Removed Silke among Uploaders. (closes: #519385) + * Changed build-dep: proj -> libproj-dev + * Fixed watch file. - [ Paul Wise ] + -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 30 Mar 2009 14:41:46 +0200 - * Switch to the new Homepage field - - -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 24 Mar 2009 21:14:30 +0100 - thuban (1.2.0-2) unstable; urgency=low [ Francesco Paolo Lovergine ] Modified: packages/thuban/trunk/debian/control =================================================================== --- packages/thuban/trunk/debian/control 2009-03-30 12:01:32 UTC (rev 2107) +++ packages/thuban/trunk/debian/control 2009-03-30 12:42:16 UTC (rev 2108) @@ -4,7 +4,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> Build-Depends: debhelper (>=5.0.0), python-dev, python-wxgtk2.8, libproj-dev, python-xmlbase, - libgdal1-dev, dpatch, wx2.6-headers, libwxgtk2.8-dev, docbook-utils, python-support (>=0.6), + libgdal1-dev, dpatch, wx2.8-headers, libwxgtk2.8-dev, docbook-utils, python-support (>=0.6), docbook-xml Standards-Version: 3.8.1 Homepage: http://thuban.intevation.org Modified: packages/thuban/trunk/debian/watch =================================================================== --- packages/thuban/trunk/debian/watch 2009-03-30 12:01:32 UTC (rev 2107) +++ packages/thuban/trunk/debian/watch 2009-03-30 12:42:16 UTC (rev 2108) @@ -1,2 +1,2 @@ version=3 -http://wald.intevation.org/frs?group_id=6 /frs/download.php/328/Thuban-([\d\.]+).tar.bz2 debian uupdate +http://wald.intevation.org/frs?group_id=6 /frs/download.php/\d+/Thuban-([\d\.]+).tar.bz2 Modified: packages/thuban/trunk/setup.py =================================================================== --- packages/thuban/trunk/setup.py 2009-03-30 12:01:32 UTC (rev 2107) +++ packages/thuban/trunk/setup.py 2009-03-30 12:42:16 UTC (rev 2108) @@ -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 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel