[mapserver] 35/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 c8521c7cd2c87ddf12d8b5cf1fe161107c3c13af
Merge: 934f3a9 2dc9da4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 23 14:35:32 2013 +0200

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

 debian/changelog | 2 +-
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 467db02,b9b49d2..a378d85
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,4 +1,11 @@@
 +mapserver (6.2.1-3~bpo70+1linuxminded7) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +  * Only Build-Depend on libgd2-xpm-dev for wheezy.
 +
 + -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 18 Jun 2013 23:14:49 +0200
 +
- mapserver (6.2.1-3) UNRELEASED; urgency=low
+ mapserver (6.2.1-3) unstable; urgency=low
  
    * Upload for Debian closes: #706157
    * Merge changes from 6.0.1-4: 
diff --cc debian/control
index ed325a8,84c5b66..3ae8daa
--- a/debian/control
+++ b/debian/control
@@@ -6,8 -6,8 +6,8 @@@ Uploaders: Francesco Paolo Lovergine <f
  Standards-Version: 3.9.4
  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~),
+  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,

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