depends on CMake >=2.6.2 and drop support for lenny (debian oldstable)

CMakeLists.txt

@@ -18,8 +18,8 @@ MESSAGE(STATUS "Quantum GIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS
 #############################################################
 # CMake settings
 
-# 2.6 required for QtWebkit
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+# 2.6.2 required for VERSION_LESS
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
 
 SET(CMAKE_COLOR_MAKEFILE ON)
 

cmake/FindQwt.cmake

@@ -33,9 +33,9 @@ ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
 
 IF (QWT_FOUND)
   FILE(READ ${QWT_INCLUDE_DIR}/qwt_global.h qwt_header)
-  STRING(REGEX REPLACE "^.*QWT_VERSION +(0x[0-9a-f]+).*$" "\\1" QWT_VERSION "${qwt_header}")
+  STRING(REGEX REPLACE "^.*QWT_VERSION_STR +\"([^\"]+)\".*$" "\\1" QWT_VERSION_STR "${qwt_header}")
   IF (NOT QWT_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY} (${QWT_VERSION})")
+    MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY} (${QWT_VERSION_STR})")
   ENDIF (NOT QWT_FIND_QUIETLY)
 ELSE (QWT_FOUND)
   IF (QWT_FIND_REQUIRED)

debian/rules

@@ -10,7 +10,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
-ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid maverick natty oneiric"))
+ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze hardy intrepid jaunty karmic lucid maverick natty oneiric"))
 DISTRIBUTION := sid
 endif
 
@@ -123,11 +123,7 @@ clean: cleantemplates
 install: build
 	dh_testdir
 	dh_testroot
-ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
-	dh_clean -k 
-else
 	dh_prep
-endif
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp.
@@ -171,9 +167,6 @@ else
 endif
 	dh_installmenu
 	dh_icons
-ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
-	dh_desktop
-endif
 	dh_installman -pqgis qgis.1 qbrowser.1
 	dh_installmime -pqgis
 	dh_link

src/app/CMakeLists.txt

@@ -255,7 +255,7 @@ SET (QGIS_APP_MOC_HDRS
   )
 
 IF(WITH_INTERNAL_QWTPOLAR)
-  IF(QWT_VERSION LESS 393216)  # <6.0.0
+  IF(QWT_VERSION_STR VERSION_LESS "6.0.0")
     SET(QGIS_APP_SRCS
       ${QGIS_APP_SRCS}
       gps/qwtpolar-0.1/qwt_polar_canvas.cpp
@@ -282,7 +282,7 @@ IF(WITH_INTERNAL_QWTPOLAR)
     )
 
     SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-0.1)
-  ELSE(QWT_VERSION LESS 393216)
+  ELSE(QWT_VERSION_STR VERSION_LESS "6.0.0")
     SET(QGIS_APP_SRCS
       ${QGIS_APP_SRCS}
       gps/qwtpolar-1.0/qwt_polar_canvas.cpp
@@ -312,7 +312,7 @@ IF(WITH_INTERNAL_QWTPOLAR)
     )
 
     SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.0)
-  ENDIF(QWT_VERSION LESS 393216)
+  ENDIF(QWT_VERSION_STR VERSION_LESS "6.0.0")
 
   SET(QWTPOLAR_LIBRARY "")
 ENDIF(WITH_INTERNAL_QWTPOLAR)