[SCM] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit beb9dd16de7b204400931c24d7dbe6505c313d36 Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Sep 17 20:40:26 2013 +0200 Drop obsolete patch: includepath.patch. diff --git a/debian/changelog b/debian/changelog index ed3a6ba..a78672f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low * Update watch file for github releases. * Build system changed from autotools to cmake. * Drop patches: +- includepath.patch (no longer required) - fixwithmapserv.patch (libtool no longer used) - libmapcache_hardening.patch (libtool no longer used) - demo_service_js_typos.patch (applied upstream) diff --git a/debian/patches/includepath.patch b/debian/patches/includepath.patch deleted file mode 100644 index 71924b3..000 --- a/debian/patches/includepath.patch +++ /dev/null @@ -1,14 +0,0 @@ -Description: Set include for mapserver.h as used by the mapserver package. -Author: Jerome Villeneuve Larouche jlarou...@mapgears.com -Last-Update: 2013-06-12 a/lib/source_mapserver.c -+++ b/lib/source_mapserver.c -@@ -38,7 +38,7 @@ - #endif - #include apr_hash.h - #include apr_reslist.h --#include mapserver.h -+#include mapserver/mapserver.h - - /* hash table key = source-name, value = apr_reslist_t of mapObjs */ - static apr_hash_t *mapobj_container = NULL; diff --git a/debian/patches/series b/debian/patches/series index b7db54b..261bd5e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -includepath.patch mapcache_seed_typo.patch cmake-with-mapserver.patch allow-building-with-mapserver.patch -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit 478a1f99cc6bf47e098b213c70c37a7e31b42117 Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Sep 17 20:26:28 2013 +0200 Update watch file for github releases. diff --git a/debian/changelog b/debian/changelog index 8ebb146..ed3a6ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ -mapcache (1.1dev+ee206af-1) UNRELEASED; urgency=low +mapcache (1.2.0-1) UNRELEASED; urgency=low - * New upstream development snapshot 1.1dev+ee206af. + * New upstream release 1.2.0. + * Update watch file for github releases. * Build system changed from autotools to cmake. * Drop patches: - fixwithmapserv.patch (libtool no longer used) diff --git a/debian/watch b/debian/watch index c9e1131..37d354a 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://download.osgeo.org/mapserver/mapcache-(\d.+).tar.gz +opts=uversionmangle=s/\-/\./g https://github.com/mapserver/mapcache/releases .*/rel-(\d[\d\-]+)\.tar\.gz -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit ac91e8382aaa1216698d2077de6180df0d9a9d4b Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Sep 18 00:45:27 2013 +0200 Update libmapserver dependency for MapServer 6.4.0. diff --git a/debian/changelog b/debian/changelog index 9181d54..a9cb65f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low - * New upstream release 1.2.0. + * New upstream release 1.2.0. (closes: #712377) * Update watch file for github releases. * Build system changed from autotools to cmake. * Drop patches: @@ -24,6 +24,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low * Update libmapcache symbols for 1.2.0 on amd64. * Enable verbose make output. * Call ldconfig in libmapcache postinst and postrm. + * Update libmapserver dependency for MapServer 6.4.0. -- Bas Couwenberg sebas...@xs4all.nl Wed, 11 Sep 2013 19:16:06 +0200 diff --git a/debian/control b/debian/control index 67d8514..c07e6cf 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), apache2-dev, dh-apache2, libfcgi-dev, libpcre3-dev, libpixman-1-dev, libsqlite3-dev, libtiff4-dev, - libmapserver-6.2.1, libmapserver-6.2.1-dev, + libmapserver1, libmapserver1-dev, chrpath, cmake (= 2.8.0), pkg-config, pkg-kde-tools, docbook2x, docbook-xsl, docbook-xml, xsltproc Standards-Version: 3.9.4 -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit 21093c216d489367e9f91daf7668ac56b7859616 Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Sep 17 20:48:27 2013 +0200 Drop debug finds. diff --git a/debian/rules b/debian/rules index f90d75b..0afcb75 100755 --- a/debian/rules +++ b/debian/rules @@ -55,18 +55,12 @@ COMMON_CONFIG = -DCMAKE_INSTALL_PREFIX=/usr \ override_dh_clean: dh_clean - # Listing files after dh_clean - find $(CURDIR) -type f | sort - -$(RM) -rf build/ -$(RM) nginx/config override_dh_auto_configure: mkdir -p build cd build cmake .. -DCMAKE_BUILD_TYPE=Release $(COMMON_CONFIG) - # Listing files after dh_auto_configure - find $(CURDIR) -type f | sort - override_dh_auto_build: # Create man page from DocBook XML -docbook2x-man $(CURDIR)/debian/mapcache_seed.1.xml @@ -74,15 +68,9 @@ override_dh_auto_build: $(MAKE) -C build VERBOSE=$(MAKE_VERBOSE) - # Listing files after dh_auto_build - find $(CURDIR) -type f | sort - override_dh_auto_install: $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp VERBOSE=$(MAKE_VERBOSE) - # Listing files after dh_auto_install - find $(CURDIR) -type f | sort - -mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ -mv -v $(CURDIR)/debian/tmp/usr/lib/libmapcache*.so* $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch:
commit fd2cdb8076837cfe140e8b12c26c0701f11b3f93
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Tue Sep 17 22:10:44 2013 +0200
Drop obsolete patch: allow-building-with-mapserver.patch.
diff --git a/debian/changelog b/debian/changelog
index bd5e45d..7d2e6e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,6 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
- mapcache_seed_non_zero_exit.patch (applied upstream)
- mapcache_seed_delete_mode.patch (applied upstream)
- mapcache_seed_typo.patch (applied upstream)
- * Add patch from upstream to fix building with mapserver.
* SONAME of libmapcache changed from libmapcache.so.0 to
libmapcache.so.
* Enable verbose make output.
diff --git a/debian/patches/allow-building-with-mapserver.patch
b/debian/patches/allow-building-with-mapserver.patch
deleted file mode 100644
index 65fe10a..000
--- a/debian/patches/allow-building-with-mapserver.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Allow building with mapserver sources (#81)
-Author: Thomas Bonfort thomas.bonf...@gmail.com
-Origin:
https://github.com/mapserver/mapcache/commit/9cc636a0f7d0d4838623cafb57e1f4e3c3f83c1b
-Last-Update: 2013-09-16
a/lib/source_mapserver.c
-+++ b/lib/source_mapserver.c
-@@ -27,10 +27,11 @@
- * DEALINGS IN THE SOFTWARE.
-
*/
-
--#ifdef USE_MAPSERVER
-
- #include mapcache.h
- #include ezxml.h
-+
-+#ifdef USE_MAPSERVER
- #include apr_tables.h
- #include apr_strings.h
- #ifdef APR_HAS_THREADS
-@@ -273,7 +274,11 @@ mapcache_source*
mapcache_source_mapserver_create(mapcache_context *ctx)
- source-source.query_info = _mapcache_source_mapserver_query;
- return (mapcache_source*)source;
- }
--
-+#else
-+mapcache_source* mapcache_source_mapserver_create(mapcache_context *ctx)
-+{
-+ ctx-set_error(ctx, 500, mapserver source not configured for this build);
-+}
- #endif
-
- /* vim: ts=2 sts=2 et sw=2
diff --git a/debian/patches/series b/debian/patches/series
index 6116c28..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-allow-building-with-mapserver.patch
--
Packaging for MapCache
___
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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit d57e2dd19f17c88e39e70e40a441ce3824132017 Merge: 478a1f99cc6bf47e098b213c70c37a7e31b42117 b3e567f69c1dcef4c9d1b12211689df82d7d5d5f Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Sep 17 20:31:35 2013 +0200 Merge upstream release 1.2.0 from branch 'upstream' Conflicts: CMakeLists.txt include/mapcache-config.h.in -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch:
commit 60b71e6e6cc9292e9c75ac71840ac5dcceb547c0
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Tue Sep 17 22:08:56 2013 +0200
Drop obsolete patch: mapcache_seed_typo.patch.
diff --git a/debian/changelog b/debian/changelog
index a78672f..3fa9beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
- demo_service_indenting.patch (applied upstream)
- mapcache_seed_non_zero_exit.patch (applied upstream)
- mapcache_seed_delete_mode.patch (applied upstream)
- * Refresh mapcache_seed_typo.patch.
+- mapcache_seed_typo.patch (applied upstream)
* Add patch to support building with mapserver.
* Add patch from upstream to fix building with mapserver.
* SONAME of libmapcache changed from libmapcache.so.0 to
diff --git a/debian/patches/mapcache_seed_typo.patch
b/debian/patches/mapcache_seed_typo.patch
deleted file mode 100644
index 24279f9..000
--- a/debian/patches/mapcache_seed_typo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix typo in mapcache_seed utility.
-Author: Bas Couwenberg sebas...@xs4all.nl
-Bug: https://github.com/mapserver/mapcache/pull/83
-Applied-Upstream:
https://github.com/mapserver/mapcache/commit/fd657d632d6f633d0d2d21ce4dfa7f3deb64944d
-Last-Update: 2013-07-23
a/util/mapcache_seed.c
-+++ b/util/mapcache_seed.c
-@@ -1072,11 +1072,11 @@ int main(int argc, const char **argv)
-
- if (mode == MAPCACHE_CMD_TRANSFER) {
- if (!tileset_transfer_name)
-- return usage(argv[0],tileset where tiles should be transfered to not
specified);
-+ return usage(argv[0],tileset where tiles should be transferred to not
specified);
-
- tileset_transfer =
mapcache_configuration_get_tileset(cfg,tileset_transfer_name);
- if(!tileset_transfer)
-- return usage(argv[0], tileset where tiles should be transfered to not
found in configuration);
-+ return usage(argv[0], tileset where tiles should be transferred to not
found in configuration);
- }
-
- if(old) {
diff --git a/debian/patches/series b/debian/patches/series
index 261bd5e..f309f6f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-mapcache_seed_typo.patch
cmake-with-mapserver.patch
allow-building-with-mapserver.patch
--
Packaging for MapCache
___
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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch:
commit 2737f47d2a2fca1681a0f57fc9154e6190d64301
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Tue Sep 17 22:09:58 2013 +0200
Drop obsolete patch: cmake-with-mapserver.patch.
diff --git a/debian/changelog b/debian/changelog
index 3fa9beb..bd5e45d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,6 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
- mapcache_seed_non_zero_exit.patch (applied upstream)
- mapcache_seed_delete_mode.patch (applied upstream)
- mapcache_seed_typo.patch (applied upstream)
- * Add patch to support building with mapserver.
* Add patch from upstream to fix building with mapserver.
* SONAME of libmapcache changed from libmapcache.so.0 to
libmapcache.so.
diff --git a/debian/patches/cmake-with-mapserver.patch
b/debian/patches/cmake-with-mapserver.patch
deleted file mode 100644
index 8cc6149..000
--- a/debian/patches/cmake-with-mapserver.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Add (optional) support for mapserver with CMake.
-Author: Bas Couwenberg sebas...@xs4all.nl
-Origin:
https://github.com/sebastic/mapcache/commit/d3e88cc808ea13fe4c562bdb2d867fad6fc300f2
-Bug: https://github.com/mapserver/mapcache/pull/81
-Applied-Upstream: https://github.com/mapserver/mapcache/commit/08a8265234734
-Last-Update: 2013-09-08
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,6 +76,7 @@ option(WITH_TIFF Use TIFFs as a cache b
- option(WITH_TIFF_WRITE_SUPPORT Enable (experimental) support for writable
TIFF cache backends OFF)
- option(WITH_GEOTIFF Allow GeoTIFF metadata creation for TIFF cache backends
OFF)
- option(WITH_PCRE Use PCRE for regex tests OFF)
-+option(WITH_MAPSERVER Enable (experimental) support for the mapserver
library OFF)
-
- find_package(PNG)
- if(PNG_FOUND)
-@@ -212,6 +213,17 @@ if(WITH_GEOTIFF)
- endif(GEOTIFF_FOUND)
- endif (WITH_GEOTIFF)
-
-+if(WITH_MAPSERVER)
-+ find_package(MAPSERVER)
-+ if(MAPSERVER_FOUND)
-+include_directories(${MAPSERVER_INCLUDE_DIR})
-+target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
-+set (USE_MAPSERVER 1)
-+ else(MAPSERVER_FOUND)
-+report_optional_not_found(MAPSERVER)
-+ endif(MAPSERVER_FOUND)
-+endif (WITH_MAPSERVER)
-+
-
- if(UNIX)
- target_link_libraries(mapcache ${CMAKE_DL_LIBS} m )
-@@ -259,6 +271,7 @@ status_optional_component(TIFF ${USE_
- status_optional_component(GeoTIFF ${USE_GEOTIFF} ${GEOTIFF_LIBRARY})
- status_optional_component(Experimental TIFF write support
${USE_TIFF_WRITE} ${TIFF_LIBRARY})
- status_optional_component(PCRE ${USE_PCRE} ${PCRE_LIBRARY})
-+status_optional_component(Experimental mapserver support ${USE_MAPSERVER}
${MAPSERVER_LIBRARY})
-
- INSTALL(TARGETS mapcache DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
/dev/null
-+++ b/cmake/FindMAPSERVER.cmake
-@@ -0,0 +1,15 @@
-+
-+FIND_PATH(MAPSERVER_INCLUDE_DIR
-+NAMES mapserver.h
-+PATH_SUFFIXES mapserver
-+)
-+
-+FIND_LIBRARY(MAPSERVER_LIBRARY
-+NAMES mapserver
-+)
-+
-+set(MAPSERVER_INCLUDE_DIRS ${MAPSERVER_INCLUDE_DIR})
-+set(MAPSERVER_LIBRARIES ${MAPSERVER_LIBRARY})
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY
MAPSERVER_INCLUDE_DIR)
-+mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR)
a/include/mapcache-config.h.in
-+++ b/include/mapcache-config.h.in
-@@ -10,6 +10,7 @@
- #cmakedefine USE_TIFF_WRITE 1
- #cmakedefine USE_GEOTIFF 1
- #cmakedefine USE_PCRE 1
-+#cmakedefine USE_MAPSERVER 1
-
- #cmakedefine HAVE_STRNCASECMP 1
- #cmakedefine HAVE_SYMLINK 1
diff --git a/debian/patches/series b/debian/patches/series
index f309f6f..6116c28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-cmake-with-mapserver.patch
allow-building-with-mapserver.patch
--
Packaging for MapCache
___
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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit 4574f04b06591d1eba4385aa43c0bd5d56b7ce87 Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Sep 17 22:20:34 2013 +0200 Use pkgkde-gensymbols pkgkde-symbolshelper to handle symbols. diff --git a/debian/changelog b/debian/changelog index 7d2e6e8..07d5a76 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low - mapcache_seed_non_zero_exit.patch (applied upstream) - mapcache_seed_delete_mode.patch (applied upstream) - mapcache_seed_typo.patch (applied upstream) + * Use pkgkde-gensymbols pkgkde-symbolshelper to handle symbols. * SONAME of libmapcache changed from libmapcache.so.0 to libmapcache.so. * Enable verbose make output. diff --git a/debian/control b/debian/control index 94507ee..a80c218 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: debhelper (= 9), dpkg-dev (= 1.16.1.1), libpcre3-dev, libpixman-1-dev, libsqlite3-dev, libtiff4-dev, libmapserver-6.2.1, libmapserver-6.2.1-dev, - chrpath, cmake (= 2.8.0), pkg-config, + chrpath, cmake (= 2.8.0), pkg-config, pkg-kde-tools, docbook2x, docbook-xsl, docbook-xml, xsltproc Standards-Version: 3.9.4 Homepage: http://www.mapserver.org/en/mapcache/ diff --git a/debian/libmapcache.symbols b/debian/libmapcache.symbols index c9d5146..459e793 100644 --- a/debian/libmapcache.symbols +++ b/debian/libmapcache.symbols @@ -1,3 +1,4 @@ +# SymbolsHelper-Confirmed: 1.0.0 amd64 libmapcache.so #PACKAGE# #MINVER# EZXML_NIL@Base 1.0.0 _configuration_parse_wms_xml@Base 1.0.0 diff --git a/debian/rules b/debian/rules index 0afcb75..92038d0 100755 --- a/debian/rules +++ b/debian/rules @@ -50,7 +50,7 @@ COMMON_CONFIG = -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_OGR=1 %: - dh $@ --with apache2 + dh $@ --with apache2,pkgkde_symbolshelper override_dh_clean: dh_clean -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit 0771daf41c345ea31ee8f1577601a21407e4dfea Author: Bas Couwenberg sebas...@xs4all.nl Date: Wed Sep 18 00:45:51 2013 +0200 Set distribution to unstable. diff --git a/debian/changelog b/debian/changelog index a9cb65f..d4285a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mapcache (1.2.0-1) UNRELEASED; urgency=low +mapcache (1.2.0-1) unstable; urgency=low * New upstream release 1.2.0. (closes: #712377) * Update watch file for github releases. -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit 65ab5ea86bc853059bde16cf459ad67a196dbd72 Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Sep 17 22:42:22 2013 +0200 Update libmapcache symbols for 1.2.0 on amd64. diff --git a/debian/changelog b/debian/changelog index 07d5a76..0533a0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low * Use pkgkde-gensymbols pkgkde-symbolshelper to handle symbols. * SONAME of libmapcache changed from libmapcache.so.0 to libmapcache.so. + * Update libmapcache symbols for 1.2.0 on amd64. * Enable verbose make output. -- Bas Couwenberg sebas...@xs4all.nl Wed, 11 Sep 2013 19:16:06 +0200 diff --git a/debian/libmapcache.symbols b/debian/libmapcache.symbols index 459e793..c630752 100644 --- a/debian/libmapcache.symbols +++ b/debian/libmapcache.symbols @@ -1,10 +1,11 @@ -# SymbolsHelper-Confirmed: 1.0.0 amd64 +# SymbolsHelper-Confirmed: 1.2.0 amd64 libmapcache.so #PACKAGE# #MINVER# EZXML_NIL@Base 1.0.0 _configuration_parse_wms_xml@Base 1.0.0 _create_capabilities_demo@Base 1.0.0 _create_capabilities_gmaps@Base 1.0.0 _create_capabilities_kml@Base 1.0.0 + _create_capabilities_mg@Base 1.2.0 _create_capabilities_tms@Base 1.0.0 _create_capabilities_ve@Base 1.0.0 _create_capabilities_wms@Base 1.0.0 @@ -12,6 +13,7 @@ libmapcache.so #PACKAGE# #MINVER# _create_demo_front@Base 1.0.0 _create_demo_gmaps@Base 1.0.0 _create_demo_kml@Base 1.0.0 + _create_demo_mapguide@Base 1.2.0 _create_demo_tms@Base 1.0.0 _create_demo_ve@Base 1.0.0 _create_demo_wms@Base 1.0.0 @@ -44,6 +46,8 @@ libmapcache.so #PACKAGE# #MINVER# _mapcache_imageio_remap_palette@Base 1.0.0 _mapcache_service_demo_parse_request@Base 1.0.0 _mapcache_service_kml_parse_request@Base 1.0.0 + _mapcache_service_mg_configuration_xml_parse@Base 1.2.0 + _mapcache_service_mg_parse_request@Base 1.2.0 _mapcache_service_tms_parse_request@Base 1.0.0 _mapcache_service_ve_parse_request@Base 1.0.0 _mapcache_service_wms_parse_request@Base 1.0.0 @@ -60,7 +64,13 @@ libmapcache.so #PACKAGE# #MINVER# _mapcache_source_wms_configuration_parse_xml@Base 1.0.0 _mapcache_source_wms_query@Base 1.0.0 _mapcache_source_wms_render_map@Base 1.0.0 + _mapcache_timedimension_sqlite_get_all_entries@Base 1.2.0 + _mapcache_timedimension_sqlite_get_entries@Base 1.2.0 + _mapcache_timedimension_sqlite_parse_xml@Base 1.2.0 _mapcache_unescape_url@Base 1.0.0 + _wmts_inspire_metadata_responselanguages@Base 1.2.0 + _wmts_service_identification_keywords@Base 1.2.0 + crc_table@Base 1.2.0 ezxml_add_child@Base 1.0.0 ezxml_ampencode@Base 1.0.0 ezxml_attr@Base 1.0.0 @@ -95,6 +105,7 @@ libmapcache.so #PACKAGE# #MINVER# ezxml_vget@Base 1.0.0 fontData@Base 1.0.0 lock_filename_for_resource@Base 1.0.0 + mapcache_assemble_maps@Base 1.2.0 mapcache_buffer_append@Base 1.0.0 mapcache_buffer_create@Base 1.0.0 mapcache_cache_disk_create@Base 1.0.0 @@ -127,8 +138,9 @@ libmapcache.so #PACKAGE# #MINVER# mapcache_dimension_regex_create@Base 1.0.0 mapcache_dimension_time_create@Base 1.0.0 mapcache_dimension_values_create@Base 1.0.0 + mapcache_empty_png_decode@Base 1.2.0 mapcache_error_image@Base 1.0.0 - mapcache_fetch_maps@Base 1.0.0 +#MISSING: 1.2.0# mapcache_fetch_maps@Base 1.0.0 mapcache_grid_compute_limits@Base 1.0.0 mapcache_grid_create@Base 1.0.0 mapcache_grid_get_cell@Base 1.0.0 @@ -153,6 +165,7 @@ libmapcache.so #PACKAGE# #MINVER# mapcache_image_copy_resampled_nearest@Base 1.0.0 mapcache_image_create@Base 1.0.0 mapcache_image_create_empty@Base 1.0.0 + mapcache_image_create_with_data@Base 1.2.0 mapcache_image_has_alpha@Base 1.0.0 mapcache_image_merge@Base 1.0.0 mapcache_image_metatile_split@Base 1.0.0 @@ -167,11 +180,13 @@ libmapcache.so #PACKAGE# #MINVER# mapcache_is_axis_inverted@Base 1.0.0 mapcache_lock_or_wait_for_resource@Base 1.0.0 mapcache_meters_per_unit@Base 1.0.0 + mapcache_ogc_strptime@Base 1.2.0 mapcache_prefetch_tiles@Base 1.0.0 mapcache_service_demo_create@Base 1.0.0 mapcache_service_dispatch_request@Base 1.0.0 mapcache_service_gmaps_create@Base 1.0.0 mapcache_service_kml_create@Base 1.0.0 + mapcache_service_mapguide_create@Base 1.2.0 mapcache_service_tms_create@Base 1.0.0 mapcache_service_ve_create@Base 1.0.0 mapcache_service_wms_create@Base 1.0.0 @@ -183,19 +198,25 @@ libmapcache.so #PACKAGE# #MINVER# mapcache_source_wms_create@Base 1.0.0 mapcache_tileset_add_watermark@Base 1.0.0 mapcache_tileset_assemble_map_tiles@Base 1.0.0 + mapcache_tileset_assemble_out_of_zoom_tile@Base 1.2.0 mapcache_tileset_clone@Base 1.0.0 mapcache_tileset_configuration_check@Base 1.0.0 mapcache_tileset_create@Base 1.0.0 mapcache_tileset_feature_info_create@Base 1.0.0 mapcache_tileset_get_map_tiles@Base 1.0.0 + mapcache_tileset_map_clone@Base 1.2.0 mapcache_tileset_map_create@Base 1.0.0 mapcache_tileset_metatile_get@Base 1.0.0
[SCM] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch: commit e6e4e1ada679396109df104b4675c6bf3d1f8390 Author: Bas Couwenberg sebas...@xs4all.nl Date: Tue Sep 17 23:05:15 2013 +0200 Call ldconfig in libmapcache postinst and postrm. diff --git a/debian/changelog b/debian/changelog index 0533a0b..a1e8d0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low libmapcache.so. * Update libmapcache symbols for 1.2.0 on amd64. * Enable verbose make output. + * Call ldconfig in libmapcache postinst and postrm. -- Bas Couwenberg sebas...@xs4all.nl Wed, 11 Sep 2013 19:16:06 +0200 diff --git a/debian/libmapcache.postinst b/debian/libmapcache.postinst index 786d689..b6944a5 100644 --- a/debian/libmapcache.postinst +++ b/debian/libmapcache.postinst @@ -7,4 +7,8 @@ set -e #DEBHELPER# +if [ $1 = configure ] ; then + ldconfig +fi + exit 0 diff --git a/debian/libmapcache.postrm b/debian/libmapcache.postrm index 786d689..767aede 100644 --- a/debian/libmapcache.postrm +++ b/debian/libmapcache.postrm @@ -7,4 +7,8 @@ set -e #DEBHELPER# +if [ $1 = remove ] ; then + ldconfig +fi + exit 0 -- Packaging for MapCache ___ 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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch:
commit 57b5e2f4ab3a875c08e91e2e2b35687f5dfa0175
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Tue Sep 17 23:41:28 2013 +0200
Add patch to use a versioned SONAME.
diff --git a/debian/changelog b/debian/changelog
index a1e8d0b..6792c31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
- mapcache_seed_delete_mode.patch (applied upstream)
- mapcache_seed_typo.patch (applied upstream)
* Use pkgkde-gensymbols pkgkde-symbolshelper to handle symbols.
+ * Add patch to use a versioned SONAME.
* SONAME of libmapcache changed from libmapcache.so.0 to
libmapcache.so.
* Update libmapcache symbols for 1.2.0 on amd64.
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..4db24c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+soname.patch
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
new file mode 100644
index 000..d53328a
--- /dev/null
+++ b/debian/patches/soname.patch
@@ -0,0 +1,17 @@
+Description: Use versioned SONAME for libmapcache.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Bug: https://github.com/mapserver/mapcache/pull/84
+Last-Update: 2013-09-18
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -66,6 +66,10 @@ set(CMAKE_LINK_INTERFACE_LIBRARY )
+ file(GLOB mapcache_SOURCES lib/*.c )
+
+ add_library(mapcache SHARED ${mapcache_SOURCES})
++set_target_properties(mapcache PROPERTIES
++ VERSION ${MAPCACHE_VERSION_STRING}
++ SOVERSION 1
++)
+
+ #options suported by the cmake builder
+ option(WITH_PIXMAN Use pixman for SSE optimized image manipulations ON)
--
Packaging for MapCache
___
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] mapcache branch, master, updated. upstream/1.0.0-86-g0771daf
The following commit has been merged in the master branch:
commit c43917bb11a0e1923b82339ceb540e54b390021d
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Tue Sep 17 23:57:10 2013 +0200
SONAME of libmapcache changed from libmapcache.so.0 to libmapcache.so.1.
diff --git a/debian/changelog b/debian/changelog
index 6792c31..9181d54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ mapcache (1.2.0-1) UNRELEASED; urgency=low
* Use pkgkde-gensymbols pkgkde-symbolshelper to handle symbols.
* Add patch to use a versioned SONAME.
* SONAME of libmapcache changed from libmapcache.so.0 to
-libmapcache.so.
+libmapcache.so.1.
* Update libmapcache symbols for 1.2.0 on amd64.
* Enable verbose make output.
* Call ldconfig in libmapcache postinst and postrm.
diff --git a/debian/control b/debian/control
index a80c218..67d8514 100644
--- a/debian/control
+++ b/debian/control
@@ -20,18 +20,18 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-grass/mapcache.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git
Package: libmapcache0
-Depends: libmapcache, ${misc:Depends}
+Depends: libmapcache1, ${misc:Depends}
Architecture: any
Section: oldlibs
-Description: Dummy package for libmapcache0 to libmapcache transition
+Description: Dummy package for libmapcache0 to libmapcache1 transition
This is a transitional dummy package to ease upgrades from the
- libmapcache0 package to the libmapcache package.
+ libmapcache0 package to the libmapcache1 package.
It can safely be removed.
-Package: libmapcache
-Provides: libmapcache0
-Replaces: libmapcache0
-Breaks: libmapcache0 (= 1.1)
+Package: libmapcache1
+Provides: libmapcache, libmapcache0
+Replaces: libmapcache, libmapcache0
+Breaks: libmapcache (= 1.2.0), libmapcache0 (= 1.2.0)
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
@@ -45,21 +45,21 @@ Description: tile caching server - shared library
solution.
Package: libmapcache0-dev
-Depends: libmapcache-dev, ${misc:Depends}
+Depends: libmapcache1-dev, ${misc:Depends}
Architecture: any
Section: oldlibs
-Description: Transitional dummy package for libmapcache-dev
+Description: Transitional dummy package for libmapcache1-dev
This is a transitional dummy package to ease upgrades from the
- libmapcache0-dev package to the libmapcache-dev package.
+ libmapcache0-dev package to the libmapcache1-dev package.
It can safely be removed.
-Package: libmapcache-dev
-Provides: libmapcache0-dev
-Replaces: libmapcache0-dev
-Breaks: libmapcache0-dev (= 1.1)
+Package: libmapcache1-dev
+Provides: libmapcache-dev, libmapcache0-dev
+Replaces: libmapcache-dev, libmapcache0-dev
+Breaks: libmapcache-dev (= 1.2.0), libmapcache0-dev (= 1.2.0)
Section: libdevel
Architecture: any
-Depends: libmapcache (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libmapcache1 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: mapcache-cgi, mapcache-tools, libapache2-mod-mapcache
Description: tile caching server - shared library development files
This package contains the development files for the shared library.
diff --git a/debian/libmapcache-dev.install b/debian/libmapcache-dev.install
deleted file mode 100644
index 0c77627..000
--- a/debian/libmapcache-dev.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/mapcache/*
diff --git a/debian/libmapcache.install b/debian/libmapcache.install
deleted file mode 100644
index 3af14b7..000
--- a/debian/libmapcache.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libmapcache.so*
diff --git a/debian/libmapcache1-dev.install b/debian/libmapcache1-dev.install
new file mode 100644
index 000..f6a7487
--- /dev/null
+++ b/debian/libmapcache1-dev.install
@@ -0,0 +1,2 @@
+usr/include/mapcache/*
+usr/lib/*/libmapcache.so
diff --git a/debian/libmapcache1.install b/debian/libmapcache1.install
new file mode 100644
index 000..69df65a
--- /dev/null
+++ b/debian/libmapcache1.install
@@ -0,0 +1 @@
+usr/lib/*/libmapcache.so.*
diff --git a/debian/libmapcache.postinst b/debian/libmapcache1.postinst
similarity index 100%
rename from debian/libmapcache.postinst
rename to debian/libmapcache1.postinst
diff --git a/debian/libmapcache.postrm b/debian/libmapcache1.postrm
similarity index 100%
rename from debian/libmapcache.postrm
rename to debian/libmapcache1.postrm
diff --git a/debian/libmapcache.symbols b/debian/libmapcache1.symbols
similarity index 99%
rename from debian/libmapcache.symbols
rename to debian/libmapcache1.symbols
index c630752..57327cd 100644
--- a/debian/libmapcache.symbols
+++ b/debian/libmapcache1.symbols
@@ -1,5 +1,5 @@
# SymbolsHelper-Confirmed: 1.2.0 amd64
-libmapcache.so #PACKAGE# #MINVER#
+libmapcache.so.1 #PACKAGE# #MINVER#
EZXML_NIL@Base 1.0.0
_configuration_parse_wms_xml@Base 1.0.0
_create_capabilities_demo@Base 1.0.0
--
Packaging for MapCache
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
