[SCM] FreeCAD packaging branch, experimental, updated. debian/0.13_20121120.git5082ae2-1-3-ga926af0

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit bcc4f2ed758d5e5df4d69400cf17f837b76cfd3e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Nov 23 22:09:20 2012 +0100

    Enable dir_as_string.patch.

diff --git a/debian/patches/dir_as_string.patch b/debian/patches/dir_as_string.patch
index bc57050..724ee78 100644
--- a/debian/patches/dir_as_string.patch
+++ b/debian/patches/dir_as_string.patch
@@ -1,6 +1,13 @@
+Description: 
+ - only sets RESOURCEDIR, if not set via cmdline
+ - markes CMAKE_INSTALL_INCLUDEDIR, CMAKE_INSTALL_DOCDIR, and
+ CMAKE_INSTALL_DATADIR as string, otherwise i had problems with absolute
+ pathes.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -72,16 +72,19 @@
+@@ -72,16 +72,20 @@
      ENDIF(NOT INSTALL_RPATH)
  endif(WIN32)
  
@@ -14,13 +21,14 @@
  # used as compiler defines
 -SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
 +IF(NOT RESOURCEDIR)
-+	SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
++   SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
 +ENDIF(NOT RESOURCEDIR)
++
  SET(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
  
- MESSAGE("prefix: ${CMAKE_INSTALL_PREFIX}")
- MESSAGE("datadir: ${CMAKE_INSTALL_DATADIR}")
+ MESSAGE( STATUS "prefix: ${CMAKE_INSTALL_PREFIX}")
+ MESSAGE(STATUS "datadir: ${CMAKE_INSTALL_DATADIR}")
 +MESSAGE("RESOURCEDIR: ${RESOURCEDIR}")
- MESSAGE("docdir: ${CMAKE_INSTALL_DOCDIR}")
- MESSAGE("includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
+ MESSAGE(STATUS "docdir: ${CMAKE_INSTALL_DOCDIR}")
+ MESSAGE(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
  
diff --git a/debian/patches/series b/debian/patches/series
index 9d070b8..ac3c325 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,5 @@ fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch
 set_install_rpath.patch
 use_install_rpath.patch
+use_share.patch
+dir_as_string.patch

-- 
FreeCAD packaging