[SCM] FreeCAD packaging branch, cmake_migration, updated. debian/0.12.5284-dfsg-7-9-gbbcd17c

[Anton Gladky]

The following commit has been merged in the cmake_migration branch:
commit 0a1599dca50053827c16f74b1a64aed52f59d105
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Nov 19 21:33:42 2012 +0100

    Add debian/patches/dir_as_string.patch.

diff --git a/debian/patches/dir_as_string.patch b/debian/patches/dir_as_string.patch
new file mode 100644
index 0000000..e813899
--- /dev/null
+++ b/debian/patches/dir_as_string.patch
@@ -0,0 +1,34 @@
+Description: - only sets RESOURCEDIR, if not set via cmdline
+ - markes CMAKE_INSTALL_INCLUDEDIR, CMAKE_INSTALL_DOCDIR, and
+ CMAKE_INSTALL_DATADIR as string, othewrwise i had problems with absolute
+ pathes. But maybe this not nesseary.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Applied-by: Anton Gladky <gladky.anton at gmail.com>
+Last-update: 2012-11-19
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -72,16 +72,19 @@
+     ENDIF(NOT INSTALL_RPATH)
+ endif(WIN32)
+ 
+-SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
+-SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
+-SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
++SET(CMAKE_INSTALL_DATADIR data CACHE STRING "Output directory for data and resource files")
++SET(CMAKE_INSTALL_INCLUDEDIR include CACHE STRING "Output directory for header files")
++SET(CMAKE_INSTALL_DOCDIR doc CACHE STRING "Output directory for documentation and license files")
+ 
+ # used as compiler defines
+-SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
++IF(NOT RESOURCEDIR)
++	SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
++ENDIF(NOT RESOURCEDIR)
+ SET(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
+ 
+ MESSAGE("prefix: ${CMAKE_INSTALL_PREFIX}")
+ MESSAGE("datadir: ${CMAKE_INSTALL_DATADIR}")
++MESSAGE("RESOURCEDIR: ${RESOURCEDIR}")
+ MESSAGE("docdir: ${CMAKE_INSTALL_DOCDIR}")
+ MESSAGE("includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3fb9b5a..38fc1e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ disable_memory_check.patch
 fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch
 set_install_rpath.patch
+dir_as_string.patch

-- 
FreeCAD packaging