[SCM] mapcache branch, master, updated. upstream/1.2.0-94-gc9506ab
The following commit has been merged in the master branch:
commit 0cdc0cf75f498a41d4213b808a5f36924113ac35
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Mon Sep 23 02:04:35 2013 +0200
Drop shlibs:Depends for libmapcache1-dev.
diff --git a/debian/control b/debian/control
index 2008559..66acafd 100644
--- a/debian/control
+++ b/debian/control
@@ -58,7 +58,6 @@ Package: libmapcache1-dev
Architecture: any
Section: libdevel
Depends: libmapcache1 (= ${binary:Version}),
- ${shlibs:Depends},
${misc:Depends}
Suggests: mapcache-cgi,
mapcache-tools,
--
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-94-gc9506ab
The following commit has been merged in the master branch:
commit 3fe3040b9a5e4850b2981f6e8bcb3070883c9625
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sun Sep 22 02:07:52 2013 +0200
Drop transitional packages.
Drop Breaks/Replaces for libmapcache.
diff --git a/debian/control b/debian/control
index 735d2ec..2008559 100644
--- a/debian/control
+++ b/debian/control
@@ -40,28 +40,12 @@ Vcs-Browser:
http://anonscm.debian.org/gitweb/?p=pkg-grass/mapcache.git
Vcs-Git: git://anonscm.debian.org/pkg-grass/mapcache.git
Homepage: http://www.mapserver.org/en/mapcache/
-Package: libmapcache0
-Architecture: any
-Section: oldlibs
-Depends: libmapcache1,
- ${misc:Depends}
-Description: Dummy package for libmapcache0 to libmapcache1 transition
- This is a transitional dummy package to ease upgrades from the
- libmapcache0 package to the libmapcache1 package.
- It can safely be removed.
-
Package: libmapcache1
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Breaks: libmapcache (= 1.2.0),
-libmapcache0 (= 1.2.0)
-Provides: libmapcache,
- libmapcache0
-Replaces: libmapcache,
- libmapcache0
Description: tile caching server - shared library
This package contains the shared library.
.
@@ -70,16 +54,6 @@ Description: tile caching server - shared library
offering the essential features (and more!) expected from a tile caching
solution.
-Package: libmapcache0-dev
-Architecture: any
-Section: oldlibs
-Depends: libmapcache1-dev,
- ${misc:Depends}
-Description: Transitional dummy package for libmapcache1-dev
- This is a transitional dummy package to ease upgrades from the
- libmapcache0-dev package to the libmapcache1-dev package.
- It can safely be removed.
-
Package: libmapcache1-dev
Architecture: any
Section: libdevel
@@ -89,12 +63,10 @@ Depends: libmapcache1 (= ${binary:Version}),
Suggests: mapcache-cgi,
mapcache-tools,
libapache2-mod-mapcache
-Breaks: libmapcache-dev (= 1.2.0),
-libmapcache0-dev (= 1.2.0)
-Provides: libmapcache-dev,
- libmapcache0-dev
-Replaces: libmapcache-dev,
- libmapcache0-dev
+Breaks: libmapcache-dev ( 1.2.0-1~),
+libmapcache0-dev ( 1.2.0-1~)
+Replaces: libmapcache-dev ( 1.2.0-1~),
+ libmapcache0-dev ( 1.2.0-1~)
Description: tile caching server - shared library development files
This package contains the development files for the shared library.
.
--
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-94-gc9506ab
The following commit has been merged in the master branch:
commit c9506ab2b8ab13c09bc8344098cfe51d59619eee
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Sep 21 20:13:05 2013 +0200
Add patch to include mapserver cmake package.
diff --git a/debian/changelog b/debian/changelog
index 9f2baa6..a75ca17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ mapcache (1.2.0-1) unstable; urgency=low
* Enable verbose make output.
* Call ldconfig in libmapcache postinst and postrm.
* Update libmapserver dependency for MapServer 6.4.0.
+ * Add patch to include mapserver cmake package.
* Build-Depend on libtiff-dev for libtiff5 transition.
-- Bas Couwenberg sebas...@xs4all.nl Wed, 11 Sep 2013 19:16:06 +0200
diff --git a/debian/control b/debian/control
index 66acafd..752ad6f 100644
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,8 @@ Build-Depends: debhelper (= 9),
libpixman-1-dev,
libsqlite3-dev,
libtiff-dev,
- libmapserver1,
- libmapserver1-dev,
+ libmapserver1 (= 6.4.0-2),
+ libmapserver1-dev (= 6.4.0-2),
chrpath,
cmake,
pkg-config,
diff --git a/debian/patches/cmake-mapserver-include.patch
b/debian/patches/cmake-mapserver-include.patch
new file mode 100644
index 000..ee74f02
--- /dev/null
+++ b/debian/patches/cmake-mapserver-include.patch
@@ -0,0 +1,45 @@
+Description: Include mapserver cmake package for additional include
directories.
+Author: Bas Couwenberg sebas...@xs4all.nl
+Last-Update: 2013-10-21
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -218,10 +218,18 @@ if(WITH_GEOTIFF)
+ endif (WITH_GEOTIFF)
+
+ if(WITH_MAPSERVER)
+- find_package(MAPSERVER)
++ find_package(MAPSERVER)
+ if(MAPSERVER_FOUND)
+-include_directories(${MAPSERVER_INCLUDE_DIR})
+-target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
++find_package(mapserver PATHS ${MAPSERVER_CMAKE_PATH})
++if(mapserver_FOUND)
++ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}
${MAPSERVER_CMAKE_PATH})
++ include(mapserverTargets)
++ include_directories(${MAPSERVER_INCLUDE_DIRS})
++ target_link_libraries(mapcache mapserver)
++else(mapserver_FOUND)
++ include_directories(${MAPSERVER_INCLUDE_DIR})
++ target_link_libraries(mapcache ${MAPSERVER_LIBRARY})
++endif(mapserver_FOUND)
+ set (USE_MAPSERVER 1)
+ else(MAPSERVER_FOUND)
+ report_optional_not_found(MAPSERVER)
+--- a/cmake/FindMAPSERVER.cmake
b/cmake/FindMAPSERVER.cmake
+@@ -8,8 +8,13 @@ FIND_LIBRARY(MAPSERVER_LIBRARY
+ NAMES mapserver
+ )
+
++FIND_PATH(MAPSERVER_CMAKE_PATH
++NAMES mapserverTargets.cmake
++PATHS /usr/share/mapserver/cmake
++)
++
+ 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)
++find_package_handle_standard_args(MAPSERVER DEFAULT_MSG MAPSERVER_LIBRARY
MAPSERVER_INCLUDE_DIR MAPSERVER_CMAKE_PATH)
++mark_as_advanced(MAPSERVER_LIBRARY MAPSERVER_INCLUDE_DIR MAPSERVER_CMAKE_PATH)
diff --git a/debian/patches/series b/debian/patches/series
index 4db24c4..c597b7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
soname.patch
+cmake-mapserver-include.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
