[SCM] Core functionality for performing astronomy and astrophysics with Python branch, debian, updated. 37084a80b9d4e18a70d8370d834b5e6050c6fe83

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 37084a80b9d4e18a70d8370d834b5e6050c6fe83
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Feb 12 21:28:53 2013 +0100

    (Temporarily) replace subprocess.check_output\nto allow installation under Python 2.6

diff --git a/debian/patches/install_on_py2.6.patch b/debian/patches/install_on_py2.6.patch
new file mode 100644
index 0000000..14348c2
--- /dev/null
+++ b/debian/patches/install_on_py2.6.patch
@@ -0,0 +1,16 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: (Temporarily) replace subprocess.check_output
+ to allow installation under Python 2.6.
+Bug: https://github.com/astropy/astropy/issues/769
+--- a/astropy/setup_helpers.py
++++ b/astropy/setup_helpers.py
+@@ -1244,7 +1244,8 @@
+     command = "pkg-config --libs --cflags {0}".format(' '.join(packages)),
+ 
+     try:
+-        output = subprocess.check_output(command, shell=True)
++        process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE)
++        output = process.communicate()[0].strip()
+     except subprocess.CalledProcessError as e:
+         lines = [
+             "pkg-config failed.  This may cause the build to fail below.",
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..99a8d59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+install_on_py2.6.patch

-- 
Core functionality for performing astronomy and astrophysics with Python