[mapserver] 02/03: Add patch to install mapserver target only once.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapserver.

commit bf3f1c310f02788ac9b27cd216c248b7484f9c71
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 12 17:13:10 2015 +0200

    Add patch to install mapserver target only once.
---
 debian/changelog                                   |  1 +
 .../patches/dont-install-headers-in-usr-lib.patch  | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 -
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 32a2f3c..52f49af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mapserver (7.0.0-5) UNRELEASED; urgency=medium
 
   * Add patch to add ARCHIVE install target for Windows builds.
+  * Add patch to install mapserver target only once.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 12 Sep 2015 16:09:34 +0200
 
diff --git a/debian/patches/dont-install-headers-in-usr-lib.patch b/debian/patches/dont-install-headers-in-usr-lib.patch
new file mode 100644
index 0000000..67625bd
--- /dev/null
+++ b/debian/patches/dont-install-headers-in-usr-lib.patch
@@ -0,0 +1,35 @@
+Description: Don't install the headers in /usr/lib too.
+ The mapserver target only needs to be installed when BUILD_DYNAMIC is true.
+ Also add staticlib component for mapserver_static.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -974,18 +974,19 @@ endif(USE_MSSQL2008)
+ INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv
+         RUNTIME DESTINATION ${INSTALL_BIN_DIR} COMPONENT bin
+ )
+-INSTALL(TARGETS mapserver
+-        EXPORT mapserverTargets
+-        ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
+-        LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
+-        PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
+-)
+ 
+ if(BUILD_STATIC)
+-   INSTALL(TARGETS mapserver_static DESTINATION ${INSTALL_LIB_DIR})
++   INSTALL(TARGETS mapserver_static
++           DESTINATION ${INSTALL_LIB_DIR} COMPONENT staticlib
++   )
+ endif(BUILD_STATIC)
+ if(BUILD_DYNAMIC)
+-   INSTALL(TARGETS mapserver DESTINATION ${INSTALL_LIB_DIR})
++   INSTALL(TARGETS mapserver
++           EXPORT mapserverTargets
++           ARCHIVE DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
++           LIBRARY DESTINATION ${INSTALL_LIB_DIR} COMPONENT shlib
++           PUBLIC_HEADER DESTINATION ${INSTALL_INCLUDE_DIR}/mapserver COMPONENT dev
++   )
+ endif(BUILD_DYNAMIC)
+ 
+ # Add all targets to the build-tree export set
diff --git a/debian/patches/series b/debian/patches/series
index 2ef82c3..3eddf6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ ruby-mapscript-install.patch
 cmake-mapserver-export.patch
 java-hardening.patch
 windows-archive-install-target.patch
+dont-install-headers-in-usr-lib.patch
diff --git a/debian/rules b/debian/rules
index 27759bd..bc376e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -157,7 +157,6 @@ override_dh_installexamples:
 	chmod a-x $(CURDIR)/debian/php*-mapscript/usr/share/doc/php*-mapscript/examples/*.phtml
 
 override_dh_install:
-	$(RM) debian/*/usr/lib/*.h
 	dh_install --autodest --list-missing
 
 override_dh_compress:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git