[mapcache] 31/43: Merge branch 'jessie' into wheezy-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Jun 25 20:52:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch wheezy-backports
in repository mapcache.
commit 1fbc0549966964fc95ec36b48a9013d9e0212010
Merge: 52f38bc 7040f4e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jul 20 13:20:47 2013 +0200
Merge branch 'jessie' into wheezy-backports
Conflicts:
debian/control
debian/control | 14 +-
debian/patches/fixwithmapserv.patch | 826 +-----------------------------------
2 files changed, 11 insertions(+), 829 deletions(-)
diff --cc debian/control
index ba1b32b,8b5f0ad..519a7e2
--- a/debian/control
+++ b/debian/control
@@@ -4,11 -4,15 +4,15 @@@ Priority: extr
Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>, Bas Couwenberg <sebastic at xs4all.nl>
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
- apache2-prefork-dev, libpng-dev, libjpeg-dev, libcurl4-gnutls-dev,
- libpcre3-dev, libpixman-1-dev, libfcgi-dev, libgdal1-dev, libgeos-dev,
- libsqlite3-dev, libtiff4-dev, libmapserver-6.2.1, libmapserver-6.2.1-dev,
- libgd2-xpm-dev (>= 2.0.1-10), libproj-dev,
- autoconf, libfribidi-dev, libcairo2-dev, chrpath,
+ libcurl4-gnutls-dev, libpng-dev, libjpeg-dev, zlib1g-dev (>= 1.1.4),
- libgd-dev (>= 2.1.0~rc1-2), libfreetype6-dev (>= 2.0.9),
++ libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9),
+ libgdal1-dev (>=1.9.0), libproj-dev, libgeos-dev (>= 3.3.1-1~),
+ libfribidi-dev, libcairo2-dev,
+ apache2-prefork-dev, libfcgi-dev,
+ libpcre3-dev, libpixman-1-dev,
+ libsqlite3-dev, libtiff4-dev,
+ libmapserver-6.2.1, libmapserver-6.2.1-dev,
+ autoconf, chrpath,
docbook2x, docbook-xsl, docbook-xml, xsltproc
Standards-Version: 3.9.4
Homepage: http://mapserver.org/en/mapcache/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git
More information about the Pkg-grass-devel
mailing list