[DebianGIS-dev] r1793 - packages/grass/branches/6.3/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-11-05 14:44:32 +0000 (Wed, 05 Nov 2008)
New Revision: 1793

Modified:
   packages/grass/branches/6.3/debian/changelog
   packages/grass/branches/6.3/debian/control
   packages/grass/branches/6.3/debian/rules
Log:
Some fixes for wx


Modified: packages/grass/branches/6.3/debian/changelog
===================================================================
--- packages/grass/branches/6.3/debian/changelog	2008-10-31 04:30:09 UTC (rev 1792)
+++ packages/grass/branches/6.3/debian/changelog	2008-11-05 14:44:32 UTC (rev 1793)
@@ -9,9 +9,11 @@
         - Tcl policy changes.
   * Revised current patchset to reflect changes in source code.
   * Removed obsolete NEWS file.
-  * Added wxpython support for the new GUI.
+  * Added wxpython support for the new GUI. Note that 2.8 is required.
+  * grass-preview-doc conflicts with grass-doc. 
+  * Policy bumped to 3.8.0
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Jul 2008 13:08:59 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 05 Nov 2008 15:38:50 +0100
 
 grass (6.3~20070922-1) NOT-FOR-RELEASE; urgency=low
 

Modified: packages/grass/branches/6.3/debian/control
===================================================================
--- packages/grass/branches/6.3/debian/control	2008-10-31 04:30:09 UTC (rev 1792)
+++ packages/grass/branches/6.3/debian/control	2008-11-05 14:44:32 UTC (rev 1793)
@@ -5,9 +5,10 @@
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Steve Halasz <debian at adkgis.org>
 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, 
+ libfreetype6-dev, autoconf2.13, autotools-dev, libgdal1-dev (>=1.5.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
-Standards-Version: 3.7.3
+ libwxgtk2.8-dev
+Standards-Version: 3.8.0
 Homepage: http://grass.osgeo.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-grass/packages/grass/
 Vcs-Svn: svn://svn.debian.org/pkg-grass/packages/grass/
@@ -16,7 +17,7 @@
 Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator
-Suggests: grass-preview-doc, gdal-bin, e00compr, avce00, gpstrans, gnuplot, grass-doc
+Suggests: grass-preview-doc, gdal-bin, e00compr, avce00, gpstrans, gnuplot
 Description: Geographic Resources Analysis Support System (Technology Preview)
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,
@@ -31,6 +32,9 @@
 Package: grass-preview-doc
 Section: science
 Architecture: all
+Replaces: grass-doc
+Conflicts: grass-doc
+Provides: grass-doc
 Description: Geographic Resources Analysis Support System (Technology Preview) documentation
  Commonly referred to as GRASS, this is a Geographic Information
  System (GIS) used for geospatial data management and analysis,

Modified: packages/grass/branches/6.3/debian/rules
===================================================================
--- packages/grass/branches/6.3/debian/rules	2008-10-31 04:30:09 UTC (rev 1792)
+++ packages/grass/branches/6.3/debian/rules	2008-11-05 14:44:32 UTC (rev 1793)
@@ -63,7 +63,8 @@
                     --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-wx=/usr/lib/wx/config/gtk2-unicode-release-2.8 \
+		    --with-wxwidgets
 
 	touch config-stamp