[SCM] mapcache branch, master, updated. upstream/1.2.0-107-gebc9794
The following commit has been merged in the master branch:
commit d0672b59307e3a513fc515d4b77fc80021c0e0c9
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Jan 3 16:42:05 2014 +0100
Drop soname.patch, applied upstream.
diff --git a/debian/changelog b/debian/changelog
index 920ce75..e9f65eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapcache (1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.9.5, no changes required.
+ * Drop soname.patch, applied upstream.
-- Bas Couwenberg sebas...@xs4all.nl Fri, 03 Jan 2014 16:38:51 +0100
diff --git a/debian/patches/series b/debian/patches/series
index c597b7f..4c2a684 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-soname.patch
cmake-mapserver-include.patch
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
deleted file mode 100644
index f594f89..000
--- a/debian/patches/soname.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Use versioned SONAME for libmapcache.
-Author: Bas Couwenberg sebas...@xs4all.nl
-Bug: https://github.com/mapserver/mapcache/pull/84
-Applied-Upstream: 1.2.1,
https://github.com/mapserver/mapcache/commit/6b7c8d067a83075021b2f183ba683895d7659046
-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.2.0-107-gebc9794
The following commit has been merged in the master branch: commit ebc97946802e68d79ff082da2738f4a19343198f Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 3 17:30:30 2014 +0100 Set distribution to unstable. diff --git a/debian/changelog b/debian/changelog index 4d0e819..78a102a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mapcache (1.2.1-1) UNRELEASED; urgency=low +mapcache (1.2.1-1) unstable; urgency=low * New upstream release. * Bump Standards-Version to 3.9.5, no changes required. @@ -7,7 +7,7 @@ mapcache (1.2.1-1) UNRELEASED; urgency=low upstream doesn't provide signatures for verification. * Add lintian override for no-upstream-changelog, no changes in source. - -- Bas Couwenberg sebas...@xs4all.nl Fri, 03 Jan 2014 16:38:51 +0100 + -- Bas Couwenberg sebas...@xs4all.nl Fri, 03 Jan 2014 17:30:18 +0100 mapcache (1.2.0-2) unstable; urgency=low -- 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.2.0-107-gebc9794
The following commit has been merged in the master branch: commit becb049dd59429962af2737dafb4687be9cfc3a7 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 3 16:39:05 2014 +0100 New upstream release. diff --git a/debian/changelog b/debian/changelog index cf1e52c..920ce75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -mapcache (1.2.0-3) UNRELEASED; urgency=low +mapcache (1.2.1-1) UNRELEASED; urgency=low + * New upstream release. * Bump Standards-Version to 3.9.5, no changes required. - -- Bas Couwenberg sebas...@xs4all.nl Sat, 14 Dec 2013 18:04:25 +0100 + -- Bas Couwenberg sebas...@xs4all.nl Fri, 03 Jan 2014 16:38:51 +0100 mapcache (1.2.0-2) unstable; urgency=low -- 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.2.0-107-gebc9794
The following commit has been merged in the master branch: commit 68637759bbaf300ae271a2b5869b9aa6d350a7ab Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 3 17:24:06 2014 +0100 Add lintian override for debian-watch-may-check-gpg-signature, upstream doesn't provide signatures for verification. diff --git a/debian/changelog b/debian/changelog index e9f65eb..68a3a46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ mapcache (1.2.1-1) UNRELEASED; urgency=low * New upstream release. * Bump Standards-Version to 3.9.5, no changes required. * Drop soname.patch, applied upstream. + * Add lintian override for debian-watch-may-check-gpg-signature, +upstream doesn't provide signatures for verification. -- Bas Couwenberg sebas...@xs4all.nl Fri, 03 Jan 2014 16:38:51 +0100 diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides new file mode 100644 index 000..fa18fdf --- /dev/null +++ b/debian/source/lintian-overrides @@ -0,0 +1,2 @@ +# Upstream doesn't provide signatures for verification +mapcache source: debian-watch-may-check-gpg-signature -- 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.2.0-107-gebc9794
The following commit has been merged in the master branch: commit 92953a183a18927e0ed14e6ace8aa5d2177b2793 Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 3 17:29:15 2014 +0100 Add lintian override for no-upstream-changelog, no changes in source. diff --git a/debian/changelog b/debian/changelog index 68a3a46..4d0e819 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ mapcache (1.2.1-1) UNRELEASED; urgency=low * Drop soname.patch, applied upstream. * Add lintian override for debian-watch-may-check-gpg-signature, upstream doesn't provide signatures for verification. + * Add lintian override for no-upstream-changelog, no changes in source. -- Bas Couwenberg sebas...@xs4all.nl Fri, 03 Jan 2014 16:38:51 +0100 diff --git a/debian/libapache2-mod-mapcache.lintian-overrides b/debian/libapache2-mod-mapcache.lintian-overrides new file mode 100644 index 000..0d60d86 --- /dev/null +++ b/debian/libapache2-mod-mapcache.lintian-overrides @@ -0,0 +1,3 @@ +# No changes in source, you can compare release tags online: +# https://github.com/mapserver/mapcache/compare/rel-1-2-0...rel-1-2-1 +libapache2-mod-mapcache: no-upstream-changelog diff --git a/debian/libmapcache1-dev.lintian-overrides b/debian/libmapcache1-dev.lintian-overrides new file mode 100644 index 000..4df7f73 --- /dev/null +++ b/debian/libmapcache1-dev.lintian-overrides @@ -0,0 +1,3 @@ +# No changes in source, you can compare release tags online: +# https://github.com/mapserver/mapcache/compare/rel-1-2-0...rel-1-2-1 +libmapcache1-dev: no-upstream-changelog diff --git a/debian/libmapcache1.lintian-overrides b/debian/libmapcache1.lintian-overrides new file mode 100644 index 000..35b9e86 --- /dev/null +++ b/debian/libmapcache1.lintian-overrides @@ -0,0 +1,3 @@ +# No changes in source, you can compare release tags online: +# https://github.com/mapserver/mapcache/compare/rel-1-2-0...rel-1-2-1 +libmapcache1: no-upstream-changelog diff --git a/debian/mapcache-cgi.lintian-overrides b/debian/mapcache-cgi.lintian-overrides new file mode 100644 index 000..e993716 --- /dev/null +++ b/debian/mapcache-cgi.lintian-overrides @@ -0,0 +1,3 @@ +# No changes in source, you can compare release tags online: +# https://github.com/mapserver/mapcache/compare/rel-1-2-0...rel-1-2-1 +mapcache-cgi: no-upstream-changelog diff --git a/debian/mapcache-tools.lintian-overrides b/debian/mapcache-tools.lintian-overrides new file mode 100644 index 000..f83ec13 --- /dev/null +++ b/debian/mapcache-tools.lintian-overrides @@ -0,0 +1,3 @@ +# No changes in source, you can compare release tags online: +# https://github.com/mapserver/mapcache/compare/rel-1-2-0...rel-1-2-1 +mapcache-tools: no-upstream-changelog -- 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.2.0-107-gebc9794
The following commit has been merged in the master branch:
commit de1f3bc8639f1955c870871d2e5d324123cc449a
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Fri Jan 3 16:37:22 2014 +0100
Imported Upstream version 1.2.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c77ddeb..b5026e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ endif ()
set (MAPCACHE_VERSION_MAJOR 1)
set (MAPCACHE_VERSION_MINOR 2)
-set (MAPCACHE_VERSION_REVISION 0)
+set (MAPCACHE_VERSION_REVISION 1)
if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
@@ -66,11 +66,15 @@ 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)
option(WITH_SQLITE Use sqlite as a cache backend ON)
-option(WITH_BERKELEY_DB Use sqlite as a cache backend OFF)
+option(WITH_BERKELEY_DB Use Berkeley DB as a cache backend OFF)
option(WITH_MEMCACHE Use memcache as a cache backend (requires recent
apr-util) OFF)
option(WITH_TIFF Use TIFFs as a cache backend OFF)
option(WITH_TIFF_WRITE_SUPPORT Enable (experimental) support for writable
TIFF cache backends OFF)
diff --git a/INSTALL b/INSTALL
index 6df12ab..a776eb9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,212 +8,8 @@ cd mapcache
mkdir build
cd build
cmake ..
-# follow instructions below if missing a dependency
make
sudo make install
-The installation script takes care of putting the built module in the apache
module directory.
-The process for activating a module is usually distro specific, but can be
resumed by the
-following snippet that should be present in the apache configuration file(s):
-
-LoadModule mapcache_modulemodules/mod_mapcache.so
-
-Next, a mapcache configuration is mapped to the server url with the following
snippet
-
-IfModule mapcache_module
-Directory /path/to/directory
- Order Allow,Deny
- Allow from all
-/Directory
-MapCacheAlias /mapcache /path/to/directory/mapcache.xml
-/IfModule
-
-Before you restart, copy the example mapcache.xml file to where you want it:
-
-cp mapcache.xml /path/to/directory/mapcache.xml
-
-(as root)
-# apachectl restart
-
-If you have not disabled the demo service, you should now have access to it on
-http://myserver/mapcache/demo
-
-
-Customizing the build, or if something went wrong
--
-
-mod_mapcache requires apache, libcurl, libjpeg and libpng development headers.
-The cmake script will try to locate them in default system locations, that can
be
-overriden or specified with -D switches. For example, if you don't want fcgi
and
-you get a message such as 'Could NOT find APR ', you can use a command such
as:
-(assuming that apr is at /usr/local/apr)
-
-cmake -DWITH_FCGI=0 -DCMAKE_PREFIX_PATH=/usr/local/apr; ..
-
-
-
-apache apxs
-===
-
---with-apxs=/path/to/apxs
-
-apxs is the apache extension tool that is used for building and installing the
module to a local
-apache instance. it should be installed along with a standard apache build, or
supplied by
-distros when installing the apache development packages.
-apxs is sometimes called apxs2 (notably on debian).
-On Ubuntu, apt-get install apache2-prefork-dev might help
-
-apr
-===
-
---with-apr-config=/path/to/apr-config
-
-apr-config is sometimes called apr-1-config on some systems. The path to the
apr libraries is susually determined
-from the previous apxs utility. you can use this switch to override which apr
will be used. beware that using a different
-version of apr than the one that is linked to by apache will likely cause bugs.
-
-apr-util
-
-
---with-apu-config=/path/to/apu-config
-
-apu-config is sometimes called apu-1-config. the apr-util library is used to
enable the memcached cache backend for
-stroing tiles. If you don't plan on using it you can safely ignore or disable
it.
-
-libcurl
-===
-
---with-curl-config=/path/to/curl-config
-
-libpng
-==
-
---with-png=/path/to/png/prefix
-
-this is the path where the libpng headers and libs can be located.
-the configure script will be looking for [path]/include/png.h and
[path]/lib/libpng.so
-
-libjpeg
-==
-
---with-jpeg=/path/to/jpeg/prefix
-
-this is the path where the libjpeg headers and libs can be located.
-the configure script will be looking for [path]/include/jpeg.h and
[path]/lib/libjpeg.so
-
-pixman (from 0.5 onwards) (recommended)
-===
-
---with-pixman=[yes|no|/path/to/pkgconfig/pixman.pc]
-
-pixman is a pixel manipulation library used to assemble image tiles when
responding
-to non-tiled wms requests. Pixman support is recommended as it is highly
optimized
-and will take advantage of recent processor extensions (mms, sse, ...) to
speed up
-blending and resampling operations. In case the
[SCM] mapcache branch, master, updated. upstream/1.2.0-107-gebc9794
The following commit has been merged in the master branch: commit d04e6ec68bf5deed73ad5b7f16d006c645ca5dec Merge: 5787924f7da23e1f0df0a2f4257b3abd6416f81f de1f3bc8639f1955c870871d2e5d324123cc449a Author: Bas Couwenberg sebas...@xs4all.nl Date: Fri Jan 3 16:37:23 2014 +0100 Merge tag 'upstream/1.2.1' Upstream version 1.2.1 -- 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
