[mapcache] 37/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 565f284e599ef44ec1377a350dc644c331463ead
Merge: b759c10 a2a666f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 23 12:33:21 2013 +0200

    Merge branch 'jessie' into wheezy-backports

 debian/changelog                                 |  2 ++
 debian/control                                   |  9 ++++-----
 debian/libapache2-mod-mapcache.apache2           |  2 ++
 debian/libapache2-mod-mapcache.postinst          |  9 ++++-----
 debian/libapache2-mod-mapcache.prerm             |  6 ++++--
 debian/patches/mapcache_seed_delete_mode.patch   |  2 +-
 debian/patches/mapcache_seed_non_zero_exit.patch |  4 ++--
 debian/patches/mapcache_seed_typo.patch          | 19 +++++++++++++++++++
 debian/patches/series                            |  1 +
 debian/rules                                     |  2 +-
 10 files changed, 40 insertions(+), 16 deletions(-)

diff --cc debian/control
index 2448940,c8eaced..3c91714
--- a/debian/control
+++ b/debian/control
@@@ -5,14 -5,14 +5,14 @@@ Maintainer: Debian GIS Project <pkg-gra
  Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudreault at mapgears.com>, Bas Couwenberg <sebastic at xs4all.nl>
  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,
-  apache2-prefork-dev, libfcgi-dev,
+  apache2-dev, dh-apache2, libfcgi-dev,
   libpcre3-dev, libpixman-1-dev,
   libsqlite3-dev, libtiff4-dev,
-  libmapserver-6.2.1, libmapserver-6.2.1-dev, dh-autoreconf,
-  autoconf, chrpath,
+  libmapserver-6.2.1, libmapserver-6.2.1-dev,
+  autoconf, dh-autoreconf, chrpath,
   docbook2x, docbook-xsl, docbook-xml, xsltproc
  Standards-Version: 3.9.4
  Homepage: http://mapserver.org/en/mapcache/
diff --cc debian/rules
index 356fcd2,5b2fad3..7199b0b
--- a/debian/rules
+++ b/debian/rules
@@@ -26,14 -24,10 +26,14 @@@ CFLAGS:=$(shell dpkg-buildflags --get C
  LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
  
  CFLAGS+=$(CPPFLAGS)
 +#CFLAGS+=$(FFLAGS)
  CFLAGS+=$(LDFLAGS)
  
 +#CPPFLAGS=$(CFLAGS)
 +#CXXFLAGS=$(CFLAGS)
 +
  %:
- 	dh $@ --with autoreconf
+ 	dh $@ --with autoreconf,apache2
  
  override_dh_clean:
  	dh_clean

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