[mapserver] 05/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 mapserver.

commit 5cc7cbb9f0e25c1d5d681586c6ad2d735f187402
Merge: f50e5b0 e414f40
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 19 16:35:26 2013 +0200

    Merge branch 'jessie' into wheezy-backports

 debian/control               | 4 ++--
 debian/php5-mapscript.config | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --cc debian/control
index 0bb69be,e2ee6dd..943680a
--- a/debian/control
+++ b/debian/control
@@@ -2,13 -2,13 +2,13 @@@ Source: mapserve
  Section: devel
  Priority: optional
  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>
+ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>, Bas Couwenberg <sebastic at xs4all.nl>
  Standards-Version: 3.9.4
  Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (>= 1.1.4),
 - libgd-dev (>= 2.1.0~rc1-2), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.9.0), libproj-dev,
 + libgd2-xpm-dev (>= 2.0.1-10), libfreetype6-dev (>= 2.0.9), libjpeg-dev, libgdal1-dev (>=1.9.0), libproj-dev,
   libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), libgeos-dev (>= 3.3.1-1~),
   ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
-  sharutils, libsdl1.2-dev, libfreetype6-dev, chrpath,
+  sharutils, libsdl1.2-dev, chrpath,
   libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev,
   libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev,
   docbook2x, docbook-xsl, docbook-xml, xsltproc

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