This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch wheezy-backports in repository mapcache.
commit 4808543849343afc122c25cea7a8723e7c45ada7 Merge: 7f7dd6a ee206af Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jun 21 23:00:34 2013 +0200 Merge branch 'jessie' into wheezy-backports Conflicts: debian/rules debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --cc debian/rules index 113759a,ebeb498..a85efd3 --- a/debian/rules +++ b/debian/rules @@@ -21,17 -21,11 +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) LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) - #CFLAGS+=$(CPPFLAGS) + CFLAGS+=$(CPPFLAGS) +#CFLAGS+=$(FFLAGS) - #CFLAGS+=$(LDFLAGS) + CFLAGS+=$(LDFLAGS) +#CPPFLAGS=$(CFLAGS) +#CXXFLAGS=$(CFLAGS) + %: dh $@ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapcache.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel