[DebianGIS-dev] r901 - in packages/qgis/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-06-20 14:51:29 +0000 (Wed, 20 Jun 2007)
New Revision: 901

Modified:
   packages/qgis/trunk/debian/changelog
   packages/qgis/trunk/debian/control
   packages/qgis/trunk/debian/patches/ax_python.dpatch
Log:
Final fixes for #429234


Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog	2007-06-19 18:33:03 UTC (rev 900)
+++ packages/qgis/trunk/debian/changelog	2007-06-20 14:51:29 UTC (rev 901)
@@ -3,6 +3,7 @@
   * Added python-dev build-dep. 
     Patch added: ax_python.dpatch, fixes python environment detection.
     (closes: #429234)
+  * Added build-dep for autoconf/automake due to acinclude.m4 changes.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 19 Jun 2007 18:28:05 +0200
 

Modified: packages/qgis/trunk/debian/control
===================================================================
--- packages/qgis/trunk/debian/control	2007-06-19 18:33:03 UTC (rev 900)
+++ packages/qgis/trunk/debian/control	2007-06-20 14:51:29 UTC (rev 901)
@@ -5,7 +5,7 @@
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libqt4-dev, libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), dpatch, 
  grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libmysqlclient15-dev | libmysqlclient14-dev, 
- flex, bison, python-dev, swig
+ flex, bison, python-dev, autoconf, automake
 Standards-Version: 3.7.2
 
 Package: qgis

Modified: packages/qgis/trunk/debian/patches/ax_python.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/ax_python.dpatch	2007-06-19 18:33:03 UTC (rev 900)
+++ packages/qgis/trunk/debian/patches/ax_python.dpatch	2007-06-20 14:51:29 UTC (rev 901)
@@ -7,7 +7,7 @@
 @DPATCH@
 diff -urNad qgis-0.8.0~/acinclude.m4 qgis-0.8.0/acinclude.m4
 --- qgis-0.8.0~/acinclude.m4	2007-06-15 14:33:00.000000000 +0200
-+++ qgis-0.8.0/acinclude.m4	2007-06-19 20:31:30.000000000 +0200
++++ qgis-0.8.0/acinclude.m4	2007-06-20 16:42:41.000000000 +0200
 @@ -803,12 +803,15 @@
     if test x$ax_python_lib = x; then
        ax_python_lib=no