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

[frankie at alioth.debian.org]

Author: frankie
Date: 2007-06-19 16:51:35 +0000 (Tue, 19 Jun 2007)
New Revision: 899

Added:
   packages/qgis/trunk/debian/patches/ax_python.dpatch
Modified:
   packages/qgis/trunk/debian/changelog
   packages/qgis/trunk/debian/control
   packages/qgis/trunk/debian/patches/00list
Log:
Fixing  #429234


Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog	2007-06-17 20:19:37 UTC (rev 898)
+++ packages/qgis/trunk/debian/changelog	2007-06-19 16:51:35 UTC (rev 899)
@@ -1,3 +1,11 @@
+qgis (0.8.0-5) unstable; urgency=low
+
+  * Added python-dev build-dep. 
+    Patch added: ax_python.dpatch, fixes python environment detection.
+    (closes: #429234)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 19 Jun 2007 18:28:05 +0200
+
 qgis (0.8.0-4) unstable; urgency=low
 
   * Enabled python scripts support and changed build-dep and suggests as consequence.

Modified: packages/qgis/trunk/debian/control
===================================================================
--- packages/qgis/trunk/debian/control	2007-06-17 20:19:37 UTC (rev 898)
+++ packages/qgis/trunk/debian/control	2007-06-19 16:51:35 UTC (rev 899)
@@ -4,7 +4,8 @@
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 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
+ grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libmysqlclient15-dev | libmysqlclient14-dev, 
+ flex, bison, python-dev, swig
 Standards-Version: 3.7.2
 
 Package: qgis

Modified: packages/qgis/trunk/debian/patches/00list
===================================================================
--- packages/qgis/trunk/debian/patches/00list	2007-06-17 20:19:37 UTC (rev 898)
+++ packages/qgis/trunk/debian/patches/00list	2007-06-19 16:51:35 UTC (rev 899)
@@ -1,3 +1,4 @@
 move-doc-dir
 gridmaker_bin
 gcc43-fixes
+ax_python

Added: packages/qgis/trunk/debian/patches/ax_python.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/ax_python.dpatch	                        (rev 0)
+++ packages/qgis/trunk/debian/patches/ax_python.dpatch	2007-06-19 16:51:35 UTC (rev 899)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ax_python.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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 18:47:40.000000000 +0200
+@@ -803,12 +803,15 @@
+    if test x$ax_python_lib = x; then
+       ax_python_lib=no
+    fi
++
++   python_version=`python -c 'import sys; print (sys.version)' 2>&1 | head -n 1 | cut -d ' ' -f 1 | cut -d . -f 1-2`
++   ax_python_include=/usr/include/python$python_version
++   ax_python_lib=python$python_version
+  
+    AC_MSG_RESULT([  results of the Python check:])
+    AC_MSG_RESULT([    Binary:      $ax_python_bin])
+    AC_MSG_RESULT([    Library:     $ax_python_lib])
+    AC_MSG_RESULT([    Include Dir: $ax_python_header])
+-   AC_MSG_RESULT([    Have python: $ac_use_python])
+  
+    if test x$ax_python_header != xno; then
+      PYTHON_INCLUDE_DIR=-I$ax_python_header
+@@ -823,6 +826,8 @@
+     ac_use_python=yes
+     HAVE_PYTHON=-DHAVE_PYTHON
+   fi 
++
++   AC_MSG_RESULT([    Have python: $ac_use_python])
+ fi
+ 
+ AM_CONDITIONAL([USE_PYTHON], [test "$ac_use_python" = "yes"])


Property changes on: packages/qgis/trunk/debian/patches/ax_python.dpatch
___________________________________________________________________
Name: svn:executable
   + *