[SCM] FreeCAD packaging branch, experimental, updated. debian/0.13_20121120.git5082ae2-2_exp2-4-ga51a107

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit 5c548bfde4c953ee71ac498b0f367d32275877a1
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Jan 9 22:46:38 2013 +0100

    Update patches.

diff --git a/debian/patches/fix_python_error.patch b/debian/patches/fix_python_error.patch
deleted file mode 100644
index ded89c4..0000000
--- a/debian/patches/fix_python_error.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix python warning
-Author: Anton Gladky <gladky.anton>
-Last-Update: 2012-11-23
-
---- a/src/Mod/OpenSCAD/exportCSG.py
-+++ b/src/Mod/OpenSCAD/exportCSG.py
-@@ -90,7 +90,7 @@
- 
- def shape2polyhedron(shape):
-     import MeshPart
--fa = params.GetFloat('exportFa',12.0)
-+    fa = params.GetFloat('exportFa',12.0)
-     return mesh2polyhedron(MeshPart.meshFromShape(shape,params.GetFloat(\
-         'meshmaxlength',1.0), params.GetFloat('meshmaxarea',0.0),\
-          params.GetFloat('meshlocallen',0.0),\
diff --git a/debian/patches/series b/debian/patches/series
index 0f8f5e3..ac3c325 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ set_install_rpath.patch
 use_install_rpath.patch
 use_share.patch
 dir_as_string.patch
-fix_python_error.patch
diff --git a/debian/patches/use_install_rpath.patch b/debian/patches/use_install_rpath.patch
index f948ffb..9541b76 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
-@@ -94,7 +94,6 @@
+@@ -96,7 +96,6 @@
  )
  
  SET(PartDesign_Scripts
@@ -8,7 +8,7 @@
      Init.py
      TestPartDesignApp.py
      Scripts/__init__.py
-@@ -128,9 +127,9 @@
+@@ -130,9 +129,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
-@@ -194,9 +194,9 @@
+@@ -201,9 +201,9 @@
  else(MSVC)
      set_target_properties(PartDesignGui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/PartDesign)
      set_target_properties(PartDesignGui PROPERTIES PREFIX "")
diff --git a/debian/patches/use_share.patch b/debian/patches/use_share.patch
index 3347d20..443665c 100644
--- a/debian/patches/use_share.patch
+++ b/debian/patches/use_share.patch
@@ -57,7 +57,7 @@
  
 --- a/src/Mod/Start/Gui/CMakeLists.txt
 +++ b/src/Mod/Start/Gui/CMakeLists.txt
-@@ -68,7 +68,7 @@
+@@ -72,7 +72,7 @@
  
  fc_target_copy_resource(StartGui 
      ${CMAKE_SOURCE_DIR}/src/Mod/Start
@@ -77,7 +77,7 @@
  )
 --- a/src/Mod/Start/StartPage/CMakeLists.txt
 +++ b/src/Mod/Start/StartPage/CMakeLists.txt
-@@ -29,7 +29,7 @@
+@@ -33,7 +33,7 @@
  )
  
  INSTALL(FILES ${StartPage_SRCS}

-- 
FreeCAD packaging