[mapnik] 01/02: Add libcurl-ssl-dev as alternative to libcurl4-gnutls-dev dependencies. (closes: #836057)

Bas Couwenberg sebastic at debian.org
Tue Aug 30 11:52:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository mapnik.

commit 4e1f74b30bfb16d7021ba14a9503ec1b00d1715d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 30 12:59:32 2016 +0200

    Add libcurl-ssl-dev as alternative to libcurl4-gnutls-dev dependencies. (closes: #836057)
---
 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60fd49d..fb4216f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mapnik (3.0.12~rc6+ds-1~exp2) UNRELEASED; urgency=medium
+
+  * Add libcurl-ssl-dev as alternative to libcurl4-gnutls-dev dependencies.
+    (closes: #836057)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 30 Aug 2016 12:58:36 +0200
+
 mapnik (3.0.12~rc6+ds-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.
diff --git a/debian/control b/debian/control
index 185b272..4f60f0c 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends: scons,
                libpq-dev,
                libgdal-dev,
                libsqlite3-dev,
-               libcurl4-gnutls-dev,
+               libcurl4-gnutls-dev | libcurl-ssl-dev,
                libwebp-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/mapnik.git
@@ -80,7 +80,7 @@ Depends: ${misc:Depends},
          libpq-dev,
          libgdal-dev,
          libsqlite3-dev,
-         libcurl4-gnutls-dev,
+         libcurl4-gnutls-dev | libcurl-ssl-dev,
          libwebp-dev
 Recommends: mapnik-doc
 Breaks: libmapnik2-dev (<< 2.2.0+ds1-1~)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git



More information about the Pkg-grass-devel mailing list