[SCM] gdal branch, master, updated. upstream/1.7.3-5-g6319452

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 631945242b0e7b6676381ced5e238f3318aa94f2
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 22 15:43:13 2011 +0100

    Changed gdalplugins directory.

diff --git a/debian/changelog b/debian/changelog
index 03b72c9..632fa69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ gdal (1.7.3-2) unstable; urgency=low
   * Now using source format 3.0 and quilt for patches.
   * Added ${misc:Depends} due to debhelper use.
   * Moved to debhelper level 8 which is now recommended default.
+  * Now adoptin /usr/lib/gdalplugins/X.Y as plugin directory, because
+    it will be the same used in 1.9 series. Changed patches as required.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 18 Feb 2011 16:51:32 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 22 Feb 2011 15:35:34 +0100
 
 gdal (1.7.3-1) unstable; urgency=low
 
diff --git a/debian/libgdal1-1.7.0.install b/debian/libgdal1-1.7.0.install
index d7487c5..41a17a3 100644
--- a/debian/libgdal1-1.7.0.install
+++ b/debian/libgdal1-1.7.0.install
@@ -1,2 +1,2 @@
 usr/lib/libgdal1.7.0.so.*
-usr/share/gdal17
+usr/share/gdal/1.7
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index 8ba479b..dbf4a2d 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -1,39 +1,39 @@
 Index: gdal/gcore/gdaldrivermanager.cpp
 ===================================================================
---- gdal.orig/gcore/gdaldrivermanager.cpp	2011-02-18 15:52:35.000000000 +0100
-+++ gdal/gcore/gdaldrivermanager.cpp	2011-02-18 16:48:03.000000000 +0100
+--- gdal.orig/gcore/gdaldrivermanager.cpp	2011-02-18 16:49:44.000000000 +0100
++++ gdal/gcore/gdaldrivermanager.cpp	2011-02-22 15:37:55.000000000 +0100
 @@ -567,7 +567,7 @@
      #ifdef MACOSX_FRAMEWORK
                                          GDAL_PREFIX "/PlugIns");
      #else
 -                                        GDAL_PREFIX "/lib/gdalplugins" );
-+                                        GDAL_PREFIX "/lib/gdal17plugins" );
++                                        GDAL_PREFIX "/lib/gdalplugins/1.7" );
      #endif
  #else
          char szExecPath[1024];
 Index: gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
 ===================================================================
---- gdal.orig/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2011-02-18 15:52:35.000000000 +0100
-+++ gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2011-02-18 16:48:03.000000000 +0100
+--- gdal.orig/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2011-02-18 16:49:44.000000000 +0100
++++ gdal/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp	2011-02-22 15:38:19.000000000 +0100
 @@ -733,7 +733,7 @@
      #ifdef MACOSX_FRAMEWORK
                                          GDAL_PREFIX "/PlugIns");
      #else
 -                                        GDAL_PREFIX "/lib/gdalplugins" );
-+                                        GDAL_PREFIX "/lib/gdal17plugins" );
++                                        GDAL_PREFIX "/lib/gdalplugins/1.7" );
      #endif
  #else
          char szExecPath[1024];
 Index: gdal/port/cpl_findfile.cpp
 ===================================================================
---- gdal.orig/port/cpl_findfile.cpp	2011-02-18 15:52:35.000000000 +0100
-+++ gdal/port/cpl_findfile.cpp	2011-02-18 16:48:03.000000000 +0100
+--- gdal.orig/port/cpl_findfile.cpp	2011-02-18 16:49:44.000000000 +0100
++++ gdal/port/cpl_findfile.cpp	2011-02-22 15:38:27.000000000 +0100
 @@ -83,7 +83,7 @@
    #ifdef MACOSX_FRAMEWORK
              CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
    #else
 -            CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" );
-+            CPLPushFinderLocation( GDAL_PREFIX "/share/gdal17" );
++            CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.7" );
    #endif
  #else
              CPLPushFinderLocation( "/usr/local/share/gdal" );
diff --git a/debian/rules b/debian/rules
index 7df9104..e0ead85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,7 +149,7 @@ install: build
 	
 	cp `ls GDALmake.opt-*|tail -1` GDALmake.opt
 	$(MAKE) install BINDINGS="perl ruby" DESTDIR=$(CURDIR)/debian/tmp \
-			INST_DATA="\$$(prefix)/share/gdal17" 
+			INST_DATA="\$$(prefix)/share/gdal/1.7" 
 	$(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \
 		"INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
 		"INST_MAN=\$$(prefix)/share/man" 
@@ -163,7 +163,7 @@ install: build
 	install -o root -g root -m 755 $(CURDIR)/swig/python/scripts/*.py $(CURDIR)/debian/tmp/usr/bin/.                                        
 	
 	# removing license file
-	rm -f $(CURDIR)/debian/tmp/usr/share/gdal17/LICENSE.TXT
+	rm -f $(CURDIR)/debian/tmp/usr/share/gdal/1.7/LICENSE.TXT
 	# removing empty packlist MakeMaker files 
 	-find $(CURDIR)/debian/tmp/usr/local/lib/perl -type f -name .packlist -exec rm -f {} \;
 	# removing embedded rpath in perl shlibs

-- 
GDAL/OGR library and tools