[SCM] OCE packaging branch, debian, updated. debian/0.11-1

[tpaviot]

The following commit has been merged in the debian branch:
commit d7c41c9ada7c06e4b764e8d42956e9f85a1b2515
Author: Denis Barbier <bouzim at gmail.com>
Date:   Sat Nov 17 10:38:40 2012 +0100

    Drop HAVE_FTGL_NEWER212 macro, this is no more needed
    
    Upstream now supports ftgl 2.1.3rc5.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58402be..4377102 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,17 +336,13 @@ IF(${PROJECT_NAME}_VISUALISATION)
 		FIND_LIBRARY(FREETYPE_LIBRARY freetype)
 	ENDIF(NOT ${PROJECT_NAME}_USE_BUNDLE)
 
-	FIND_PATH(FTGL_V212_INCLUDE_DIR FTGL/FTFace.h DOC "Location of header files for FTGL 2.1.2" ${CMAKE_SYSTEM_INCLUDE_PATH})
-	FIND_PATH(FTGL_INCLUDE_DIR FTGL/ftgl.h "Location of header files for FTGL > 2.1.2" ${CMAKE_SYSTEM_INCLUDE_PATH})
-	IF(NOT FTGL_V212_INCLUDE_DIR AND FTGL_INCLUDE_DIR)
-		ADD_DEFINITIONS(-DHAVE_FTGL_NEWER212)
-	ENDIF(NOT FTGL_V212_INCLUDE_DIR AND FTGL_INCLUDE_DIR)
-	FIND_LIBRARY(FTGL_LIBRARY ftgl "Location of ftgl library (any version)")
+	FIND_PATH(FTGL_INCLUDE_DIR FTGL/ftgl.h "Location of header files for FTGL" ${CMAKE_SYSTEM_INCLUDE_PATH})
+	FIND_LIBRARY(FTGL_LIBRARY ftgl "Location of ftgl library")
 	IF(CMAKE_CONFIGURATION_TYPES OR NMAKE)
-		FIND_LIBRARY(FTGL_LIBRARY_DEBUG ftgld "Location of ftgl debug library (any version)")
+		FIND_LIBRARY(FTGL_LIBRARY_DEBUG ftgld "Location of ftgl debug library")
 		FIND_LIBRARY(FREETYPE_LIBRARY_DEBUG freetyped "Location of freetype debug library")
 	ENDIF(CMAKE_CONFIGURATION_TYPES OR NMAKE)
-	MARK_AS_ADVANCED(X11_Xmu_LIB FTGL_V212_INCLUDE_DIR FTGL_INCLUDE_DIR FTGL_LIBRARY)
+	MARK_AS_ADVANCED(X11_Xmu_LIB FTGL_INCLUDE_DIR FTGL_LIBRARY)
 
 	## GL2PS
 	IF(${PROJECT_NAME}_WITH_GL2PS)
@@ -445,7 +441,6 @@ IF (${PROJECT_NAME}_USE_BUNDLE AND ${PROJECT_NAME}_BUNDLE_ROOT_PATH)
 		SET(FREETYPE_LIBRARY_DEBUG ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/libd/freetyped.lib CACHE FILEPATH "" FORCE)
 		SET(FTGL_LIBRARY ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/lib/ftgl.lib CACHE FILEPATH "" FORCE)
 		SET(FTGL_LIBRARY_DEBUG ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/libd/ftgld.lib CACHE FILEPATH "" FORCE)
-		ADD_DEFINITIONS(-DHAVE_FTGL_NEWER212)
 
 		IF(${PROJECT_NAME}_WITH_GL2PS)
 			SET(GL2PS_LIBRARY ${${PROJECT_NAME}_BUNDLE_ROOT_PATH}/Win${BIT}/lib/gl2ps.lib CACHE FILEPATH "" FORCE)

-- 
OCE packaging