[mapserver] 10/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 041b47f20ee33bbbbf1f0176dc15509fa057ccfb
Merge: 6e27975 dc179a5
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 19 19:25:42 2013 +0200

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

 debian/control | 14 +++++++++-----
 debian/rules   |  4 +---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --cc debian/control
index 943680a,ac2b35a..d60b6af
--- a/debian/control
+++ b/debian/control
@@@ -4,13 -4,17 +4,17 @@@ Priority: optiona
  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>
  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),
-  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~),
+ Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1.1), autotools-dev,
+  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,
+  libpq-dev, php5-dev, swig, python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
   ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev,
-  sharutils, libsdl1.2-dev, chrpath,
+  sharutils, libsdl1.2-dev
   libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev,
-  libfribidi-dev, libedit-dev, libepsilon-dev, libcairo2-dev,
+  libedit-dev, libepsilon-dev,
+  autoconf, chrpath, 
   docbook2x, docbook-xsl, docbook-xml, xsltproc
  Build-Conflicts: libcurl3-openssl-dev
  Homepage: http://www.mapserver.org

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