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

[Anton Gladky]

The following commit has been merged in the cmake_migration branch:
commit 581b23b789511fe433bd32af2b2d34fcdeb7fffd
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jun 14 21:45:37 2012 +0200

    Prepare for 0.13rc

diff --git a/debian/freecad-dev.install b/debian/freecad-dev.install
index fbdaa93..ad10d78 100644
--- a/debian/freecad-dev.install
+++ b/debian/freecad-dev.install
@@ -1 +1 @@
-usr/include/* usr/include/freecad/
+usr/include/ usr/include/freecad
diff --git a/debian/freecad-doc.docs b/debian/freecad-doc.docs
index 51ffddb..27e5cb8 100644
--- a/debian/freecad-doc.docs
+++ b/debian/freecad-doc.docs
@@ -1 +1 @@
-usr/doc
+debian/tmp/usr/doc/*
diff --git a/debian/freecad.install b/debian/freecad.install
index 5e0f930..a302041 100644
--- a/debian/freecad.install
+++ b/debian/freecad.install
@@ -4,4 +4,4 @@ usr/Mod usr/lib/freecad/
 debian/freecad.desktop usr/share/applications
 usr/data/freecad.xpm usr/share/freecad/
 usr/data/freecad-doc.png usr/share/freecad/
-debian/menu/freecad usr/share/menu/
+debian/menu usr/share/menu/freecad
diff --git a/debian/menu/freecad b/debian/menu
similarity index 100%
rename from debian/menu/freecad
rename to debian/menu
diff --git a/debian/patches/series b/debian/patches/series
index d1c892d..3fb9b5a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 disable_memory_check.patch
 fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch
+set_install_rpath.patch
diff --git a/debian/patches/set_install_rpath.patch b/debian/patches/set_install_rpath.patch
new file mode 100644
index 0000000..0758720
--- /dev/null
+++ b/debian/patches/set_install_rpath.patch
@@ -0,0 +1,18 @@
+Description: Let INSTALL_RPATH be set from the command line
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-06-14
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,7 +66,10 @@
+     SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Installation root directory")
+ else(WIN32)
+     SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory")
+-    SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++    
++    IF(NOT INSTALL_RPATH)
++      SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++    ENDIF(NOT INSTALL_RPATH)
+ endif(WIN32)
+ 
+ SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
diff --git a/debian/rules b/debian/rules
index f246e98..df6ef7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,8 +2,6 @@
 %:
 	dh $@ --buildsystem=cmake --parallel
 
-MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete Fem Robot Import Inspection
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -13,7 +11,8 @@ extra_flags += \
 -DFREECAD_BUILD_DEBIAN=ON \
 -DCMAKE_CXX_FLAGS="-Wall -DHAVE_SWIG=1 -fpermissive $(shell dpkg-buildflags --get CXXFLAGS)" \
 -DCMAKE_C_FLAGS="-Wall -fpermissive $(shell dpkg-buildflags --get CFLAGS)" \
--DCMAKE_LDFLAGS="-lrt $(shell dpkg-buildflags --get LDFLAGS)" \
+-DCMAKE_SHARED_LINKER_FLAGS="-lrt $(shell dpkg-buildflags --get LDFLAGS)" \
+-DINSTALL_RPATH="/usr/lib/freecad/lib" 
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)
@@ -23,6 +22,3 @@ override_dh_compress:
 
 overide_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.txt
-
-override_dh_makeshlibs:
-
diff --git a/debian/shlibs.local b/debian/shlibs.local
deleted file mode 100644
index d33d2bc..0000000
--- a/debian/shlibs.local
+++ /dev/null
@@ -1 +0,0 @@
-libSoQt4 20 libsoqt4-20 (>= 1.4.2~svn20090224)

-- 
FreeCAD packaging