The following commit has been merged in the master branch: commit 27caa9fa623a2e194577f8acf016805505e31529 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Sep 21 19:21:56 2013 +0200
Add patch to export mapserver.cmake for external projects. diff --git a/debian/changelog b/debian/changelog index e9dc433..0b46528 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mapserver (6.4.0-2) UNRELEASED; urgency=low Required to build MapCache with MapServer support. * Use php5enmod and php5dismod instead of installing the ini directly. (closes: #667771) + * Add patch to export mapserver.cmake for external projects. -- Bas Couwenberg <sebas...@xs4all.nl> Thu, 19 Sep 2013 19:52:12 +0200 diff --git a/debian/libmapserver1-dev.install b/debian/libmapserver1-dev.install index 37c593f..193f248 100644 --- a/debian/libmapserver1-dev.install +++ b/debian/libmapserver1-dev.install @@ -1,2 +1,3 @@ usr/include/mapserver/* usr/lib/*/libmapserver.so +usr/share/mapserver/ diff --git a/debian/patches/cmake-mapserver-export.patch b/debian/patches/cmake-mapserver-export.patch new file mode 100644 index 0000000..af32a55 --- /dev/null +++ b/debian/patches/cmake-mapserver-export.patch @@ -0,0 +1,17 @@ +Description: Export mapserver.cmake for outside projects. +Author: Bas Couwenberg <sebas...@xs4all.nl> +Last-Update: 2013-10-21 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -885,8 +885,9 @@ if(USE_SDE92) + INSTALL(TARGETS msplugin_sde92 DESTINATION lib) + endif(USE_SDE92) + +-INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv mapserver RUNTIME DESTINATION bin LIBRARY DESTINATION lib) ++INSTALL(TARGETS sortshp shptree shptreevis msencrypt legend scalebar tile4ms shptreetst shp2img mapserv RUNTIME DESTINATION bin) ++INSTALL(TARGETS mapserver EXPORT mapserver LIBRARY DESTINATION lib) + if(BUILD_STATIC) + INSTALL(TARGETS mapserver_static DESTINATION lib) + endif(BUILD_STATIC) +- ++INSTALL(EXPORT mapserver DESTINATION share/mapserver/cmake) diff --git a/debian/patches/series b/debian/patches/series index 9b989b3..f2af883 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ hardening.patch ruby-shebang.patch perl-mapscript-install.patch ruby-mapscript-install.patch +cmake-mapserver-export.patch diff --git a/debian/rules b/debian/rules index 19950ef..e02345e 100755 --- a/debian/rules +++ b/debian/rules @@ -110,6 +110,7 @@ override_dh_auto_install: -mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ -mv -v $(CURDIR)/debian/tmp/usr/lib/libmapserver*.so* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ + -sed -i "s/lib\/libmapserver/lib\/$(DEB_HOST_MULTIARCH)\/libmapserver/g" $(CURDIR)/debian/tmp/usr/share/*/cmake/*.cmake # removing embedded rpath in binaries -find $(CURDIR)/debian/tmp/usr/bin -type f -exec chrpath --delete {} \; -- Packaging for MapServer _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel