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

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 51751ba83c895d1ef24986bf17e1903cf2e392ad
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 7 21:12:07 2013 +0200

    Drop patch install-ruby-mapscript.patch, applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 76315c4..62ce886 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapserver (6.4.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release: 6.4.0-rc1.
   * Rename WITH_THREADS to WITH_THREAD_SAFETY.
+  * Drop patch install-ruby-mapscript.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 07 Sep 2013 20:56:16 +0200
 
diff --git a/debian/patches/install-ruby-mapscript.patch b/debian/patches/install-ruby-mapscript.patch
deleted file mode 100644
index f825f68..0000000
--- a/debian/patches/install-ruby-mapscript.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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 f4ce7d1..d157b06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 hardening.patch
 ruby-shebang.patch
-install-ruby-mapscript.patch
 perl-mapscript-install.patch

-- 
Packaging for MapServer