[SCM] mapcache branch, master, updated. upstream/1.2.0-107-gebc9794

Bas Couwenberg sebastic at xs4all.nl
Fri Jan 3 17:15:22 UTC 2014


The following commit has been merged in the master branch:
commit d0672b59307e3a513fc515d4b77fc80021c0e0c9
Author: Bas Couwenberg <sebastic at 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 <sebastic at 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..0000000
--- a/debian/patches/soname.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Use versioned SONAME for libmapcache.
-Author: Bas Couwenberg <sebastic at 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



More information about the Pkg-grass-devel mailing list