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

[tpaviot]

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

    Drop X11_FONT_PATH, it is no more needed
    
    Upstream moved OSD_FontMgr.cxx into TKService, so XGetFontPath
    can now be used.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0dd3a7a..58402be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -315,21 +315,6 @@ IF(${PROJECT_NAME}_VISUALISATION)
 	IF (NOT WIN32)
 		FIND_PACKAGE(X11 REQUIRED)
 		FIND_LIBRARY( X11_Xmu_LIB Xmu PATHS /usr/openwin/lib )
-		IF( NOT DEFINED X11_FONT_PATH )
-			IF(NOT APPLE)
-				SET(X11_FONT_PATH
-					"/usr/share/X11/fonts"
-					"/usr/share/fonts/X11")
-			ELSE(NOT APPLE)
-				SET(X11_FONT_PATH
-					"/usr/X11/lib/X11/fonts"
-					"/Library/Fonts"
-					"/System/Library/Fonts")
-			ENDIF(NOT APPLE)
-		ENDIF( NOT DEFINED X11_FONT_PATH )
-		SET(X11_FONT_PATH ${X11_FONT_PATH} CACHE PATH
-			"Font directories containing fonts.dir listing files")
-		MARK_AS_ADVANCED(X11_FONT_PATH)
 	ENDIF(NOT WIN32)
 
 	IF (NOT APPLE)
diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake
index 371ba70..b91a34e 100644
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -102,10 +102,6 @@ IF(NOT ${PROJECT_NAME}_NO_LIBRARY_VERSION)
     )
 ENDIF(NOT ${PROJECT_NAME}_NO_LIBRARY_VERSION)
 
-IF(DEFINED X11_FONT_PATH)
-	SET_SOURCE_FILES_PROPERTIES("${${PROJECT_NAME}_SOURCE_DIR}/src/Font/Font_FontMgr.cxx" PROPERTIES COMPILE_FLAGS "-DX11_FONT_PATH=\"${X11_FONT_PATH}\"")
-ENDIF(DEFINED X11_FONT_PATH)
-
 # Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
 # Win64+MSVC+static libs = linker error
 IF(MSVC AND NOT ${PROJECT_NAME}_BUILD_SHARED_LIB AND BIT EQUAL 64)

-- 
OCE packaging