[DebianGIS-dev] r1790 - packages/grass/branches/6.4/debian

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2008-10-30 16:12:10 +0000 (Thu, 30 Oct 2008)
New Revision: 1790

Modified:
   packages/grass/branches/6.4/debian/control
   packages/grass/branches/6.4/debian/rules
Log:
enable cairo support, new wx vdigit module requires python (build-deps for that?)

Modified: packages/grass/branches/6.4/debian/control
===================================================================
--- packages/grass/branches/6.4/debian/control	2008-10-30 15:56:06 UTC (rev 1789)
+++ packages/grass/branches/6.4/debian/control	2008-10-30 16:12:10 UTC (rev 1790)
@@ -6,7 +6,8 @@
 Build-depends: flex, bison, libreadline5-dev | libreadline-dev, libncurses5-dev, lesstif2-dev, debhelper (>= 5), dpatch, 
  libtiff4-dev, tcl-dev (>= 8.4) | tcl8.4-dev, tk-dev (>= 8.4) | tk8.4-dev, libfftw3-dev|fftw3-dev, libxmu-dev, libglu1-mesa-dev | libglu1-xorg-dev, 
  libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>=1.4.0) | libgdal1-1.3.2-dev, proj (>= 4.4.7), libjpeg62-dev, 
- libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8
+ libpng12-dev, libpq-dev, unixodbc-dev, doxygen, fakeroot, libmysqlclient15-dev, graphviz, libsqlite3-dev, python-wxgtk2.8,
+ libcairo2-dev
 Standards-Version: 3.7.3
 Homepage: http://grass.osgeo.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/grass/

Modified: packages/grass/branches/6.4/debian/rules
===================================================================
--- packages/grass/branches/6.4/debian/rules	2008-10-30 15:56:06 UTC (rev 1789)
+++ packages/grass/branches/6.4/debian/rules	2008-10-30 16:12:10 UTC (rev 1790)
@@ -63,7 +63,9 @@
                     --with-postgres-includes=$(shell pg_config --includedir) \
                     --with-mysql-includes=$(shell mysql_config --include|sed -e 's/-I//') \
 		    --with-proj-share=/usr/share/proj \
-		    --with-wxwidgets=/usr/bin/wx-config
+		    --with-wxwidgets=/usr/bin/wx-config \
+		    --with-python=/usr/bin/python2.5-config \
+		    --with-cairo
 
 	touch config-stamp