[SCM] mapserver branch, jessie, updated. upstream/6.4.0_rc1-149-g8bd16be
The following commit has been merged in the jessie 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 000..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
[SCM] mapserver branch, jessie, updated. upstream/6.4.0_rc1-149-g8bd16be
The following commit has been merged in the jessie branch: commit 8bd16bebefa60b3d24836142cb9dc80199cb5a1a Author: Bas Couwenberg sebas...@xs4all.nl Date: Sat Sep 21 22:15:53 2013 +0200 Add versioned Breaks/Replaces for transitional packages. diff --git a/debian/changelog b/debian/changelog index 0b46528..3335b68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mapserver (6.4.0-2) UNRELEASED; urgency=low * Use php5enmod and php5dismod instead of installing the ini directly. (closes: #667771) * Add patch to export mapserver.cmake for external projects. + * Add versioned Breaks/Replaces for transitional packages. (closes: #723979) -- Bas Couwenberg sebas...@xs4all.nl Thu, 19 Sep 2013 19:52:12 +0200 diff --git a/debian/control b/debian/control index 6ac0cdd..783ba3b 100644 --- a/debian/control +++ b/debian/control @@ -86,9 +86,9 @@ Suggests: cgi-mapserver, ruby-mapscript Pre-Depends: ${misc:Pre-Depends} Breaks: libmapserver ( 6.2.1-3~), -libmapserver-6.2.1 +libmapserver-6.2.1 ( 6.4.0-1~) Replaces: libmapserver ( 6.2.1-3~), - libmapserver-6.2.1 + libmapserver-6.2.1 ( 6.4.0-1~) Description: Shared library for MapServer This package contains the shared library. . @@ -130,9 +130,9 @@ Suggests: cgi-mapserver, python-mapscript, ruby-mapscript Breaks: libmapserver-dev ( 6.2.1-3~), -libmapserver-6.2.1-dev +libmapserver-6.2.1-dev ( 6.4.0-1~) Replaces: libmapserver-dev ( 6.2.1-3~), - libmapserver-6.2.1-dev + libmapserver-6.2.1-dev ( 6.4.0-1~) Description: Shared library development files for MapServer This package contains the development files for the shared library. . @@ -281,14 +281,15 @@ Depends: ruby1.9.1, ${misc:Depends} Suggests: mapserver-bin, mapserver-doc -Breaks: libmapscript-ruby, -libmapscript-ruby1.8 +Breaks: libmapscript-ruby ( 6.4.0-1~), +libmapscript-ruby1.8 ( 6.4.0-1~), +libmapscript-ruby1.9.1 ( 6.4.0-1~) Provides: libmapscript-ruby, libmapscript-ruby1.8, libmapscript-ruby1.9.1 -Replaces: libmapscript-ruby, - libmapscript-ruby1.8, - libmapscript-ruby1.9.1 +Replaces: libmapscript-ruby ( 6.4.0-1~), + libmapscript-ruby1.8 ( 6.4.0-1~), + libmapscript-ruby1.9.1 ( 6.4.0-1~) XB-Ruby-Versions: ruby1.9.1 Description: MapServer library for Ruby Ruby MapScript provides MapServer functions for Ruby scripts. -- 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