[SCM] gdal branch, master, updated. upstream/1.8.0-11-g47a0a61

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 47a0a615dd946762d88bfdfe49b25d0209182006
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Mar 16 10:27:34 2011 +0100

    Residual changes for 1.8 version.

diff --git a/debian/libgdal1-1.7.0.install b/debian/libgdal1-1.7.0.install
deleted file mode 100644
index 41a17a3..0000000
--- a/debian/libgdal1-1.7.0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libgdal1.7.0.so.*
-usr/share/gdal/1.7
diff --git a/debian/libgdal1-1.7.0.docs b/debian/libgdal1-1.8.0.docs
similarity index 100%
rename from debian/libgdal1-1.7.0.docs
rename to debian/libgdal1-1.8.0.docs
diff --git a/debian/libgdal1-1.8.0.install b/debian/libgdal1-1.8.0.install
new file mode 100644
index 0000000..64ecf14
--- /dev/null
+++ b/debian/libgdal1-1.8.0.install
@@ -0,0 +1,2 @@
+usr/lib/libgdal1.8.0.so.*
+usr/share/gdal/1.8
diff --git a/debian/libgdal1-dev.install b/debian/libgdal1-dev.install
index 753d04f..d362dd3 100644
--- a/debian/libgdal1-dev.install
+++ b/debian/libgdal1-dev.install
@@ -1,5 +1,5 @@
 usr/bin/gdal-config
 usr/include
-usr/lib/libgdal1.7.0.a
-usr/lib/libgdal1.7.0.so
+usr/lib/libgdal1.8.0.a
+usr/lib/libgdal1.8.0.so
 usr/share/man/man1/gdal-config.1
diff --git a/debian/patches/libname b/debian/patches/libname
index f46b8fe..596b708 100644
--- a/debian/patches/libname
+++ b/debian/patches/libname
@@ -57,7 +57,7 @@ Index: gdal/swig/perl/Makefile.PL
  }
  open $fh, $fh or die "$fh not found!";
 -$LIB .= " -lgdal ";
-+$LIB .= " -lgdal1.7.0 ";
++$LIB .= " -lgdal1.8.0 ";
  if ($fh) {
      @config = <$fh>;
      close $fh;
diff --git a/debian/patches/python b/debian/patches/python
index 146f4d8..2df662b 100644
--- a/debian/patches/python
+++ b/debian/patches/python
@@ -7,6 +7,6 @@ Index: gdal/swig/python/setup.cfg
  #include_dirs = ../../port:../../gcore:../../alg:../../ogr/ 
  #library_dirs = ../../.libs:../../ 
 -#libraries = gdal 
-+libraries = gdal1.7.0 
++libraries = gdal1.8.0 
  gdal_config=../../apps/gdal-config
  

-- 
GDAL/OGR library and tools