Merge lp:~compiz-team/compiz/compiz.fix_1048964 into lp:compiz/0.9.8

[Sam Spilsbury]

Fix build on python 2.6. Use the old method of detecting the version.
(LP: #1048964)

Fix build on python 2.6. Use the old method of detecting the version.

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3385
http://jenkins.qa.ubuntu.com/job/compiz-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/92/console

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Well, I can confirm python-2.7 still works at least.

review: Approve

=== modified file 'compizconfig/ccsm/CMakeLists.txt'
--- compizconfig/ccsm/CMakeLists.txt	2012-09-06 12:17:40 +0000
+++ compizconfig/ccsm/CMakeLists.txt	2012-09-22 03:17:18 +0000
@@ -12,7 +12,7 @@
 execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
 
 # Get Python Version
-execute_process (COMMAND python -c "import sys; print str (sys.version_info.major) + '.' + str (sys.version_info.minor)"
+execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
 		 OUTPUT_VARIABLE PY_VERSION)
 
 string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
 
=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
--- compizconfig/compizconfig-python/CMakeLists.txt	2012-09-07 05:41:18 +0000
+++ compizconfig/compizconfig-python/CMakeLists.txt	2012-09-22 03:17:18 +0000
@@ -12,7 +12,7 @@
 execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
 
 # Get Python Version
-execute_process (COMMAND python -c "import sys; print str (sys.version_info.major) + '.' + str (sys.version_info.minor)"
+execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
 		 OUTPUT_VARIABLE PY_VERSION)
 
 string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})