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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit b9328f2a86183d015a3da1510114f4e160144626
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 2 21:20:42 2013 +0200

    Add patch to install the Ruby mapscript extension: install-ruby-mapscript.patch.

diff --git a/debian/changelog b/debian/changelog
index 5bec8c1..0f9e04c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
     - php_segfault.patch (applied upstream)
     - mapows-contenttype.patch (applied upstream)
     - shp2img-typo.patch (applied upstream)
+  * Add patch to install the Ruby mapscript extension:
+    install-ruby-mapscript.patch
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/patches/install-ruby-mapscript.patch b/debian/patches/install-ruby-mapscript.patch
new file mode 100644
index 0000000..f825f68
--- /dev/null
+++ b/debian/patches/install-ruby-mapscript.patch
@@ -0,0 +1,20 @@
+Description: Install Ruby mapscript with CMake
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Bug: https://github.com/mapserver/mapserver/pull/4749
+Applied-Upstream: 6.4.0, https://github.com/mapserver/mapserver/commit/1cfdd59ff246d7c8b74a1894a30232600ea67fe2
+Last-Update: 2013-09-02
+--- a/mapscript/ruby/CMakeLists.txt
++++ b/mapscript/ruby/CMakeLists.txt
+@@ -12,9 +12,6 @@ SWIG_LINK_LIBRARIES(rubymapscript ${RUBY
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES PREFIX "")
+ set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES OUTPUT_NAME mapscript)
+ 
+-#get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_mapscript_REAL_NAME} LOCATION)
+-#set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py)
+-#install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES})
+-
+-#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py DESTINATION ${PYTHON_SITE_PACKAGES})
+-#install(TARGETS mapscript DESTINATION ${PYTHON_SITE_PACKAGES})
++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})
diff --git a/debian/patches/series b/debian/patches/series
index 49df62d..8f553f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hardening.patch
 ruby-shebang.patch
+install-ruby-mapscript.patch
diff --git a/debian/ruby-mapscript.install b/debian/ruby-mapscript.install
new file mode 100644
index 0000000..1b95a42
--- /dev/null
+++ b/debian/ruby-mapscript.install
@@ -0,0 +1 @@
+usr/lib/ruby/*/*/mapscript.so

-- 
Packaging for MapServer