[mapcache] 26/43: Merge branch 'jessie' into wheezy-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch wheezy-backports
in repository mapcache.

commit 3b7d3b57584e7b6843974add4319523b279558e9
Merge: 7e63e09 4d40f06
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 17 23:32:27 2013 +0200

    Merge branch 'jessie' into wheezy-backports
    
    Conflicts:
    	debian/control

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/control
index 585117c,6637524..d1b22ad
--- a/debian/control
+++ b/debian/control
@@@ -6,8 -6,8 +6,8 @@@ Uploaders: Francesco Paolo Lovergine <f
  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, libmapserver-dev,
+  libsqlite3-dev, libtiff4-dev, libmapserver-6.2.1, libmapserver-6.2.1-dev,
 - libgd-dev (>= 2.1.0~rc1-2), libproj-dev,
 + libgd2-xpm-dev (>= 2.0.1-10), libproj-dev,
   autoconf, libfribidi-dev, libcairo2-dev, chrpath,
   docbook2x, docbook-xsl, docbook-xml, xsltproc
  Standards-Version: 3.9.4

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