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

[frankie at alioth.debian.org]

Author: frankie
Date: 2008-11-05 14:54:55 +0000 (Wed, 05 Nov 2008)
New Revision: 1794

Modified:
   packages/grass/branches/6.4/debian/changelog
   packages/grass/branches/6.4/debian/control
   packages/grass/branches/6.4/debian/rules
Log:
Some wx related fixes and changed grass-preview-doc to conflict with grass-doc


Modified: packages/grass/branches/6.4/debian/changelog
===================================================================
--- packages/grass/branches/6.4/debian/changelog	2008-11-05 14:44:32 UTC (rev 1793)
+++ packages/grass/branches/6.4/debian/changelog	2008-11-05 14:54:55 UTC (rev 1794)
@@ -1,5 +1,6 @@
 grass-preview (6.4~20081031-1) experimental; urgency=low
 
+  [ Hamish Bowman ]
   -- THIS IS A NOT FOR RELEASE BRANCH OF THE MAIN DEVELOPMENT TREE --
 
   * Update patches and names from 6.3 to 6.4svn
@@ -7,8 +8,16 @@
   * Enable Cairo rendering support
   * Python support for new wx vdigit module (still need build-deps??)
 
- -- Hamish Bowman <hamish-guest alioth.debian org>  Fri, 31 Oct 2008 17:20:04 +1300
+  [ Francesco Paolo Lovergine ]
 
+  Merged with changes in 6.3 preview tree:
+
+  * Added libwxgtk2.8-dev build dep.
+  * Changed configuration for successful building with wxwidget 2.8
+  * Policy bumped to 3.8.0
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 05 Nov 2008 15:46:32 +0100
+
 grass-preview (6.3.0-1) experimental; urgency=low
 
   * Changing source package name to grass-preview.

Modified: packages/grass/branches/6.4/debian/control
===================================================================
--- packages/grass/branches/6.4/debian/control	2008-11-05 14:44:32 UTC (rev 1793)
+++ packages/grass/branches/6.4/debian/control	2008-11-05 14:54:55 UTC (rev 1794)
@@ -7,8 +7,8 @@
  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,
- libcairo2-dev
-Standards-Version: 3.7.3
+ libcairo2-dev, 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/
@@ -32,6 +32,9 @@
 Package: grass-preview-doc
 Section: science
 Architecture: all
+Conflicts: grass-doc
+Replaces: 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.4/debian/rules
===================================================================
--- packages/grass/branches/6.4/debian/rules	2008-11-05 14:44:32 UTC (rev 1793)
+++ packages/grass/branches/6.4/debian/rules	2008-11-05 14:54:55 UTC (rev 1794)
@@ -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 \
 		    --with-python=/usr/bin/python2.5-config \
 		    --with-cairo