[mapserver] 38/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 d16ee937e71d95bfc25da373147b292bf346a30b
Merge: b95d934 abcb375
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jul 25 15:46:33 2013 +0200

    Merge branch 'jessie' into wheezy-backports
    
    Conflicts:
    	debian/libmapserver-6.2.1.symbols

 debian/changelog                  |   7 +
 debian/control                    |   2 +-
 debian/libmapserver-6.2.1.symbols | 340 ++++++++++++++------------------------
 debian/rules                      |  10 +-
 4 files changed, 136 insertions(+), 223 deletions(-)

diff --cc debian/changelog
index 72b0ad5,9612a5c..1a17b09
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,6 +1,13 @@@
 +mapserver (6.2.1-3~bpo70+1linuxminded8) 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) unstable; urgency=low
  
+   [ Bas Couwenberg ]
    * Upload for Debian closes: #706157
    * Merge changes from 6.0.1-4: 
      - Migrated to debhelper level 9.

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