[SCM] mapserver branch, master, updated. upstream/6.2.1-131-gc8fa915

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit c8fa9158ffaf7afbada3709e72122c741c34ce19
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 11 11:58:05 2013 +0200

    Add patch to install ruby mapscript into vendorarchdir instead of archdir.

diff --git a/debian/changelog b/debian/changelog
index c6f0585..ec37a4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
   * Rename WITH_THREADS to WITH_THREAD_SAFETY.
   * Drop patch install-ruby-mapscript.patch, applied upstream.
   * Add patch to rename WITH_THREADS to WITH_THREAD_SAFETY in INSTALL.CMAKE.
+  * Add patch to install ruby mapscript into vendorarchdir instead of archdir.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 07 Sep 2013 20:56:16 +0200
 
diff --git a/debian/patches/ruby-mapscript-install.patch b/debian/patches/ruby-mapscript-install.patch
new file mode 100644
index 0000000..9e45736
--- /dev/null
+++ b/debian/patches/ruby-mapscript-install.patch
@@ -0,0 +1,13 @@
+Description: Install Ruby mapscript to vendorarchdir instead of archdir.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-09-11
+--- a/mapscript/ruby/CMakeLists.txt
++++ b/mapscript/ruby/CMakeLists.txt
+@@ -30,5 +30,5 @@ set_target_properties(${SWIG_MODULE_ruby
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES OUTPUT_NAME mapscript)
+ 
+ get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME} LOCATION)
+-execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['archdir']" OUTPUT_VARIABLE RUBY_ARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+-install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_ARCHDIR})
++execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDORARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
++install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_VENDORARCHDIR})
diff --git a/debian/patches/series b/debian/patches/series
index b1b1b94..b8dc8f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hardening.patch
 ruby-shebang.patch
 perl-mapscript-install.patch
 install-threads.patch
+ruby-mapscript-install.patch
diff --git a/debian/ruby-mapscript.install b/debian/ruby-mapscript.install
index 1b95a42..f3e7ea1 100644
--- a/debian/ruby-mapscript.install
+++ b/debian/ruby-mapscript.install
@@ -1 +1 @@
-usr/lib/ruby/*/*/mapscript.so
+usr/lib/ruby/vendor_ruby/*/*/mapscript.so

-- 
Packaging for MapServer