[QGIS Commit] r12839 - trunk/qgis/debian

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-01-28 04:26:59 -0500 (Thu, 28 Jan 2010)
New Revision: 12839

Modified:
   trunk/qgis/debian/rules
Log:
debian packaging: depend on python 2.5 for sid while transition to 2.6 is on

Modified: trunk/qgis/debian/rules
===================================================================
--- trunk/qgis/debian/rules	2010-01-27 02:52:57 UTC (rev 12838)
+++ trunk/qgis/debian/rules	2010-01-28 09:26:59 UTC (rev 12839)
@@ -11,7 +11,7 @@
 
 DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
 ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny hardy intrepid jaunty karmic"))
-DISTRIBUTION := sid	
+DISTRIBUTION := sid
 endif
 
 QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt)
@@ -20,7 +20,7 @@
 QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH)
 GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e "s/\.//g" -e "s/RC/-/"))
 
-CMAKE_OPTS = \
+CMAKE_OPTS := \
 	-Wno-dev \
 	-D GRASS_PREFIX=/usr/lib/grass64 \
 	-D CMAKE_INSTALL_PREFIX=/usr \
@@ -30,6 +30,11 @@
 	-D WITH_SPATIALITE=TRUE \
 	-D WITH_INTERNAL_SPATIALITE=TRUE
 
+ifeq ($(DISTRIBUTION),sid)
+# depend on python 2.5 while transition to python 2.6 is on
+CMAKE_OPTS += -D PYTHON_EXECUTABLE=/usr/bin/python2.5
+endif
+
 ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
 LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
 endif