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

Anton Gladky gladky.anton at gmail.com
Wed Nov 21 16:22:17 UTC 2012


The following commit has been merged in the cmake_migration branch:
commit dd59a242cc716e5100d262b1bdaaf03f8a1da447
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Nov 20 21:55:55 2012 +0100

    Fix compilation.

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index dd222db..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share
diff --git a/debian/freecad.install b/debian/freecad.install
index 1a3728a..3d67d55 100644
--- a/debian/freecad.install
+++ b/debian/freecad.install
@@ -1,6 +1,5 @@
 usr/bin/ usr/lib/freecad/
 usr/lib/ usr/lib/freecad/
 usr/Mod/ usr/lib/freecad/
-usr/share
 debian/freecad.desktop usr/share/applications
 debian/menu usr/share/menu/freecad
diff --git a/debian/patches/series b/debian/patches/series
index ce2a07b..d1c892d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
 disable_memory_check.patch
 fix_armel_FTBFS.patch
 fix_FTBFS_on_precise.patch
-set_install_rpath.patch
-dir_as_string.patch
-use_install_rpath.patch
-use_share.patch
diff --git a/debian/patches/use_install_rpath.patch b/debian/patches/use_install_rpath.patch
index c9d517b..f948ffb 100644
--- a/debian/patches/use_install_rpath.patch
+++ b/debian/patches/use_install_rpath.patch
@@ -1,6 +1,6 @@
 --- a/src/Mod/PartDesign/App/CMakeLists.txt
 +++ b/src/Mod/PartDesign/App/CMakeLists.txt
-@@ -79,7 +79,6 @@
+@@ -94,7 +94,6 @@
  )
  
  SET(PartDesign_Scripts
@@ -8,7 +8,7 @@
      Init.py
      TestPartDesignApp.py
      Scripts/__init__.py
-@@ -113,9 +112,9 @@
+@@ -128,9 +127,9 @@
  else(MSVC)
      set_target_properties(PartDesign PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
      set_target_properties(PartDesign PROPERTIES PREFIX "")
@@ -22,7 +22,7 @@
  
 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt
 +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
-@@ -148,9 +148,9 @@
+@@ -194,9 +194,9 @@
  else(MSVC)
      set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
      set_target_properties(PartDesignGui PROPERTIES PREFIX "")

-- 
FreeCAD packaging



More information about the debian-science-commits mailing list