[freecad] 02/05: Fix installing of som Mods. (Closes: #736273)

Anton Gladky gladk at moszumanska.debian.org
Sun Aug 24 10:05:53 UTC 2014


This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository freecad.

commit 81d4b6ebeddcbfba74af89b7df9557a0d3161e3e
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Aug 23 23:51:45 2014 +0200

    Fix installing of som Mods. (Closes: #736273)
---
 debian/patches/use_share.patch | 102 -----------------------------------------
 1 file changed, 102 deletions(-)

diff --git a/debian/patches/use_share.patch b/debian/patches/use_share.patch
index 521c0af..a19987f 100644
--- a/debian/patches/use_share.patch
+++ b/debian/patches/use_share.patch
@@ -35,105 +35,3 @@ Index: freecad/src/App/FreeCADInit.py
  	# new paths must be prepended to avoid to load a wrong version of a library
  	try:
  		os.environ["PATH"] = PathExtension + os.environ["PATH"]
-Index: freecad/src/Mod/Drawing/App/CMakeLists.txt
-===================================================================
---- freecad.orig/src/Mod/Drawing/App/CMakeLists.txt
-+++ freecad/src/Mod/Drawing/App/CMakeLists.txt
-@@ -83,7 +83,7 @@ fc_target_copy_resource(Drawing
- 
- fc_target_copy_resource(Drawing 
-     ${CMAKE_SOURCE_DIR}/src/Mod/Drawing
--    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Drawing
-+    ${CMAKE_INSTALL_DATADIR}/Mod/Drawing
-     ${Drawing_Templates})
- 
- SET_BIN_DIR(Drawing Drawing /Mod/Drawing)
-Index: freecad/src/Mod/Robot/App/CMakeLists.txt
-===================================================================
---- freecad.orig/src/Mod/Robot/App/CMakeLists.txt
-+++ freecad/src/Mod/Robot/App/CMakeLists.txt
-@@ -136,7 +136,7 @@ fc_target_copy_resource(Robot
- 
- fc_target_copy_resource(Robot 
-     ${CMAKE_SOURCE_DIR}/src/Mod/Robot
--    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Robot
-+    ${CMAKE_INSTALL_DATADIR}/Mod/Robot
-     ${Robot_Resources})
- 
- SET_BIN_DIR(Robot Robot /Mod/Robot)
-Index: freecad/src/Mod/Start/Gui/CMakeLists.txt
-===================================================================
---- freecad.orig/src/Mod/Start/Gui/CMakeLists.txt
-+++ freecad/src/Mod/Start/Gui/CMakeLists.txt
-@@ -72,7 +72,7 @@ fc_target_copy_resource(StartGui
- 
- fc_target_copy_resource(StartGui 
-     ${CMAKE_SOURCE_DIR}/src/Mod/Start
--    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start
-+    ${CMAKE_INSTALL_DATADIR}/Mod/Start
-     ${StartPage_Resources})
- 
- SET_BIN_DIR(StartGui StartGui /Mod/Start)
-Index: freecad/src/Mod/Start/CMakeLists.txt
-===================================================================
---- freecad.orig/src/Mod/Start/CMakeLists.txt
-+++ freecad/src/Mod/Start/CMakeLists.txt
-@@ -10,5 +10,5 @@ INSTALL(
-         Init.py
-         InitGui.py
-     DESTINATION
--        Mod/Start
-+        ${CMAKE_INSTALL_DATADIR}/Mod/Start
- )
-Index: freecad/src/Mod/Start/StartPage/CMakeLists.txt
-===================================================================
---- freecad.orig/src/Mod/Start/StartPage/CMakeLists.txt
-+++ freecad/src/Mod/Start/StartPage/CMakeLists.txt
-@@ -34,7 +34,7 @@ SET(StartPage_DATA
- )
- 
- INSTALL(FILES ${StartPage_SRCS}
--    DESTINATION Mod/Start/StartPage
-+    DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage
- )
- 
- INSTALL(FILES ${StartPage_DATA}
-Index: freecad/src/Mod/Raytracing/CMakeLists.txt
-===================================================================
---- freecad.orig/src/Mod/Raytracing/CMakeLists.txt
-+++ freecad/src/Mod/Raytracing/CMakeLists.txt
-@@ -10,7 +10,7 @@ INSTALL(
-         InitGui.py
-         RaytracingExample.py
-     DESTINATION
--        Mod/Raytracing
-+        ${CMAKE_INSTALL_DATADIR}/Mod/Raytracing
- )
- 
- INSTALL(
-Index: freecad/src/Mod/Drawing/CMakeLists.txt
-===================================================================
---- freecad.orig/src/Mod/Drawing/CMakeLists.txt
-+++ freecad/src/Mod/Drawing/CMakeLists.txt
-@@ -12,7 +12,7 @@ INSTALL(
-         DrawingExample.py
-         DrawingTests.py
-     DESTINATION
--        Mod/Drawing
-+        ${CMAKE_INSTALL_DATADIR}/Mod/Drawing
- )
- 
- INSTALL(
-Index: freecad/src/Mod/Robot/CMakeLists.txt
-===================================================================
---- freecad.orig/src/Mod/Robot/CMakeLists.txt
-+++ freecad/src/Mod/Robot/CMakeLists.txt
-@@ -13,7 +13,7 @@ INSTALL(
-         RobotExample.py
-         RobotExampleTrajectoryOutOfShapes.py
-     DESTINATION
--        Mod/Robot
-+        ${CMAKE_INSTALL_DATADIR}/Mod/Robot
- )
- 
- INSTALL(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freecad.git



More information about the debian-science-commits mailing list