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

[Bas Couwenberg]

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

    Add patch to fix the Perl mapscript module installation directory: perl-mapscript-install.patch.

diff --git a/debian/changelog b/debian/changelog
index 0f9e04c..56cf633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ mapserver (6.4.0~beta2-1) UNRELEASED; urgency=low
     - shp2img-typo.patch (applied upstream)
   * Add patch to install the Ruby mapscript extension:
     install-ruby-mapscript.patch
+  * Add patch to fix the Perl mapscript module installation directory:
+    perl-mapscript-install.patch
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 01 Sep 2013 14:14:54 +0200
 
diff --git a/debian/libmapscript-perl.install b/debian/libmapscript-perl.install
new file mode 100644
index 0000000..1312331
--- /dev/null
+++ b/debian/libmapscript-perl.install
@@ -0,0 +1 @@
+usr/lib/perl5/
diff --git a/debian/patches/perl-mapscript-install.patch b/debian/patches/perl-mapscript-install.patch
new file mode 100644
index 0000000..2a639cf
--- /dev/null
+++ b/debian/patches/perl-mapscript-install.patch
@@ -0,0 +1,23 @@
+Description: Fix the Perl mapscript module installation directory.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-09-02
+--- a/mapscript/perl/CMakeLists.txt
++++ b/mapscript/perl/CMakeLists.txt
+@@ -2,7 +2,7 @@ FIND_PACKAGE(SWIG REQUIRED)
+ INCLUDE(${SWIG_USE_FILE})
+ FIND_PACKAGE(Perl REQUIRED)
+ FIND_PACKAGE(PerlLibs REQUIRED)
+-set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITEARCH} CACHE DIR "Custom installation directory for perl binary extension")
++set(CUSTOM_PERL_VENDOR_ARCH_DIR ${PERL_VENDORARCH} CACHE DIR "Custom installation directory for perl binary extension")
+ INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH})
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/swiginc)
+ include_directories(${PROJECT_SOURCE_DIR}/mapscript/)
+@@ -20,6 +20,6 @@ endif(APPLE)
+ 
+ get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_perlmapscript_REAL_NAME} LOCATION)
+ set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm)
+-install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR}/auto/mapscript)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm DESTINATION ${CUSTOM_PERL_SITE_ARCH_DIR})
++install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR}/auto/mapscript)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR})
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8f553f0..f4ce7d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 hardening.patch
 ruby-shebang.patch
 install-ruby-mapscript.patch
+perl-mapscript-install.patch

-- 
Packaging for MapServer