[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 217ec7ca8297c0938101bde169e58f656cc98c03
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Nov 19 21:36:22 2012 +0100

    Add debian/patches/use_install_rpath.patch.

diff --git a/debian/patches/series b/debian/patches/series
index 38fc1e9..5d47b96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch
 set_install_rpath.patch
 dir_as_string.patch
+use_install_rpath.patch
diff --git a/debian/patches/use_install_rpath.patch b/debian/patches/use_install_rpath.patch
new file mode 100644
index 0000000..16f356d
--- /dev/null
+++ b/debian/patches/use_install_rpath.patch
@@ -0,0 +1,57 @@
+Description: moves PartDesign.so -> INSTALL_RPATH, 
+  where all other .so files are.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Applied-by: Anton Gladky <gladky.anton at gmail.com>
+Last-update: 2012-11-19
+
+--- a/src/Mod/PartDesign/App/CMakeLists.txt
++++ b/src/Mod/PartDesign/App/CMakeLists.txt
+@@ -79,7 +79,6 @@
+ )
+ 
+ SET(PartDesign_Scripts
+-    __init__.py
+     Init.py
+     TestPartDesignApp.py
+     Scripts/__init__.py
+@@ -113,9 +112,9 @@
+ else(MSVC)
+     set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
+     set_target_properties(PartDesign PROPERTIES PREFIX "")
+-    set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/Mod/PartDesign)
++    set_target_properties(PartDesign PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
+ endif(MSVC)
+ 
+ # The PartDesign module must go to where the __init__.py file is
+-INSTALL(TARGETS PartDesign DESTINATION Mod/PartDesign)
++INSTALL(TARGETS PartDesign DESTINATION lib)
+ 
+--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
++++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
+@@ -148,9 +148,9 @@
+ else(MSVC)
+     set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
+     set_target_properties(PartDesignGui PROPERTIES PREFIX "")
+-    set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/Mod/PartDesign)
++    set_target_properties(PartDesignGui PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
+ endif(MSVC)
+ 
+ # The PartDesign module must go to where the __init__.py file is
+-INSTALL(TARGETS PartDesignGui DESTINATION Mod/PartDesign)
++INSTALL(TARGETS PartDesignGui DESTINATION lib)
+ 
+--- a/src/Mod/PartDesign/__init__.py
++++ /dev/null
+@@ -1,2 +0,0 @@
+-import PartDesign
+-makeFilletArc = PartDesign.makeFilletArc
+--- a/src/Mod/PartDesign/CMakeLists.txt
++++ b/src/Mod/PartDesign/CMakeLists.txt
+@@ -6,7 +6,6 @@
+ 
+ INSTALL(
+     FILES
+-        __init__.py
+         Init.py
+         InitGui.py
+         TestPartDesignApp.py

-- 
FreeCAD packaging