[SCM] gdal branch, master, updated. upstream/1.9.2-127-ge7ab310

[Francesco P. Lovergine]

The following commit has been merged in the master branch:
commit e7ab310c425bcb5fe5e009eb5eb2afcd31e8a4db
Author: Francesco P. Lovergine <francesco at lovergine.com>
Date:   Fri Mar 29 19:59:16 2013 +0100

    Merging NMU and a few other long pending changes.

diff --git a/debian/changelog b/debian/changelog
index d95cb37..8440f84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
-gdal (1.9.2-1~exp2) experimental; urgency=low
+gdal (1.9.2-1~exp2) UNRELEASED; urgency=low
 
   * Moved to new LIBKML driver instead of the old KML one. It has a much
     better support for complex KML files.
+  * Merged NMU 1.9.0-3.1:
+    Fix "FTBFS when ruby1.9.1 installed": force building with ruby1.8:
+    set variables in debian/rules and new patch force-ruby1.8 to ruby1.8.
+    Thanks to Cédric Boutillier for reviewing and testing this patch.
+    (Closes: #684433)
+  * Added libarmadillo support.
+  * Restored hidden symbols to better manage conflicts in linking both 
+    libgeotiff and gdal. Fix working for Orfeotoolbox.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Sun, 04 Mar 2012 11:39:57 +0100
 
diff --git a/debian/patches/force-ruby1.8 b/debian/patches/force-ruby1.8
new file mode 100644
index 0000000..3990bf1
--- /dev/null
+++ b/debian/patches/force-ruby1.8
@@ -0,0 +1,34 @@
+Description: force building with ruby 1.8
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/684433
+Forwarded: no
+Author: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-09-18
+
+--- a/swig/ruby/RubyMakefile.mk
++++ b/swig/ruby/RubyMakefile.mk
+@@ -13,18 +13,18 @@
+ 
+ BINDING = ruby
+ GDAL_ROOT = ../..
+-RUBY = ruby
++RUBY = ruby1.8
+ 
+ include $(GDAL_ROOT)/GDALmake.opt
+ 
+ RUBY_MODULES_LIN = gdal.so ogr.so gdalconst.so osr.so  # Linux, Solaris, ...
+ RUBY_MODULES_MAC = gdal.bundle ogr.bundle gdalconst.bundle osr.bundle # Darwin
+ 
+-RUBY_INCLUDE_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']")
+-RUBY_ARCH_INCLUDE_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['rubyhdrdir'] + '/' + Config::CONFIG['arch'] unless Config::CONFIG['rubyhdrdir'].nil?")
+-RUBY_LIB_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['libdir']")
+-RUBY_SO_NAME := $(shell ruby -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']")
+-RUBY_EXTENSIONS_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
++RUBY_INCLUDE_DIR := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']")
++RUBY_ARCH_INCLUDE_DIR := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['rubyhdrdir'] + '/' + Config::CONFIG['arch'] unless Config::CONFIG['rubyhdrdir'].nil?")
++RUBY_LIB_DIR := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['libdir']")
++RUBY_SO_NAME := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']")
++RUBY_EXTENSIONS_DIR := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+ INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
+ 
+ ifeq ($(RUBY_ARCH_INCLUDE_DIR),)
diff --git a/debian/patches/series b/debian/patches/series
index f1d5778..95e771e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ ecw-plugin
 mrsid-plugin
 symver
 spatialite
+force-ruby1.8
diff --git a/debian/rules b/debian/rules
index 704801f..c7c798f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,7 @@ configure-stamp:
 			--includedir=\$$\{prefix\}/include/gdal \
 			--with-threads \
 			--with-grass=no \
+			--with-hide-internal-symbols=yes \
 			--with-libtiff=internal \
 			--with-geotiff=internal \
 			--with-jasper \

-- 
GDAL/OGR library and tools