[mapcache] 13/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 016e4682489acb0d6fc7ccff91e58e5a800f9a59
Merge: 4808543 79fe9f4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 28 19:58:30 2013 +0200

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

 debian/changelog           |   3 +-
 debian/control             |   3 +-
 debian/mapcache_seed.1.xml | 324 +++++++++++++++++++++++++++++++++++++++++++++
 debian/rules               |   4 +
 4 files changed, 332 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 584acca,53f41ac..707bb0e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,3 +1,9 @@@
- mapcache (1.0.0-3~bpo70+1linuxminded3) wheezy-backports; urgency=low
++mapcache (1.0.0-3~bpo70+1linuxminded4) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 21 Jun 2013 20:56:28 +0200
 +
  mapcache (1.0.0-3) UNRELEASED; urgency=low
  
    * Upload for Debian closes: #712377
diff --cc debian/control
index 44017f3,bd70a61..ee60175
--- a/debian/control
+++ b/debian/control
@@@ -7,8 -7,9 +7,9 @@@ Build-Depends: debhelper (>= 9), dpkg-d
   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,
 - libgd-dev (>= 2.1.0~rc1-2), libproj-dev,
 + libgd2-xpm-dev (>= 2.0.1-10), libproj-dev,
-  autoconf, libfribidi-dev, libcairo2-dev, chrpath
+  autoconf, libfribidi-dev, libcairo2-dev, chrpath,
+  docbook2x, docbook-xsl, docbook-xml, xsltproc
  Standards-Version: 3.9.4
  Homepage: http://mapserver.org/trunk/mapcache/
  Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapcache.git

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