[SCM] gdal branch, 1.9, updated. upstream/1.8.1-91-gfefd635

Francesco Paolo Lovergine frankie at debian.org
Tue Feb 21 14:30:48 UTC 2012


The following commit has been merged in the 1.9 branch:
commit 33faba5e61434e1717324c076a70902b0e5747b6
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 21 14:57:32 2012 +0100

    Fixed gdalplugins path for 1.9

diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index 01aee89..0321ff1 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -7,7 +7,7 @@ Index: gdal/gcore/gdaldrivermanager.cpp
                                          GDAL_PREFIX "/PlugIns");
      #else
 -                                        GDAL_PREFIX "/lib/gdalplugins" );
-+                                        GDAL_PREFIX "/lib/gdalplugins/1.8" );
++                                        GDAL_PREFIX "/lib/gdalplugins/1.9" );
      #endif
  #else
          char szExecPath[1024];
@@ -20,7 +20,7 @@ Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
                                          GDAL_PREFIX "/PlugIns");
      #else
 -                                        GDAL_PREFIX "/lib/gdalplugins" );
-+                                        GDAL_PREFIX "/lib/gdalplugins/1.8" );
++                                        GDAL_PREFIX "/lib/gdalplugins/1.9" );
      #endif
  #else
          char szExecPath[1024];
@@ -33,7 +33,7 @@ Index: gdal/port/cpl_findfile.cpp
              CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
    #else
 -            CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" );
-+            CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.8" );
++            CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.9" );
    #endif
  #else
              CPLPushFinderLocation( "/usr/local/share/gdal" );

-- 
GDAL/OGR library and tools



More information about the Pkg-grass-devel mailing list