The following commit has been merged in the master branch:
commit 3429fb363584c4eae12ba8f95fbcd60a437ffbc7
Merge: bcf38f44911786075b8fc24569c593072f96d9b0
98327ede46bfa4cfb9db03113c41207203447f15
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Mon Mar 12 20:25:37 2012 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/mapserver
Conflicts:
debian/changelog
diff --combined debian/rules
index 4099358,76eeb08..3ba2baa
--- a/debian/rules
+++ b/debian/rules
@@@ -34,7 -34,6 +34,6 @@@ COMMON_CONFIG= --prefix=/usr
--with-fribidi-config \
--with-zlib=/usr \
--with-xpm=/usr \
- --with-jpeg=/usr \
--with-gdal \
--with-ogr \
--with-proj \
@@@ -49,7 -48,7 +48,7 @@@
--with-threads \
--with-geos \
--with-fastcgi \
- -with-agg \
+ --with-agg \
--with-experimental-png \
--with-cairo
--
Mapserver
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
