[mapcache] 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 mapcache.

commit 163109b8dedf5e1316df6d9d64033177ef117b9d
Merge: a68f777 080d7ed
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 21 22:50:35 2013 +0200

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

 debian/rules | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --cc debian/rules
index df15f9b,e1236e7..113759a
--- a/debian/rules
+++ b/debian/rules
@@@ -21,17 -21,8 +21,17 @@@ export DEB_BUILD_MAINT_OPTIONS=hardenin
  
  CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
  CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
- CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
- FFLAGS:=$(shell dpkg-buildflags --get FFLAGS)
++#CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
++#FFLAGS:=$(shell dpkg-buildflags --get FFLAGS)
  LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
  
- CFLAGS+=$(CPPFLAGS)
- CFLAGS+=$(FFLAGS)
- CFLAGS+=$(LDFLAGS)
++#CFLAGS+=$(CPPFLAGS)
++#CFLAGS+=$(FFLAGS)
++#CFLAGS+=$(LDFLAGS)
 +
- CPPFLAGS=$(CFLAGS)
- CXXFLAGS=$(CFLAGS)
++#CPPFLAGS=$(CFLAGS)
++#CXXFLAGS=$(CFLAGS)
 +
  %:
  	dh $@ 
  

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