The following commit has been merged in the master branch:
commit fa5c88aa2eeb4c4b8206a4d000d977d0ad114401
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Jan 17 21:31:32 2014 +0100

    Add patch to explictly use /usr/bin/python2.7, update X-Python-Version and 
dependencies accordingly. (closes: #729495)

diff --git a/debian/changelog b/debian/changelog
index e521aee..bf8fdfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ qgis (2.0.1-1) unstable; urgency=low
   * Update Source URL in copyright.
   * Add patches from upstream release-2_0 branch.
   * Add patch to remove Google AdSense from documention.
+  * Add patch to explictly use /usr/bin/python2.7, update X-Python-Version and
+    dependencies accordingly.
+    (closes: #729495)
 
  -- Bas Couwenberg <sebas...@xs4all.nl>  Thu, 16 Jan 2014 21:28:09 +0100
 
diff --git a/debian/control b/debian/control
index 1a3dff6..21597bb 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,7 @@ Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/qgis.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/qgis.git
 Homepage: http://qgis.org/
-X-Python-Version: current
+X-Python-Version: >= 2.7, << 2.8
 
 Package: qgis
 Architecture: any
@@ -207,7 +207,7 @@ Description: GRASS plugin for QGIS
 
 Package: qgis-plugin-grass-common
 Architecture: all
-Depends: python,
+Depends: python2.7,
          ${python:Depends},
          ${misc:Depends}
 Breaks: qgis-common (<< 1.5)
diff --git a/debian/patches/python-env.patch b/debian/patches/python-env.patch
new file mode 100644
index 0000000..33faf3b
--- /dev/null
+++ b/debian/patches/python-env.patch
@@ -0,0 +1,101 @@
+Description: Use /usr/bin/python2.7 explicitly
+
+--- a/src/plugins/grass/qgis_grass_test.py
++++ b/src/plugins/grass/qgis_grass_test.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ #-----------------------------------------------------------
+ #
+--- a/src/plugins/grass/scripts/db.connect-login.pg.py
++++ b/src/plugins/grass/scripts/db.connect-login.pg.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ """
+--- a/src/plugins/grass/scripts/qgis.v.kernel.rast.py
++++ b/src/plugins/grass/scripts/qgis.v.kernel.rast.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ """
+--- a/src/plugins/grass/scripts/r.external.all.py
++++ b/src/plugins/grass/scripts/r.external.all.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ """
+--- a/src/plugins/grass/scripts/v.out.ogr.pg.py
++++ b/src/plugins/grass/scripts/v.out.ogr.pg.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ """
+--- a/python/plugins/processing/gui/AlgorithmExecutionDialog.py
++++ b/python/plugins/processing/gui/AlgorithmExecutionDialog.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ """
+--- a/python/plugins/processing/gui/ParametersDialog.py
++++ b/python/plugins/processing/gui/ParametersDialog.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ """
+--- a/scripts/random_vector.py
++++ b/scripts/random_vector.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ 
+ # Generates random shapefile which may be used for benchmarks 
+ 
+--- a/scripts/widgets_tree.py
++++ b/scripts/widgets_tree.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ """
+--- a/tests/src/python/qgis_local_server_spawn/flup/server/ajp.py
++++ b/tests/src/python/qgis_local_server_spawn/flup/server/ajp.py
+@@ -41,7 +41,7 @@ http://www.python.org/peps/pep-0333.html
+ 
+ Example usage::
+ 
+-  #!/usr/bin/env python
++  #!/usr/bin/python2.7
+   import sys
+   from myapplication import app # Assume app is your WSGI application object
+   from ajp import WSGIServer
+--- a/tests/src/python/qgis_local_server_spawn/qgis_server_local_spawn.py
++++ b/tests/src/python/qgis_local_server_spawn/qgis_server_local_spawn.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ """
+ 
################################################################################
+ # 2013-09-01  Larry Shaffer <lar...@dakotacarto.com>
+--- a/python/plugins/processing/gdal/pyogr/ogr2ogr.py
++++ b/python/plugins/processing/gdal/pyogr/ogr2ogr.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.7
+ # -*- coding: utf-8 -*-
+ 
+ """
diff --git a/debian/patches/series b/debian/patches/series
index f0dd215..c74c5dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ composer-fix-python-bindings-for-attribute-table.patch
 increase-decimaps-for-gdal-contour.patch
 ogr-only-call-repack-when-closing-a-data-provider.patch
 remove-google-adsense.patch
+python-env.patch

-- 
The Quantum GIS in Debian project

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to