replace insecure use of eval() with proper use of units

py3/py2: use exec as function
Arch: Fixed error in roof - Fixes #3864
2019-05-11 13:02:55 +02:00 · 2019-05-10 19:26:12 +02:00 · 2019-05-07 22:49:19 -03:00 · 2019-05-02 16:10:12 -03:00 · 2019-04-21 10:15:13 +02:00 · 2019-04-21 10:14:45 +02:00
4126 changed files with 709852 additions and 504009 deletions
@@ -34,3 +34,7 @@ OpenSCAD_rc.py
 /\.idea/
 .tags
 tags
+/\.vscode/
+
+# crowdin file
+src/Tools/freecad.zip
@@ -19,12 +19,14 @@
 ##
 env:
  global:
-    - FREECAD_RELEASE="0.17"
+    - FREECAD_RELEASE="0.18"
    - DEPLOY_RELEASE=${DEPLOY_RELEASE:-$FREECAD_RELEASE}
    - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
    - OSX_PORTS_CACHE=${OSX_PORTS_CACHE:-FreeCAD/FreeCAD-ports-cache}
    - DEPLOY=${DEPLOY:-0}
-
+  matrix:
+    # chunk.io key (if needed, obtain it with Yorik, PrzemoF, Kunda1)
+    secure: MJu0ZU/9Yqut6bUkHoSrXTV/c/WhCLR0KnHKCsnEU081PYoukzH6ngzgKk7/trAH2In080d/ra4B2OmTNl/LAgV6DXKFY9dO1aG8QwcrHgaMPf0pHYUy/OfwQSFYFByQDV2OEMAHcIWc/dtNkzK2QUi44Kn7d0GtSEiN4s816lriWtjg0vmEGAU8MjvcAGss4gKyn05Xm1NUCYPKgpgIHsywLbpE76lv0eOYoosEuKv5Q9Pb4FMQts02+JUlqE8eY4ZZ3nV8iQbgIDdseOSA7Ixn05zWjU/ZRZ74TrYxMnzfUAwQcJe9OcqoESq+pPWQt5HYG66VmeVxQim1gmsiDASH51U/nswKt0Q4bISj3tVk0YZMFV8Ax+SzPvLEmFZJQGfgO1mg7HdNcz9N9G5JHPawrV19DwYIEFbAw8MCSAoIXFOcPQZUWXCbtjm7NO9vCjMrqyVJMDD9L8omvQajHoajuHbOT8KB250gFokeLj3z8yu++Tz+IrZX5inUMrXsARVt/ALXpi8rJPXmoFMpMUjyWmDPqPWlnqUhLtTtEtKpuOWP8ZnWVwkg4QYOUhCy95C1okJSGkG+ylHWncWfY4mS+UBT525laoh+GOhH+sRW+p2xkI21xGFRqg1oHjjgY1yIYF6nnSHPzxMBRYmZwagyXsjkFG5FPMWR2oYk0Yg
 cache:
    ccache: true

@@ -35,6 +37,10 @@ python:

 # Inject osx build into matrix - needed to specify image/dist
 matrix:
+    allow_failures:
+      - python: 3.7
+      - os: osx
+    fast_finish: true  # https://blog.travis-ci.com/2013-11-27-fast-finishing-builds
    include:
      - os: linux
        dist: trusty
@@ -57,8 +63,16 @@ matrix:
          - CMAKE_OPTS="-DBUILD_FEM_NETGEN=ON"
          - PYTHON_MAJOR_VERSION=3

+      - language: python
+        python: 3.7
+        dist: xenial  # required for Python >= 3.7 (travis-ci/travis-ci#9069)
+        before_install: true
+        install: python3 -m pip install flake8
+        # fail the build if there are Python syntax errors or undefined names
+        script: flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+
+      # macOS build is failing. See: https://forum.freecadweb.org/viewtopic.php?f=10&t=32272
      - os: osx
-        osx_image: xcode7.3
        compiler: clang
        env:
          - CMAKE_OPTS="-DBUILD_FEM_NETGEN=ON" QT=Qt5
@@ -83,7 +97,8 @@ before_install:

   "linux")
       sudo apt-get update -qq
-       sudo apt-get install -y doxygen                          \
+       sudo apt-get install -y --no-install-recommends          \
+                               doxygen                          \
                               libboost1.55-dev                 \
                               libboost-filesystem1.55-dev      \
                               libboost-program-options1.55-dev \
@@ -125,24 +140,24 @@ before_install:
                               swig                             \
                               libvtk6-dev                      \
                               libmed-dev                       \
-                               libmedc-dev			\
+                               libmedc-dev                      \
                               asciidoc

-       #Install Eigen 3.3.3 to reduce compiler warnings
-       curl -L "http://bitbucket.org/eigen/eigen/get/3.3.3.tar.gz" | tar xvz && cd eigen-*
-       mkdir build && cd build
-       cmake -DCMAKE_C_FLAGS_RELEASE=-DNDEBUG -DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON ..
-       sudo make -j2 install
-       cd ${TRAVIS_BUILD_DIR}
+       # Make sure dpkg is upgraded for Ubuntu 14.04 (required for eigen3)
+       sudo apt-get install -y dpkg

-       #Install ccache to reduce successive build times (use 3.2.5+ to avoid spurious warnings)
-       curl -L "https://codeload.github.com/ccache/ccache/tar.gz/v3.2.5" | tar xvz && cd ccache-*
+       # Use latest Eigen3 package
+       curl -L http://security.ubuntu.com/ubuntu/pool/universe/e/eigen3/libeigen3-dev_3.3.4-4_all.deb -o libeigen3.deb \
+            && sudo dpkg -i libeigen3.deb
+
+       # Install ccache to reduce successive build times (use newer version to minimize issues)
+       # XXX: ccache <=3.4.3 always builds manuals, requiring asciidoc/xsltproc
+       # XXX: 3.4.4 might have --disable-man (at least its present in their git)
+       sudo apt install -y xsltproc
+       curl -L "https://codeload.github.com/ccache/ccache/tar.gz/v3.4.3" | tar xvz && cd ccache-*
       ./autogen.sh && ./configure CC=gcc && sudo make install
       cd ${TRAVIS_BUILD_DIR}

-       #Patch the system - there is a bug related to invalid location of libs on ubuntu 12.04
-       sudo ln -s /usr/lib/x86_64-linux-gnu/ /usr/lib/i386-linux-gnu
-       sudo find /usr/lib -name libpq.so -exec ln -s {} /usr/lib/libpq.so ';'
       export DISPLAY=:99.0
       sh -e /etc/init.d/xvfb start

@@ -1,17 +1,16 @@
+cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 project(FreeCAD_trunk)

 set(PACKAGE_NAME "FreeCAD")
 set(PACKAGE_VERSION_NAME "Vulcan")
 set(PACKAGE_VERSION_MAJOR "0")
-set(PACKAGE_VERSION_MINOR "17")
-set(PACKAGE_VERSION_PATCH "10000")
+set(PACKAGE_VERSION_MINOR "18")
+set(PACKAGE_VERSION_PATCH "13500")

 set(FREECAD_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
 set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

-cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)
-
 if(COMMAND cmake_policy)
    cmake_policy(SET CMP0003 NEW)
    if(POLICY CMP0020)
@@ -19,11 +18,14 @@ if(COMMAND cmake_policy)
    endif(POLICY CMP0020)
    # added in cmake 3.0
    if(POLICY CMP0050)
-        cmake_policy(SET CMP0050 OLD)
+        cmake_policy(SET CMP0050 NEW)
    endif(POLICY CMP0050)
    if (POLICY CMP0045)
        cmake_policy(SET CMP0045 NEW)
    endif(POLICY CMP0045)
+    if (POLICY CMP0072)
+        cmake_policy(SET CMP0072 OLD)
+    endif(POLICY CMP0072)
 endif(COMMAND cmake_policy)

 find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
@@ -47,14 +49,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
 #   set(RELEASE_MAIN_OUTPUT_PATH ${CMAKE_BINARY_DIR}/src/Main/Release)
 #endif(CMAKE_CFG_INTDIR STREQUAL .)

-if(WIN32)
-    set(PLATFORM_CP xcopy /Y /S)
-    set(PLATFORM_MK mkdir)
-else(WIN32)
-    set(PLATFORM_CP cp)
-    set(PLATFORM_MK mkdir -p)
-endif(WIN32)
-
 if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
    set(CMAKE_COMPILER_IS_CLANGXX TRUE)
 endif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
@@ -110,9 +104,9 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)

    # get linker errors as soon as possible and not at runtime e.g. for modules
    if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-        set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-undefined,error")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-undefined,error")
    elseif(UNIX)
-        set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
    endif()
 endif(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)

@@ -149,7 +143,7 @@ endif(WIN32)
 SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
 SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
 SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
-# Don't set it without manual adaption of LibDir variable in src/App/FreeCADInit.py
+# Don't set it without manual adoption of LibDir variable in src/App/FreeCADInit.py
 SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")

 if(NOT WIN32)
@@ -174,14 +168,17 @@ MESSAGE(STATUS "datadir: ${CMAKE_INSTALL_DATADIR}")
 MESSAGE(STATUS "docdir: ${CMAKE_INSTALL_DOCDIR}")
 MESSAGE(STATUS "includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
 MESSAGE(STATUS "libdir: ${CMAKE_INSTALL_LIBDIR}")
+MESSAGE(STATUS "cmake: ${CMAKE_VERSION}")

 # ==============================================================================
 # == Win32 is default behaviour use the LibPack copied in Source tree ==========
 if(MSVC)
-    OPTION(FREECAD_RELEASE_PDB "Create PDB file for Release version." OFF)
+    OPTION(FREECAD_RELEASE_PDB "Create PDB files for Release version." ON)
+    OPTION(FREECAD_RELEASE_SEH "Enable Structured Exception Handling for Release version." ON)
    OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." ON)
    OPTION(FREECAD_LIBPACK_USEPYSIDE "Use PySide in LibPack rather to PyQt and Swig." ON)
    set(FREECAD_LIBPACK_DIR ${CMAKE_SOURCE_DIR} CACHE PATH  "Directory of the FreeCAD LibPack")
+    OPTION(BUILD_USE_PCH "Activate precompiled headers where it's used." ON)
 else(MSVC)
    OPTION(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." OFF)
    set(FREECAD_LIBPACK_DIR ""  CACHE PATH  "Directory of the FreeCAD LibPack")
@@ -192,14 +189,14 @@ endif(MSVC)

 # Switch to build FreeCAD with Qt5
 OPTION(BUILD_QT5 "Build with Qt5." OFF)
-OPTION(BUILD_QT5_WEBKIT "Build with Qt5." ON)
 OPTION(BUILD_GUI "Build FreeCAD Gui. Otherwise you have only the command line and the Python import module." ON)
-OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3rd party libs. On Windows the Installer is built." OFF)
 OPTION(FREECAD_USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
 OPTION(FREECAD_USE_EXTERNAL_SMESH "Use system installed smesh instead of the bundled." OFF)
 OPTION(FREECAD_USE_EXTERNAL_KDL "Use system installed orocos-kdl instead of the bundled." OFF)
 OPTION(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
 OPTION(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
+OPTION(BUILD_WITH_CONDA "Set ON if you build freecad with conda" OFF)
+OPTION(OCCT_CMAKE_FALLBACK "disable usage of occt-config files" OFF)
 if (WIN32 OR APPLE)
    OPTION(FREECAD_USE_QT_FILEDIALOG "Use Qt's file dialog instead of the native one." OFF)
 else()
@@ -262,6 +259,7 @@ OPTION(BUILD_JTREADER "Build the FreeCAD jt reader module" OFF)
 OPTION(BUILD_MATERIAL "Build the FreeCAD material module" ON)
 OPTION(BUILD_MESH "Build the FreeCAD mesh module" ON)
 OPTION(BUILD_MESH_PART "Build the FreeCAD mesh part module" ON)
+OPTION(BUILD_FLAT_MESH "Build the FreeCAD flat mesh module" OFF)
 OPTION(BUILD_OPENSCAD "Build the FreeCAD openscad module" ON)
 OPTION(BUILD_PART "Build the FreeCAD part module" ON)
 OPTION(BUILD_PART_DESIGN "Build the FreeCAD part design module" ON)
@@ -343,6 +341,7 @@ REQUIRES_MODS(BUILD_IMPORT             BUILD_PART)
 REQUIRES_MODS(BUILD_INSPECTION         BUILD_MESH BUILD_POINTS BUILD_PART)
 REQUIRES_MODS(BUILD_JTREADER           BUILD_MESH)
 REQUIRES_MODS(BUILD_MESH_PART          BUILD_PART BUILD_MESH BUILD_SMESH)
+REQUIRES_MODS(BUILD_FLAT_MESH          BUILD_MESH_PART)
 REQUIRES_MODS(BUILD_OPENSCAD           BUILD_MESH_PART BUILD_DRAFT)
 REQUIRES_MODS(BUILD_PART_DESIGN        BUILD_SKETCHER)
 REQUIRES_MODS(BUILD_PATH               BUILD_PART BUILD_ROBOT)
@@ -381,16 +380,6 @@ if(FREECAD_LIBPACK_USE)
    IF(FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
        set(FREECAD_LIBPACK_VERSION "CLbundler" CACHE STRING "Displays if the libpack has been found" FORCE)
        include(cMake/UseLibPackCLbundler.cmake)
-    ELSEIF(FREECAD_LIBPACK_CHECKFILE6X)
-        set(FREECAD_LIBPACK_VERSION "6.x" CACHE STRING "Displays if the libpack has been found" FORCE)
-        include(cMake/UseLibPack6x.cmake)
-    ELSEIF(FREECAD_LIBPACK_CHECKFILE7X)
-        set(FREECAD_LIBPACK_VERSION "7.x" CACHE STRING "Displays if the libpack has been found" FORCE)
-        include(cMake/UseLibPack7x.cmake)
-    ELSEIF(FREECAD_LIBPACK_CHECKFILE8X)
-        set(FREECAD_LIBPACK_VERSION "8.x" CACHE STRING "Displays if the libpack has been found" FORCE)
-        include(cMake/UseLibPack8x.cmake)
-        set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/tools/swigwin-1.3.40/swig.exe CACHE STRING "Swig" FORCE)
    ELSEIF(FREECAD_LIBPACK_CHECKFILE9X)
        set(FREECAD_LIBPACK_VERSION "9.x" CACHE STRING "Displays if the libpack has been found" FORCE)
        include(cMake/UseLibPack9x.cmake)
@@ -448,7 +437,7 @@ if(NOT FREECAD_LIBPACK_USE OR FREECAD_LIBPACK_CHECKFILE_CLBUNDLER)
 set(Python_ADDITIONAL_VERSIONS "2.7")

 # For building on OS X
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT BUILD_WITH_CONDA)

    # If the user doesn't tell us which package manager they're using
    if(NOT DEFINED MACPORTS_PREFIX AND NOT DEFINED HOMEBREW_PREFIX)
@@ -558,7 +547,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    endif(NOT DEFINED PYTHON_LIBRARY)


-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT BUILD_WITH_CONDA)

    find_package(PythonInterp REQUIRED)
    set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
@@ -589,23 +578,39 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
        find_package(PCL REQUIRED COMPONENTS common kdtree features surface io filters segmentation sample_consensus)
    endif(FREECAD_USE_PCL)

+# -------------------------------- PyBind11 -----------------------------
+# necessary for flat-mesh feature
+OPTION(FREECAD_USE_PYBIND11 "Use pybind11" OFF)
+if (FREECAD_USE_PYBIND11)
+    find_package(pybind11 REQUIRED)
+endif()
 # -------------------------------- Boost --------------------------------

    SET(_boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS})

+    set (BOOST_COMPONENTS filesystem program_options regex system thread)
    find_package(Boost ${BOOST_MIN_VERSION}
-        COMPONENTS filesystem program_options regex signals system thread REQUIRED)
+        COMPONENTS ${BOOST_COMPONENTS} REQUIRED)
+
+    if(UNIX AND NOT APPLE)
+        # Boost.Thread 1.67+ headers reference pthread_condattr_*
+        list(APPEND Boost_LIBRARIES pthread)
+    endif()

    IF(NOT Boost_FOUND)
-        MESSAGE(FATAL_ERROR "========================================\n"
-                            "boost not found, install the components:\n"
-                            " * filesystem\n"
-                            " * program_options\n"
-                            " * regex\n"
-                            " * signals\n"
-                            " * system\n"
-                            " * thread\n"
-                            "========================================\n")
+        set (NO_BOOST_COMPONENTS)
+        foreach (comp ${BOOST_COMPONENTS})
+            string(TOUPPER ${comp} uppercomp)
+            if (NOT Boost_${uppercomp}_FOUND)
+                list(APPEND NO_BOOST_COMPONENTS ${comp})
+            endif()
+        endforeach()
+        MESSAGE(FATAL_ERROR "=============================================\n"
+                            "Required components:\n"
+                            " ${BOOST_COMPONENTS}\n"
+                            "Not found, install the components:\n"
+                            " ${NO_BOOST_COMPONENTS}\n"
+                            "=============================================\n")
    ENDIF(NOT Boost_FOUND)

 # -------------------------------- XercesC --------------------------------
@@ -638,6 +643,13 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

    # Salome SMESH sources are under src/3rdParty now
    IF(BUILD_SMESH)
+        # set the internal smesh version:
+        # see src/3rdParty/salomonemesh/CMakeLists.txt and commit https://github.com/FreeCAD/FreeCAD/commit/666a3e5 and https://forum.freecadweb.org/viewtopic.php?f=10&t=30838
+        set(SMESH_VERSION_MAJOR 7)
+        set(SMESH_VERSION_MINOR 7)
+        set(SMESH_VERSION_PATCH 1)
+        set(SMESH_VERSION_TWEAK 0)
+
        #if we use smesh we definitely also need vtk, no matter of external or internal smesh
        set (VTK_COMPONENTS
            vtkCommonCore
@@ -655,7 +667,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
        # check which modules are available
        if(UNIX OR WIN32)
            find_package(VTK COMPONENTS vtkCommonCore REQUIRED NO_MODULE)
-            list(APPEND VTK_COMPONENTS vtkIOMPIParallel vtkParallelMPI vtkhdf5)
+            list(APPEND VTK_COMPONENTS vtkIOMPIParallel vtkParallelMPI vtkhdf5 vtkFiltersParallelDIY2 vtkRenderingCore vtkInteractionStyle vtkRenderingFreeType vtkRenderingOpenGL2)
            foreach(_module ${VTK_COMPONENTS})
                list (FIND VTK_MODULES_ENABLED ${_module} _index)
                if (${_index} GREATER -1)
@@ -664,7 +676,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
            endforeach()
        endif()

-        # don't check VERSION 6 as this would exlude VERSION 7
+        # don't check VERSION 6 as this would exclude VERSION 7
        if(AVAILABLE_VTK_COMPONENTS)
            message(STATUS "VTK components: ${AVAILABLE_VTK_COMPONENTS}")
            find_package(VTK COMPONENTS ${AVAILABLE_VTK_COMPONENTS} REQUIRED NO_MODULE)
@@ -690,12 +702,23 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
        list(REMOVE_ITEM VTK_LIBRARIES "optimized" "debug")

        if(NOT FREECAD_USE_EXTERNAL_SMESH)
+            find_package(MEDFile REQUIRED)
            # See https://www.hdfgroup.org/HDF5/release/cmakebuild.html
            if (WIN32)
                find_package(HDF5 COMPONENTS NO_MODULE REQUIRED static)
            else()
                find_package(PkgConfig)
-                pkg_search_module(HDF5 hdf5-serial)
+		FILE(READ ${meddotH} TMPTXT)
+		STRING(FIND "${TMPTXT}" "#define MED_HAVE_MPI" matchres)
+		if(${matchres} EQUAL -1)
+			message(STATUS "We guess that libmed was built using hdf5-serial version")
+			set(HDF5_VARIANT "hdf5-serial")
+		else()
+			message(STATUS "We guess that libmed was built using hdf5-openmpi version")
+			set(HDF5_VARIANT "hdf5-openmpi")
+			set(HDF5_PREFER_PARALLEL TRUE) # if pkg-config fails, find_package(HDF5) needs this
+		endif()
+                pkg_search_module(HDF5 ${HDF5_VARIANT})
                if(NOT HDF5_FOUND)
                    find_package(HDF5 REQUIRED)
                else()
@@ -704,7 +727,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
                    link_libraries(${HDF5_LIBRARIES})
                    find_file(Hdf5dotH hdf5.h PATHS ${HDF5_INCLUDE_DIRS} NO_DEFAULT_PATH)
                    if(NOT Hdf5dotH)
-                        message( FATAL_ERROR "hdf5-serial not found in an error message above.")
+                        message( FATAL_ERROR "${HDF5_VARIANT} development header not found.")
                    endif()
                endif()
                check_include_file_cxx(hdf5.h HDF5_FOUND)
@@ -722,10 +745,12 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
                    message( WARNING "mpi.h was not found. Check for error above.")
                endif()
            endif()
-            find_package(MEDFile REQUIRED)
            set(SMESH_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/3rdParty/salomesmesh/inc)
-        else()
-            find_package(SMESH)
+
+        else(NOT FREECAD_USE_EXTERNAL_SMESH)
+            find_package(SMESH CONFIG)
+            set (SMESH_INCLUDE_DIR ${SMESH_INCLUDE_PATH})
+            SET(EXTERNAL_SMESH_LIBS ${SMESH_LIBRARIES})
            if(NOT SMESH_FOUND)
                message(ERROR "================\n"
                              "SMESH not found.\n"
@@ -733,7 +758,9 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
            endif()
            include_directories(${SMESH_INCLUDE_DIR})
        endif()
+
        set(SMESH_FOUND TRUE)
+        configure_file(SMESH_Version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/SMESH_Version.h)
    ENDIF(BUILD_SMESH)

 # -------------------------------- Netgen --------------------------------
@@ -766,6 +793,12 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
                "=================\n")
    ENDIF(NOT EIGEN3_FOUND)

+    if (${EIGEN3_VERSION} VERSION_LESS "3.3.1")
+        message(WARNING "Disable module flatmesh because it requires "
+                        "minimum Eigen3 version 3.3.1 but version ${EIGEN3_VERSION} was found")
+        set (BUILD_FLAT_MESH OFF)
+    endif()
+
 # -------------------------------- Qt --------------------------------

    if (NOT BUILD_QT5)
@@ -838,7 +871,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
            find_package(Qt5UiTools)
            find_package(Qt5Network)
            find_package(Qt5Concurrent)
-            if (BUILD_QT5_WEBKIT)
+            if (BUILD_WEB)
                find_package(Qt5WebKitWidgets)
            endif()
        endif(BUILD_GUI)
@@ -893,7 +926,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
        if(OPENGL_GLU_FOUND)
            find_package_message(OPENGL_GLU
                "Found OpenGLU: ${OPENGL_glu_LIBRARY}"
-                "[${OPENGL_glu_LIBRARY}][${OEPNGL_INCLUDE_DIR}]")
+                "[${OPENGL_glu_LIBRARY}][${OPENGL_INCLUDE_DIR}]")
        else(OPENGL_GLU_FOUND)
            message(FATAL_ERROR "======================\n"
                                "GLU library not found.\n"
@@ -927,8 +960,8 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
            SET(PYTHON_CONFIG_SUFFIX -python2.7 CACHE STRING "Shiboken cmake file suffix. If left empty, system default will be used: <ShibokenConfigPYTHON_CONFIG_SUFFIX.cmake>")
            SET(PYTHON_BASENAME -python2.7 CACHE STRING "Same as PYTHON_SUFFIX but for PySide. If left empty, PYTHON_SUFFIX will be used: <PySideConfigPYTHON_BASENAME.cmake>")
        else()
-            SET(PYTHON_CONFIG_SUFFIX "" CACHE STRING "Shiboken cmake file suffix. If left empty, system default will be used: <ShibokenConfigPYTHON_CONFIG_SUFFIX.cmake>")
-            SET(PYTHON_BASENAME "" CACHE STRING "Same as PYTHON_SUFFIX but for PySide. If left empty, PYTHON_SUFFIX will be used: <PySideConfigPYTHON_BASENAME.cmake>")
+            #SET(PYTHON_CONFIG_SUFFIX "" CACHE STRING "Shiboken cmake file suffix. If left empty, system default will be used: <ShibokenConfigPYTHON_CONFIG_SUFFIX.cmake>")
+            #SET(PYTHON_BASENAME "" CACHE STRING "Same as PYTHON_SUFFIX but for PySide. If left empty, PYTHON_SUFFIX will be used: <PySideConfigPYTHON_BASENAME.cmake>")
        endif()

        if(DEFINED MACPORTS_PREFIX)
@@ -936,21 +969,45 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
            find_package(PySide REQUIRED HINTS "${PYTHON_LIBRARY_DIR}/cmake")
        endif(DEFINED MACPORTS_PREFIX)

-        find_package(Shiboken2)# REQUIRED
+        find_package(Shiboken2 QUIET)# REQUIRED
+        if (Shiboken2_FOUND)
+            # Shiboken2 config file was found but it may use the wrong Python version
+            # Try to get the matching config suffix and repeat finding the package
+            if (PYTHON_VERSION_MAJOR LESS 3)
+                set(SHIBOKEN_PATTERN -python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+            else()
+                set(SHIBOKEN_PATTERN .cpython-${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+            endif()
+
+            file(GLOB SHIBOKEN_CONFIG "${Shiboken2_DIR}/Shiboken2Config${SHIBOKEN_PATTERN}*.cmake")
+            if (SHIBOKEN_CONFIG)
+                get_filename_component(SHIBOKEN_CONFIG_SUFFIX ${SHIBOKEN_CONFIG} NAME)
+                string(SUBSTRING ${SHIBOKEN_CONFIG_SUFFIX} 15 -1 SHIBOKEN_CONFIG_SUFFIX)
+                string(REPLACE ".cmake" "" PYTHON_CONFIG_SUFFIX ${SHIBOKEN_CONFIG_SUFFIX})
+                MESSAGE(STATUS "PYTHON_CONFIG_SUFFIX: ${PYTHON_CONFIG_SUFFIX}")
+                find_package(Shiboken2 QUIET)
+            endif()
+        endif()
+
        if(NOT SHIBOKEN_INCLUDE_DIR)
-            MESSAGE(FATAL_ERROR "====================\n"
-                                "shiboken2 not found.\n"
-                                "====================\n")
+            MESSAGE("====================\n"
+                    "shiboken2 not found.\n"
+                    "====================\n")
        endif(NOT SHIBOKEN_INCLUDE_DIR)

-        find_package(PySide2)# REQUIRED
+        find_package(PySide2 QUIET)# REQUIRED
        if(NOT PYSIDE_INCLUDE_DIR)
-            MESSAGE(FATAL_ERROR "==================\n"
-                                "PySide2 not found.\n"
-                                "==================\n")
+            MESSAGE("==================\n"
+                    "PySide2 not found.\n"
+                    "==================\n")
        endif(NOT PYSIDE_INCLUDE_DIR)

-        find_package(PySide2Tools REQUIRED) # PySide2 utilities (pyside2-uic & pyside2-rcc)
+        find_package(PySide2Tools QUIET) #REQUIRED # PySide2 utilities (pyside2-uic & pyside2-rcc)
+        if(NOT PYSIDE2_TOOLS_FOUND)
+            MESSAGE("=======================\n"
+                    "PySide2Tools not found.\n"
+                    "=======================\n")
+        endif(NOT PYSIDE2_TOOLS_FOUND)

        file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/Ext/PySide)
        file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/__init__.py "# PySide wrapper\n"
@@ -963,17 +1020,18 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
                                                            "from PySide2.QtWidgets import *\n"
                                                            "QHeaderView.setResizeMode = QHeaderView.setSectionResizeMode\n")
        file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvg.py  "from PySide2.QtSvg import *\n")
+        file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtUiTools.py  "from PySide2.QtUiTools import *\n")

-	if(APPLE)
+	if(APPLE AND NOT BUILD_WITH_CONDA)
 	    INSTALL(
-	        DIRECTORY	
+	        DIRECTORY
                    ${CMAKE_BINARY_DIR}/Ext/PySide
 		DESTINATION
                    MacOS
            )
 	else()
            INSTALL(
-	        DIRECTORY	
+	        DIRECTORY
                    ${CMAKE_BINARY_DIR}/Ext/PySide
                DESTINATION
                    Ext
@@ -984,10 +1042,10 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
        # Below are two variables that can be left empty for standard python 3 version,
        # but must be set by the user for different python versions such as 2.7, 3.5 ...
        if (PYTHON_VERSION_MAJOR LESS 3)
-            SET(PYTHON_SUFFIX -python2.7 CACHE STRING "Shiboken cmake file suffix. If left empty, system default will be used: <ShibokenConfigPYTHON_SUFFIX.cmake>")
+            SET(PYTHON_CONFIG_SUFFIX -python2.7 CACHE STRING "Shiboken cmake file suffix. If left empty, system default will be used: <ShibokenConfigPYTHON_CONFIG_SUFFIX.cmake>")
            SET(PYTHON_BASENAME -python2.7 CACHE STRING "Same as PYTHON_SUFFIX but for PySide. If left empty, PYTHON_SUFFIX will be used: <PySideConfigPYTHON_BASENAME.cmake>")
        else()
-            SET(PYTHON_SUFFIX "" CACHE STRING "Shiboken cmake file suffix. If left empty, system default will be used: <ShibokenConfigPYTHON_SUFFIX.cmake>")
+            SET(PYTHON_CONFIG_SUFFIX "" CACHE STRING "Shiboken cmake file suffix. If left empty, system default will be used: <ShibokenConfigPYTHON_CONFIG_SUFFIX.cmake>")
            SET(PYTHON_BASENAME "" CACHE STRING "Same as PYTHON_SUFFIX but for PySide. If left empty, PYTHON_SUFFIX will be used: <PySideConfigPYTHON_BASENAME.cmake>")
        endif()

@@ -1073,8 +1131,8 @@ ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)

 IF(MSVC)
 	# set default compiler settings
-	SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHa")
-	SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG /Zm128")
+	SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zm150")
+    SET (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFC_DEBUG /Zm150 /bigobj")
 	# set default libs
 	SET (CMAKE_C_STANDARD_LIBRARIES "kernel32.lib user32.lib gdi32.lib winspool.lib SHFolder.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib winmm.lib comsupp.lib Ws2_32.lib dbghelp.lib ")
 	set (CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES}")
@@ -1086,6 +1144,9 @@ IF(MSVC)
 		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
 		set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG")
 	ENDIF(FREECAD_RELEASE_PDB)
+    IF(FREECAD_RELEASE_SEH)
+		SET (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHa")
+    ENDIF(FREECAD_RELEASE_SEH)

 	# Mark 32 bit executables large address aware so they can use > 2GB address space
 	# NOTE: This setting only has an effect on machines with at least 3GB of RAM, although it sets the linker option it doesn't set the linker switch 'Enable Large Addresses'
@@ -1124,102 +1185,17 @@ add_subdirectory(data)

 # ================================================================================
 # == Packaging ===================================================================
-if(FREECAD_MAINTAINERS_BUILD AND NOT WIN32)
-	set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "An extensible Open Source CAx program")
-	set(CPACK_PACKAGE_VENDOR "FreeCAD development team")
-	if(WIN32)
-		set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.Win32")
-	else(WIN32)
-		set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.Linux")
-	endif(WIN32)
-	set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/copying.lib")
-	set(CPACK_PACKAGE_VERSION_MAJOR ${PACKAGE_VERSION_MAJOR})
-	set(CPACK_PACKAGE_VERSION_MINOR ${PACKAGE_VERSION_MINOR})
-	set(CPACK_PACKAGE_VERSION_PATCH ${PACKAGE_VERSION_PATCH})
-	set(CPACK_SOURCE_PACKAGE_FILE_NAME ${PACKAGE_NAME}-${PACKAGE_VERSION})
-
-	#for debian: 'cmake .. -DFREECAD_MAINTAINERS_BUILD=TRUE -DCPACK_GENERATOR="DEB"'
-	IF( CMAKE_SIZEOF_VOID_P EQUAL 4 )
-		set(PKG_ARCH i386)
-	ELSE( CMAKE_SIZEOF_VOID_P EQUAL 4 )
-		set(PKG_ARCH amd64)
-	ENDIF( CMAKE_SIZEOF_VOID_P EQUAL 4 )
-	set(CPACK_DEBIAN_PACKAGE_SECTION "science")
-	set(CPACK_DEBIAN_PACKAGE_DEPENDS "python, oce | opencascade, libqtgui4, libcoin60, libxerces-c3.1, zlib1g, libboost-dev, libeigen2-dev")
-	set(CPACK_PACKAGE_CONTACT "<root@localhost>")
-	set(CPACK_PACKAGE_FILE_NAME "${PACKAGE_NAME}-${PACKAGE_VERSION}_${PKG_ARCH}")
-
-	if(WIN32)
-		set(CPACK_GENERATOR "ZIP")
-		set(CPACK_SOURCE_GENERATOR "ZIP")
-	else(WIN32)
-		if( CPACK_GENERATOR STREQUAL "" )
-			set(CPACK_GENERATOR "TGZ")
-			set(CPACK_SOURCE_GENERATOR "TGZ")
-		endif()
-	endif(WIN32)
-	file(GLOB DOT ".*")
-	file(GLOB TILD "*~")
-	set(CPACK_SOURCE_IGNORE_FILES
-	  "${DOT}"
-	  "${TILD}"
-	  ".a$"
-	  ".am$"
-	  ".in$"
-	  ".bat$"
-	  ".o$"
-	  ".so$"
-	  ".m4$"
-	  "/_build/"
-	  "/_cmake/"
-	  "/.deps/"
-	  "/.svn/"
-	  "/CMakeFiles/"
-	  "/CVS/"
-	  "/autom4te.cache/"
-	  "/build/"
-	  "/debian/"
-	  "/debug/"
-	  "/docs/"
-	  "/m4/"
-	  "/qt-build/"
-	  "/CxImage/"
-	  "/WindowsInstaller/"
-	  "AdditionalInfo.txt$"
-	  "CMakeCache.txt$"
-	  "Makefile$"
-	  "\\\\.sh$"
-	  "_CPack_"
-	  "config.h$"
-	  "config.log$"
-	  "config.status$"
-	  "configure$"
-	  "configure.ac$"
-	  "Doxyfile"
-	  "html$"
-	  "stamp-h1$"
-	  ".swp$"
-	  "tar.bz2"
-	  "tar.gz"
-	  "~$"
-	)
-	set(CPACK_SOURCE_STRIP_FILES "")
-	include(CPack)
-
-	#ADD_CUSTOM_TARGET(DIST make package_source)
-
-endif(FREECAD_MAINTAINERS_BUILD AND NOT WIN32)
-    #add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
-    add_custom_target(dist-git
+#add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+add_custom_target(dist-git
            COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
              --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR}
              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-    add_custom_target(distdfsg-git
+)
+add_custom_target(distdfsg-git
            COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
              --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR} --dfsg
              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
+)
 if(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
    add_custom_target(distcheck-git
            COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
@@ -1233,6 +1209,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
    )
 endif(CMAKE_COMPILER_IS_GNUCXX OR MINGW)

+
 # Print message to start build process
 if (${CMAKE_BUILD_TOOL} MATCHES "make")
    MESSAGE("=======================================\n"
@@ -1,5 +1,4 @@
-Changelog you find now here:
-http://www.freecadweb.org/tracker/changelog_page.php
+Note: Future changelog now located at: http://www.freecadweb.org/tracker/changelog_page.php

 Version: 0.14
  * Python path messed up after installation
@@ -62,7 +61,7 @@ Version: 0.14
  * Draft Dimensions due not observe Dimension Precision on FreeCAD Windows
  * invalid DXF export
  * Port wiki, phpbb and mantis to self-hosted
-  * Crash propably in MeshPart
+  * Crash probably in MeshPart
  * Part.BSplineCurve: allow to set degree and mutliplicites when calling constructor.
  * FeaturePython objects should be able to define how POVray output is generated
  * Losing Snap when Object is getting more complex.
@@ -751,7 +750,7 @@ Version: V0.1B78 Date: Sun Nov 23 13:15:15 2003 +++++++++++++++++++++++++++++++

 Version: V0.1B77 Date: Fri Nov 14 14:56:14 2003 +++++++++++++++++++++++++++++++
  * Finished Setup stuff
-  * Removed all relativ paths
+  * Removed all relative paths
  * config HomePath is now not in bin anymore
  * all config files one dir up
  * FC runs now from every directory
@@ -906,7 +905,7 @@ Version: V0.1B50 Date: Fri Apr 04 22:10:24 2003 +++++++++++++++++++++++++++++++
  * some work on the Linux port

 Version: V0.1B49 Date: Thu Apr 03 22:45:35 2003 +++++++++++++++++++++++++++++++
-  * Master redisign of the window system, not yet full working
+  * Master redesign of the window system, not yet full working

 Version: V0.1B48 Date: Sun Mar 30 15:06:23 2003 +++++++++++++++++++++++++++++++
  * Big patch from Werner about:
@@ -952,10 +951,10 @@ Version: V0.1B39 Date: Mon Mar 03 12:32:14 2003 +++++++++++++++++++++++++++++++

 Version: V0.1B38 Date: Thu Feb 27 22:19:35 2003 +++++++++++++++++++++++++++++++
  * fix of memory leack in CmdBar (werner)
-  * start rebulding FCCommand framework
+  * start rebuilding FCCommand framework

 Version: V0.1B37 Date: Tue Feb 25 20:29:19 2003 +++++++++++++++++++++++++++++++
-  * massiv improved costomize dialog (werner)
+  * massively improved customize dialog (werner)
    - sorting position of toolbars

 Version: V0.1B36 Date: Sat Feb 22 18:12:19 2003 +++++++++++++++++++++++++++++++
@@ -1013,7 +1012,7 @@ Version: V0.1B26 Date: Tue Jan 21 05:59:01 2003 +++++++++++++++++++++++++++++++

 Version: V0.1B25 Date: Sun Jan 19 18:20:51 2003 +++++++++++++++++++++++++++++++
  * Big Linux port patch from Vaclav
-    - some fixes on implicite type conversion (Vaclav)
+    - some fixes on implicit type conversion (Vaclav)
    - moving all .cxx to .cpp mainly in gui
    - moving DlgCusomizeImpl to Imp
    - and InitGui to GuiInit
@@ -1,8 +1,3 @@
-NOTE! The LGPL below is copyrighted by the Free Software Foundation, but
-the instance of code that it refers to (the FreeCAD libraries) are copyrighted 
-by the authors who actually wrote it.
-				   
---------------------------------------------------------------------------
 		  GNU LIBRARY GENERAL PUBLIC LICENSE
 		       Version 2, June 1991

@@ -36,11 +36,11 @@ Other options are described at the [wiki Download page](http://www.freecadweb.or
 Build Status <img src="https://blog.travis-ci.com/images/travis-mascot-200px.png" height="30"/>
 ------------

-| Master | 0.16 | Translation |
+| Master | 0.17 | Translation |
 |:------:|:----:|:-----------:|
-|[![Master][freecad-master-status]][travis-branches]|[![0.16][freecad-0.16-status]][travis-branches]|[![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad)|
+|[![Master][freecad-master-status]][travis-branches]|[![0.17][freecad-0.17-status]][travis-branches]|[![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad)|

-[freecad-0.16-status]: https://travis-ci.org/FreeCAD/FreeCAD.svg?branch=0.16
+[freecad-0.17-status]: https://travis-ci.org/FreeCAD/FreeCAD.svg?branch=releases/FreeCAD-0-17
 [freecad-master-status]: https://travis-ci.org/FreeCAD/FreeCAD.svg?branch=master
 [travis-branches]: https://travis-ci.org/FreeCAD/FreeCAD/branches
 [travis-builds]: https://travis-ci.org/FreeCAD/FreeCAD/builds
@@ -0,0 +1,12 @@
+#ifndef SMESH_VERSION_H
+#define SMESH_VERSION_H
+
+/* SMESH_Version.h.  Generated from SMESH_Version.h.cmake by cmake.  */
+
+// SMESH version
+#define SMESH_VERSION_MAJOR ${SMESH_VERSION_MAJOR}
+#define SMESH_VERSION_MINOR ${SMESH_VERSION_MINOR}
+#define SMESH_VERSION_PATCH ${SMESH_VERSION_PATCH}
+#define SMESH_VERSION_TWEAK ${SMESH_VERSION_TWEAK}
+
+#endif // SMESH_VERSION_H
@@ -26,14 +26,14 @@ IF (COIN3D_FOUND)
      )
      IF( EXISTS ${COIN3D_DOC_PATH})
        message(STATUS "Coin3D doc is installed")
-        find_file(COIN3D_DOC_TAGFILE coin.tag 
+        find_file(COIN3D_DOC_TAGFILE coin.tag Coin.tag 
            ${COIN3D_DOC_PATH}
        )
        IF( EXISTS ${COIN3D_DOC_TAGFILE})
          SET( COIN3D_DOC_FOUND "YES"
          )
        ELSE( EXISTS ${COIN3D_DOC_TAGFILE})
-          find_file(COIN3D_DOC_TAGFILE_GZ coin.tag.gz 
+          find_file(COIN3D_DOC_TAGFILE_GZ coin.tag.gz Coin.tag.gz 
              ${COIN3D_DOC_PATH}
          )
          IF( EXISTS ${COIN3D_DOC_TAGFILE_GZ})
@@ -40,7 +40,11 @@ IF(MEDFILE_ROOT_DIR)
  LIST(APPEND CMAKE_PREFIX_PATH "${MEDFILE_ROOT_DIR}")
 ENDIF(MEDFILE_ROOT_DIR)

-FIND_PATH(MEDFILE_INCLUDE_DIRS med.h)
+FIND_PATH(MEDFILE_INCLUDE_DIRS med.h PATH_SUFFIXES med)
+FIND_FILE(meddotH med.h PATHS ${MEDFILE_INCLUDE_DIRS} NO_DEFAULT_PATH)
+IF(NOT meddotH)
+	MESSAGE(FATAL_ERROR "med.h not found, please install development header-files for libmedc")
+ENDIF(NOT meddotH)
 #FIND_PROGRAM(MDUMP mdump)
 FIND_LIBRARY(MEDFILE_C_LIBRARIES NAMES medC)
 FIND_LIBRARY(MEDFILE_F_LIBRARIES NAMES med)
@@ -1,5 +1,5 @@
 # Try to find nglib/netgen
-# 
+#
 # Optional input NETGENDATA is path to the netgen libsrc source tree - this is
 # required due to some headers not being installed by netgen.
 #
@@ -12,165 +12,160 @@
 #
 # See also: http://git.salome-platform.org/gitweb/?p=NETGENPLUGIN_SRC.git;a=summary

-SET(NETGEN_DEFINITIONS -DNO_PARALLEL_THREADS -DOCCGEOMETRY)

-IF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
-    # We haven't supported Netgen prior to 5.3.1 on MacOS, and the current
-    # plan is for the next Netgen version to be 6.1 (currently unreleased).
-    IF(DEFINED HOMEBREW_PREFIX)
-        SET(NGLIB_PREFIX ${HOMEBREW_PREFIX})
-    ELSE(DEFINED HOMEBREW_PREFIX)
-        SET(NGLIB_PREFIX ${MACPORTS_PREFIX})
-    ENDIF(DEFINED HOMEBREW_PREFIX)
+find_package(Netgen CONFIG)
+if(Netgen_FOUND)
+  set(NGLIB_INCLUDE_DIR ${NETGEN_INCLUDE_DIRS})
+  set(NGLIB_LIBRARIES nglib)
+  set(NETGEN_DEFINITIONS -DNO_PARALLEL_THREADS -DOCCGEOMETRY)
+  # for external smesh only the following two variables are needed:
+  set(NETGEN_FOUND True)
+  set(NETGEN_INCLUDE_DIRS ${NETGEN_INCLUDE_DIRS})

-    FIND_PATH(NGLIB_INCLUDE_DIR nglib.h ${NGLIB_PREFIX}/include)
+else(Netgen_FOUND)

-    FIND_LIBRARY(NGLIB_LIBNGLIB nglib ${NGLIB_PREFIX}/lib)
-    FIND_LIBRARY(NGLIB_LIBMESH mesh ${NGLIB_PREFIX}/lib)
-    FIND_LIBRARY(NGLIB_LIBOCC occ ${NGLIB_PREFIX}/lib)
-    FIND_LIBRARY(NGLIB_LIBINTERFACE interface ${NGLIB_PREFIX}/lib)
-    SET(NGLIB_LIBRARIES ${NGLIB_LIBNGLIB} ${NGLIB_LIBMESH}
-                        ${NGLIB_LIBOCC} ${NGLIB_LIBINTERFACE})

-    IF(NOT NETGENDATA)
-        SET(NETGENDATA ${NGLIB_PREFIX}/include/netgen)
-    ENDIF(NOT NETGENDATA)
+  SET(NETGEN_DEFINITIONS -DNO_PARALLEL_THREADS -DOCCGEOMETRY)

-ELSEIF(WIN32)
-    FIND_PATH(NGLIB_INCLUDE_DIR NAMES nglib.h PATHS ${NETGEN_INCLUDEDIR})
-    SET(NETGEN_LIBS nglib mesh occ interface)
-    SET(NGLIB_LIBRARIES "")
-    FOREACH(it ${NETGEN_LIBS})
-        FIND_LIBRARY(NGLIB ${it} PATHS ${NETGEN_LIBDIR})
-        FIND_LIBRARY(NGLIBD ${it}d PATHS ${NETGEN_LIBDIR})
-        IF(NGLIBD AND NGLIB)
-            SET(NG_LIB optimized ${NGLIB}
-                       debug ${NGLIBD})
-            SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NG_LIB})
-            UNSET(NGLIB CACHE)
-            UNSET(NGLIBD CACHE)
-        ELSEIF(NGLIB)
-            SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NGLIB})
-            UNSET(NGLIB CACHE)
-        ENDIF()
-    ENDFOREACH()
+  IF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
+      # We haven't supported Netgen prior to 5.3.1 on MacOS, and the current
+      # plan is for the next Netgen version to be 6.1 (currently unreleased).
+      IF(DEFINED HOMEBREW_PREFIX)
+          SET(NGLIB_PREFIX ${HOMEBREW_PREFIX})
+      ELSE(DEFINED HOMEBREW_PREFIX)
+          SET(NGLIB_PREFIX ${MACPORTS_PREFIX})
+      ENDIF(DEFINED HOMEBREW_PREFIX)

-    IF(NOT NETGENDATA)
-        SET(NETGENDATA netgen)
-    ENDIF(NOT NETGENDATA)
+      FIND_PATH(NGLIB_INCLUDE_DIR nglib.h ${NGLIB_PREFIX}/include)

-ELSE(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
-    IF(NETGEN_ROOT)
-        SET(NETGEN_INCLUDEDIR ${NETGEN_ROOT}/include)
-        SET(NETGEN_LIBDIR ${NETGEN_ROOT}/lib)
-        # allow to customize if NETGEN_ROOT is used
-        IF(NOT NETGENDATA)
-            SET(NETGENDATA ${NETGEN_ROOT}/libsrc)
-        ENDIF(NOT NETGENDATA)
-    ENDIF()
+      FIND_LIBRARY(NGLIB_LIBNGLIB nglib ${NGLIB_PREFIX}/lib)
+      FIND_LIBRARY(NGLIB_LIBMESH mesh ${NGLIB_PREFIX}/lib)
+      FIND_LIBRARY(NGLIB_LIBOCC occ ${NGLIB_PREFIX}/lib)
+      FIND_LIBRARY(NGLIB_LIBINTERFACE interface ${NGLIB_PREFIX}/lib)
+      SET(NGLIB_LIBRARIES ${NGLIB_LIBNGLIB} ${NGLIB_LIBMESH}
+                          ${NGLIB_LIBOCC} ${NGLIB_LIBINTERFACE})

-    FIND_PATH(NGLIB_INCLUDE_DIR NAMES nglib.h PATHS ${NETGEN_INCLUDEDIR} /usr/include)
-    FIND_LIBRARY(NGLIB_LIBNGLIB nglib PATHS ${NETGEN_LIBDIR} /usr/lib /usr/local/lib)
-    SET(NGLIB_LIBRARIES ${NGLIB_LIBNGLIB})
-    FIND_LIBRARY(NGLIB_LIBMESH mesh PATHS ${NETGEN_LIBDIR} /usr/lib /usr/local/lib)
-    IF(NGLIB_LIBMESH)
-        SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NGLIB_LIBMESH})
-    ENDIF()
-    FIND_LIBRARY(NGLIB_LIBOCC occ PATHS ${NETGEN_LIBDIR} /usr/lib /usr/local/lib)
-    IF(NGLIB_LIBOCC)
-        SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NGLIB_LIBOCC})
-    ENDIF()
-    FIND_LIBRARY(NGLIB_LIBINTERFACE interface PATHS ${NETGEN_LIBDIR} /usr/lib /usr/local/lib)
-    IF(NGLIB_LIBINTERFACE)
-        SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NGLIB_LIBINTERFACE})
-    ENDIF()
+      IF(NOT NETGENDATA)
+          SET(NETGENDATA ${NGLIB_PREFIX}/include/netgen)
+      ENDIF(NOT NETGENDATA)

-    IF(NOT NETGENDATA)
-        SET(NETGENDATA /usr/share/netgen/libsrc)
-    ENDIF(NOT NETGENDATA)
+  ELSEIF(WIN32)
+      FIND_PATH(NGLIB_INCLUDE_DIR NAMES nglib.h PATHS ${NETGEN_INCLUDEDIR})
+      SET(NETGEN_LIBS nglib mesh occ interface)
+      SET(NGLIB_LIBRARIES "")
+      FOREACH(it ${NETGEN_LIBS})
+          FIND_LIBRARY(NGLIB ${it} PATHS ${NETGEN_LIBDIR})
+          FIND_LIBRARY(NGLIBD ${it}d PATHS ${NETGEN_LIBDIR})
+          IF(NGLIBD AND NGLIB)
+              SET(NG_LIB optimized ${NGLIB}
+                         debug ${NGLIBD})
+              SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NG_LIB})
+              UNSET(NGLIB CACHE)
+              UNSET(NGLIBD CACHE)
+          ELSEIF(NGLIB)
+              SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NGLIB})
+              UNSET(NGLIB CACHE)
+          ENDIF()
+      ENDFOREACH()

-ENDIF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
+      IF(NOT NETGENDATA)
+          SET(NETGENDATA netgen)
+      ENDIF(NOT NETGENDATA)

-FIND_PATH(NETGEN_DIR_include NAMES mydefs.hpp     PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/include)
-FIND_PATH(NETGEN_DIR_csg     NAMES csg.hpp        PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/csg)
-FIND_PATH(NETGEN_DIR_gen     NAMES array.hpp      PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/general)
-FIND_PATH(NETGEN_DIR_geom2d  NAMES geom2dmesh.hpp PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/geom2d)
-FIND_PATH(NETGEN_DIR_gprim   NAMES gprim.hpp      PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/gprim)
-FIND_PATH(NETGEN_DIR_la      NAMES linalg.hpp     PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/linalg)
-FIND_PATH(NETGEN_DIR_mesh    NAMES meshing.hpp    PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/meshing)
-FIND_PATH(NETGEN_DIR_occ     NAMES occgeom.hpp    PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/occ)
-FIND_PATH(NETGEN_DIR_stlgeom NAMES stlgeom.hpp    PATHS ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR} ${NETGENDATA}/stlgeom)
+  ELSE(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
+      IF(NETGEN_ROOT)
+          SET(NETGEN_INCLUDEDIR ${NETGEN_ROOT}/include)
+          SET(NETGEN_LIBDIR ${NETGEN_ROOT}/lib)
+          # allow to customize if NETGEN_ROOT is used
+          IF(NOT NETGENDATA)
+              SET(NETGENDATA ${NETGEN_ROOT}/libsrc)
+          ENDIF(NOT NETGENDATA)
+      ENDIF()

-IF(NOT NGLIB_INCLUDE_DIR AND NOT NETGEN_DIR_include)
-    MESSAGE(STATUS "Cannot find NETGEN header files.")
-ELSE()
-    file(STRINGS ${NETGEN_DIR_include}/mydefs.hpp NETGEN_VERSION
-        REGEX "#define PACKAGE_VERSION.*"
-    )
-    if (NETGEN_VERSION)
-	string(REGEX MATCHALL "[0-9]+" NETGEN_VERSION ${NETGEN_VERSION})
-	list(LENGTH NETGEN_VERSION NETGEN_VERSION_COUNT)
-	list(GET NETGEN_VERSION 0 NETGEN_VERSION_MAJOR)
-	if(NETGEN_VERSION_COUNT GREATER 1)
-	    list(GET NETGEN_VERSION 1 NETGEN_VERSION_MINOR)
-	else()
-	    set(NETGEN_VERSION_MINOR 0)
-	endif()
-    else()  # workaround for netgen 6.2 and newer. currently there is no easy way to detect the version
-	    # better use "find_package(netgen CONFIG REQUIRED)"
-	set(NETGEN_VERSION_MAJOR 6)
-	set(NETGEN_VERSION_MINOR 2)
-    endif()
-ENDIF()
+      FIND_PATH(NGLIB_INCLUDE_DIR NAMES nglib.h PATHS ${NETGEN_INCLUDEDIR} /usr/include /usr/include/netgen-mesher)
+      FIND_LIBRARY(NGLIB_LIBNGLIB nglib PATHS ${NETGEN_LIBDIR} /usr/lib /usr/lib64 /usr/local/lib)
+      SET(NGLIB_LIBRARIES ${NGLIB_LIBNGLIB})
+      FIND_LIBRARY(NGLIB_LIBMESH  NAMES mesh ngmesh PATHS ${NETGEN_LIBDIR} /usr/lib /usr/lib64 /usr/local/lib)
+      IF(NGLIB_LIBMESH)
+          SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NGLIB_LIBMESH})
+      ENDIF()
+      FIND_LIBRARY(NGLIB_LIBOCC NAMES occ ngocc PATHS ${NETGEN_LIBDIR} /usr/lib /usr/lib64 /usr/local/lib)
+      IF(NGLIB_LIBOCC)
+          SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NGLIB_LIBOCC})
+      ENDIF()
+      FIND_LIBRARY(NGLIB_LIBINTERFACE NAMES interface nginterface PATHS ${NETGEN_LIBDIR} /usr/lib /usr/lib64 /usr/local/lib)
+      IF(NGLIB_LIBINTERFACE)
+          SET(NGLIB_LIBRARIES ${NGLIB_LIBRARIES} ${NGLIB_LIBINTERFACE})
+      ENDIF()

-IF(NOT NGLIB_LIBRARIES)
-    MESSAGE(STATUS "Cannot find NETGEN library.")
-ENDIF()
+      IF(NOT NETGENDATA)
+          SET(NETGENDATA /usr/share/netgen/libsrc)
+      ENDIF(NOT NETGENDATA)

-IF(NGLIB_INCLUDE_DIR AND NGLIB_LIBRARIES)
-    SET(NETGEN_FOUND TRUE)
-    SET(NETGEN_INCLUDE_DIRS ${NETGEN_DIR_include} ${NGLIB_INCLUDE_DIR}
-      ${NETGEN_DIR_csg} ${NETGEN_DIR_gen} ${NETGEN_DIR_geom2d} 
-      ${NETGEN_DIR_gprim} ${NETGEN_DIR_la} ${NETGEN_DIR_mesh}
-      ${NETGEN_DIR_occ} ${NETGEN_DIR_stlgeom})
-    LIST(REMOVE_DUPLICATES NETGEN_INCLUDE_DIRS)
-    MATH(EXPR NETGEN_VERSION "(${NETGEN_VERSION_MAJOR} << 16) + (${NETGEN_VERSION_MINOR} << 8)")
-    MATH(EXPR NETGEN_VERSION_62 "(6 << 16) + (2 << 8)")
-    IF(NOT NETGEN_VERSION LESS NETGEN_VERSION_62) # Version >= 6.2
-      # NETGEN v6.2 or newer requires c++1y/c++14
-      include(CheckCXXCompilerFlag)
-      check_cxx_compiler_flag("-std=c++14" HAS_CPP14_FLAG)
-      check_cxx_compiler_flag("-std=c++1y" HAS_CPP1Y_FLAG)
-      if(HAS_CPP14_FLAG)
-          set(NETGEN_CXX_FLAGS "-std=c++14")
-      elseif(HAS_CPP1Y_FLAG)
-          set(NETGEN_CXX_FLAGS "-std=c++1y")
-      else()
-          # message(FATAL_ERROR "Unsupported compiler -- C++1y support or newer required!")
-          message(STATUS "can not detect c++1y support, but will try to build with c++1y")
-          set(NETGEN_CXX_FLAGS "-std=c++1y")
-      endif()
-      if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  ENDIF(DEFINED MACPORTS_PREFIX OR DEFINED HOMEBREW_PREFIX)
+
+  FIND_PATH(NETGEN_DIR_include NAMES mydefs.hpp     NO_DEFAULT_PATH PATHS ${NGLIB_INCLUDE_DIR}/include ${NETGENDATA}/include ${NETGEN_INCLUDEDIR} ${NGLIB_INCLUDE_DIR})
+
+  IF(NOT NGLIB_INCLUDE_DIR AND NOT NETGEN_DIR_include)
+      MESSAGE(STATUS "Cannot find NETGEN header files.")
+  ELSE()
+      file(STRINGS ${NETGEN_DIR_include}/mydefs.hpp NETGEN_VERSION
+          REGEX "#define PACKAGE_VERSION.*"
+      )
+  ENDIF()
+
+  IF(NOT NGLIB_LIBRARIES)
+      MESSAGE(STATUS "Cannot find NETGEN library.")
+  ENDIF()
+
+  IF(NGLIB_INCLUDE_DIR AND NGLIB_LIBRARIES)
+      SET(Netgen_FOUND TRUE)
+      SET(NETGEN_INCLUDE_DIRS ${NETGEN_DIR_include} ${NGLIB_INCLUDE_DIR})
+      LIST(REMOVE_DUPLICATES NETGEN_INCLUDE_DIRS)
+  ELSE()
+      SET(Netgen_FOUND FALSE)
+  ENDIF()
+endif(Netgen_FOUND)
+
+# Package-provided cMake file is not enough
+IF(Netgen_FOUND)
+  IF(NETGEN_VERSION)
+      string(REGEX MATCHALL "[0-9]+" NETGEN_VERSION_expr ${NETGEN_VERSION})
+      list(LENGTH NETGEN_VERSION_expr NETGEN_VERSION_COUNT)
+      list(GET NETGEN_VERSION_expr 0 NETGEN_VERSION_MAJOR)
+      IF(NETGEN_VERSION_COUNT GREATER 1)
+          list(GET NETGEN_VERSION_expr 1 NETGEN_VERSION_MINOR)
+      ELSE()
+          set(NETGEN_VERSION_MINOR 0)
+      ENDIF()
+  ELSE()  # workaround for netgen 6.2 and newer. currently there is no easy way to detect the version
+      # better use "find_package(netgen CONFIG REQUIRED)"
+      set(NETGEN_VERSION_MAJOR 6)
+      set(NETGEN_VERSION_MINOR 2)
+  ENDIF()
+
+  MATH(EXPR NETGEN_VERSION_C "(${NETGEN_VERSION_MAJOR} << 16) + (${NETGEN_VERSION_MINOR} << 8)")
+  MATH(EXPR NETGEN_VERSION_62 "(6 << 16) + (2 << 8)")
+  IF(NOT NETGEN_VERSION_C LESS NETGEN_VERSION_62) # Version >= 6.2
+    IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
        # Clang sometimes fails to include <cstdio>
        include(CMakePushCheckState)
        cmake_push_check_state(RESET)
        set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${NETGEN_CXX_FLAGS}")
        check_cxx_source_compiles("#include <cstdio>\nint main(){}" CSTDIO_INCLUDE_TRY1)
-        if(NOT CSTDIO_INCLUDE_TRY1)
-          # Ugly hack to make <stdio.h> building gets function
-          set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -U__cplusplus -D__cplusplus=201103L")
-          check_cxx_source_compiles("#include <cstdio>\nint main(){}" CSTDIO_INCLUDE_TRY2)
-          if(NOT CSTDIO_INCLUDE_TRY2)
-            message(FATAL_ERROR "Cannot #include <cstdio>.")
-          else()
-            set(NETGEN_CXX_FLAGS "${NETGEN_CXX_FLAGS} -U__cplusplus -D__cplusplus=201103L")
-          endif()
-        endif()
-        cmake_pop_check_state()
-      endif()
+        IF(NOT CSTDIO_INCLUDE_TRY1)
+            # Ugly hack to make <stdio.h> building gets function
+            set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -U__cplusplus -D__cplusplus=201103L")
+            check_cxx_source_compiles("#include <cstdio>\nint main(){}" CSTDIO_INCLUDE_TRY2)
+            IF(NOT CSTDIO_INCLUDE_TRY2)
+                message(FATAL_ERROR "Cannot #include <cstdio>.")
+            ELSE()
+                set(NETGEN_CXX_FLAGS "${NETGEN_CXX_FLAGS} -U__cplusplus -D__cplusplus=201103L")
+            ENDIF()
+         ENDIF()
+         cmake_pop_check_state()
    ENDIF()
-    MESSAGE(STATUS "Found NETGEN version ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}, calculated: ${NETGEN_VERSION}")
-    LIST(APPEND NETGEN_DEFINITIONS -DNETGEN_VERSION=${NETGEN_VERSION})
-ELSE()
-    SET(NETGEN_FOUND FALSE)
+  ENDIF()
+  MESSAGE(STATUS "Found NETGEN version ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}, calculated: ${NETGEN_VERSION_C}")
+  LIST(APPEND NETGEN_DEFINITIONS -DNETGEN_VERSION=${NETGEN_VERSION_C})
 ENDIF()
@@ -34,9 +34,41 @@ if(OCE_FOUND)
  set(OCC_INCLUDE_DIR ${OCE_INCLUDE_DIRS})
  #set(OCC_LIBRARY_DIR ${OCE_LIBRARY_DIR})
 else(OCE_FOUND) #look for OpenCASCADE
-  if(WIN32)
-    if(CYGWIN OR MINGW)
-    FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
+  # we first try to find opencascade directly:
+  if(NOT OCCT_CMAKE_FALLBACK)
+    find_package(OpenCASCADE CONFIG QUIET)
+  endif(NOT OCCT_CMAKE_FALLBACK)
+  if(OpenCASCADE_FOUND)
+    set(OCC_FOUND ${OpenCASCADE_FOUND})
+    set(OCC_INCLUDE_DIR ${OpenCASCADE_INCLUDE_DIR})
+    set(OCC_LIBRARY_DIR ${OpenCASCADE_LIBRARY_DIR})
+    set(OCC_LIBRARIES ${OpenCASCADE_LIBRARIES})
+    set(OCC_OCAF_LIBRARIES TKCAF TKXCAF)
+  else(OpenCASCADE_FOUND)
+    if(WIN32)
+      if(CYGWIN OR MINGW)
+      FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
+          /usr/include/opencascade
+          /usr/local/include/opencascade
+          /opt/opencascade/include
+          /opt/opencascade/inc
+        )
+        FIND_LIBRARY(OCC_LIBRARY TKernel
+          /usr/lib
+          /usr/local/lib
+          /opt/opencascade/lib
+        )
+      else(CYGWIN OR MINGW)
+      FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/include"
+        )
+        FIND_LIBRARY(OCC_LIBRARY TKernel
+          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/lib"
+        )
+      endif(CYGWIN OR MINGW)
+    else(WIN32)
+      FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
+        /usr/include/occt
        /usr/include/opencascade
        /usr/local/include/opencascade
        /opt/opencascade/include
@@ -47,35 +79,16 @@ else(OCE_FOUND) #look for OpenCASCADE
        /usr/local/lib
        /opt/opencascade/lib
      )
-    else(CYGWIN OR MINGW)
-    FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/include"
-      )
-      FIND_LIBRARY(OCC_LIBRARY TKernel
-        "[HKEY_LOCAL_MACHINE\\SOFTWARE\\SIM\\OCC\\2;Installation Path]/lib"
-      )
-    endif(CYGWIN OR MINGW)
-  else(WIN32)
-    FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
-      /usr/include/opencascade
-      /usr/local/include/opencascade
-      /opt/opencascade/include
-      /opt/opencascade/inc
-    )
-    FIND_LIBRARY(OCC_LIBRARY TKernel
-      /usr/lib
-      /usr/local/lib
-      /opt/opencascade/lib
-    )
-  endif(WIN32)
-  if(OCC_LIBRARY)
-    GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
-    IF(NOT OCC_INCLUDE_DIR)
-      FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
-        ${OCC_LIBRARY_DIR}/../inc
-      )
-    ENDIF()
-  endif(OCC_LIBRARY)
+    endif(WIN32)
+    if(OCC_LIBRARY)
+      GET_FILENAME_COMPONENT(OCC_LIBRARY_DIR ${OCC_LIBRARY} PATH)
+      IF(NOT OCC_INCLUDE_DIR)
+        FIND_PATH(OCC_INCLUDE_DIR Standard_Version.hxx
+          ${OCC_LIBRARY_DIR}/../inc
+        )
+      ENDIF()
+    endif(OCC_LIBRARY)
+  endif(OpenCASCADE_FOUND)
 endif(OCE_FOUND)

 if(OCC_INCLUDE_DIR)
@@ -27,13 +27,13 @@ if(PYCXX_INCLUDE_DIR)
    if(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
        if(PyCXX_FIND_REQUIRED)
            MESSAGE(FATAL_ERROR
-	        "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
-		"${PYCXX_INCLUDE_DIR}")
+                "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+            "${PYCXX_INCLUDE_DIR}")
        else(PyCXX_FIND_REQUIRED)
            MESSAGE(WARNING
-	        "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
-		"${PYCXX_INCLUDE_DIR}")
-	    unset(PYCXX_FOUND)
+                "PyCXX: could not find CXX/Config.hxx in PYCXX_INCLUDE_DIR "
+            "${PYCXX_INCLUDE_DIR}")
+            unset(PYCXX_FOUND)
        endif(PyCXX_FIND_REQUIRED)
    endif(NOT EXISTS "${PYCXX_INCLUDE_DIR}/CXX/Config.hxx")
 else(PYCXX_INCLUDE_DIR)
@@ -44,11 +44,11 @@ else(PYCXX_INCLUDE_DIR)
    if(NOT PYCXX_INCLUDE_DIR)
        if(PyCXX_FIND_REQUIRED)
            MESSAGE(FATAL_ERROR
-	        "PyCXX not found; please set PYCXX_INCLUDE_DIR to "
-		"the location of CXX/Config.hxx")
+                "PyCXX not found; please set PYCXX_INCLUDE_DIR to "
+                "the location of CXX/Config.hxx")
        else(PyCXX_FIND_REQUIRED)
            MESSAGE(STATUS "PyCXX not found")
-	    unset(PYCXX_FOUND)
+            unset(PYCXX_FOUND)
        endif(PyCXX_FIND_REQUIRED)
    endif(NOT PYCXX_INCLUDE_DIR)
 endif(PYCXX_INCLUDE_DIR)
@@ -58,14 +58,14 @@ if(PYCXX_SOURCE_DIR)
    # source directory specified, they'd better be there
    if(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
        if(PyCXX_FIND_REQUIRED)
-	    MESSAGE(FATAL_ERROR
-	        "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
-		"${PYCXX_INCLUDE_DIR}")
+            MESSAGE(FATAL_ERROR
+                "PyCXX: cxxextensions.c not found in PYCXX_SOURCE_DIR "
+                "${PYCXX_SOURCE_DIR}")
        else(PyCXX_FIND_REQUIRED)
            MESSAGE(WARNING
-	        "PyCXX: cxxextensions.c not found in PYCXX_INCLUDE_DIR "
-		"${PYCXX_INCLUDE_DIR}")
-	    unset(PYCXX_FOUND)
+                "PyCXX: cxxextensions.c not found in PYCXX_SOURCE_DIR "
+                "${PYCXX_SOURCE_DIR}")
+            unset(PYCXX_FOUND)
        endif(PyCXX_FIND_REQUIRED)
    endif(NOT EXISTS "${PYCXX_SOURCE_DIR}/cxxextensions.c")
 else(PYCXX_SOURCE_DIR)
@@ -79,29 +79,48 @@ else(PYCXX_SOURCE_DIR)
        "${CMAKE_CURRENT_LIST_DIR}/../CXX")
    if(NOT PYCXX_SOURCE_DIR)
        if(PyCXX_FIND_REQUIRED)
-	    MESSAGE(FATAL_ERROR
-	        "PyCXX not found; please set PYCXX_SOURCE_DIR to "
-		"the location of cxxextensions.c")
+            MESSAGE(FATAL_ERROR
+                "PyCXX not found; please set PYCXX_SOURCE_DIR to "
+                "the location of cxxextensions.c")
        else(PyCXX_FIND_REQUIRED)
            MESSAGE(STATUS "PyCXX not found")
-	    unset(PYCXX_FOUND)
+            unset(PYCXX_FOUND)
        endif(PyCXX_FIND_REQUIRED)
    endif(NOT PYCXX_SOURCE_DIR)
 endif(PYCXX_SOURCE_DIR)

+# Find PyCXX Version
+if(PYCXX_INCLUDE_DIR AND PYCXX_SOURCE_DIR)
+    file(READ ${PYCXX_INCLUDE_DIR}/CXX/Version.hxx PYCXX_VERSION_H)
+    foreach(item IN ITEMS MAJOR MINOR PATCH)
+        string(REGEX REPLACE
+            ".*#define[ \t]+PYCXX_VERSION_${item}[ \t]+([0-9]+).*"
+            "\\1" PYCXX_VERSION_${item}
+            "${PYCXX_VERSION_H}"
+        )
+    endforeach()
+    set(PYCXX_VERSION ${PYCXX_VERSION_MAJOR}.${PYCXX_VERSION_MINOR}.${PYCXX_VERSION_PATCH})
+endif()
+
 # see what we've got
 if(PYCXX_FOUND)
    MESSAGE(STATUS "PyCXX found:")
    MESSAGE(STATUS "  Headers:  ${PYCXX_INCLUDE_DIR}")
    MESSAGE(STATUS "  Sources:  ${PYCXX_SOURCE_DIR}")
+    MESSAGE(STATUS "  Version:  ${PYCXX_VERSION}")

    # Build the list of sources for convenience
    set(PYCXX_SOURCES
-	${PYCXX_SOURCE_DIR}/cxxextensions.c
-	${PYCXX_SOURCE_DIR}/cxx_extensions.cxx
-	${PYCXX_SOURCE_DIR}/cxxsupport.cxx
-	${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx
+        ${PYCXX_SOURCE_DIR}/cxxextensions.c
+        ${PYCXX_SOURCE_DIR}/cxx_extensions.cxx
+        ${PYCXX_SOURCE_DIR}/cxxsupport.cxx
+        ${PYCXX_SOURCE_DIR}/IndirectPythonInterface.cxx
    )
+    if(NOT ${PYCXX_VERSION} VERSION_LESS 7.0.0)
+        list(APPEND PYCXX_SOURCES
+            ${PYCXX_SOURCE_DIR}/cxx_exceptions.cxx)
+        add_definitions(-DPYCXX_6_2_COMPATIBILITY)
+    endif()
 else(PYCXX_FOUND)
    MESSAGE(STATUS "PyCXX not found")
 endif(PYCXX_FOUND)
@@ -31,21 +31,22 @@ MACRO(PYSIDE_WRAP_UI outfiles)
    #ADD_CUSTOM_TARGET(${it} ALL
    #  DEPENDS ${outfile}
    #)
-    if(WIN32)
+    if(WIN32 OR APPLE)
        ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
          COMMAND ${PYSIDE2UICBINARY} ${infile} -o ${outfile}
          MAIN_DEPENDENCY ${infile}
        )
-    else(WIN32)
+    else()
        # Especially on Open Build Service we don't want changing date like
-        # pyside2-uic generates in comments at beginning.
-        EXECUTE_PROCESS(
-          COMMAND ${PYSIDE2UICBINARY} ${infile}
-          COMMAND sed "/^# /d"
-          OUTPUT_FILE ${outfile}
+        # pyside2-uic generates in comments at beginning., which is why
+        # we follow the tool command with in-place sed.
+        ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+          COMMAND "${PYSIDE2UICBINARY}" "${infile}" -o "${outfile}"
+          COMMAND sed -i "/^# /d" "${outfile}"
+          MAIN_DEPENDENCY "${infile}"
        )
-    endif(WIN32)
-    SET(${outfiles} ${${outfiles}} ${outfile})
+    endif()
+    list(APPEND ${outfiles} ${outfile})
  ENDFOREACH(it)
 ENDMACRO (PYSIDE_WRAP_UI)

@@ -53,25 +54,26 @@ MACRO(PYSIDE_WRAP_RC outfiles)
  FOREACH(it ${ARGN})
    GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_rc.py)
+    SET(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}_rc.py")
    #ADD_CUSTOM_TARGET(${it} ALL
    #  DEPENDS ${outfile}
    #)
-    if(WIN32)
+    if(WIN32 OR APPLE)
        ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
          COMMAND ${PYSIDE2RCCBINARY} ${infile} -o ${outfile}
          MAIN_DEPENDENCY ${infile}
        )
-    else(WIN32)
+    else()
        # Especially on Open Build Service we don't want changing date like
-        # pyside2-rcc generates in comments at beginning.
-        EXECUTE_PROCESS(
-          COMMAND ${PYSIDE2RCCBINARY} ${infile}
-          COMMAND sed "/^# /d"
-          OUTPUT_FILE ${outfile}
-       )
-    endif(WIN32)
-    SET(${outfiles} ${${outfiles}} ${outfile})
+        # pyside-rcc generates in comments at beginning, which is why
+        # we follow the tool command with in-place sed.
+        ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
+          COMMAND "${PYSIDE2RCCBINARY}" "${infile}" ${PY_ATTRIBUTE} -o "${outfile}"
+          COMMAND sed -i "/^# /d" "${outfile}"
+          MAIN_DEPENDENCY "${infile}"
+        )
+    endif()
+    list(APPEND ${outfiles} ${outfile})
  ENDFOREACH(it)
 ENDMACRO (PYSIDE_WRAP_RC)

@@ -38,14 +38,15 @@ MACRO(PYSIDE_WRAP_UI outfiles)
        )
    else(WIN32)
        # Especially on Open Build Service we don't want changing date like
-        # pyside-uic generates in comments at beginning.
-        EXECUTE_PROCESS(
-          COMMAND ${PYSIDEUIC4BINARY} ${infile}
-          COMMAND sed "/^# /d"
-          OUTPUT_FILE ${outfile}
+        # pyside-uic generates in comments at beginning, which is why
+        # we follow the tool command with in-place sed.
+        ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+          COMMAND "${PYSIDEUIC4BINARY}" "${infile}" -o "${outfile}"
+          COMMAND sed -i "/^# /d" "${outfile}"
+          MAIN_DEPENDENCY "${infile}"
        )
    endif(WIN32)
-    SET(${outfiles} ${${outfiles}} ${outfile})
+    list(APPEND ${outfiles} ${outfile})
  ENDFOREACH(it)
 ENDMACRO (PYSIDE_WRAP_UI)

@@ -53,7 +54,7 @@ MACRO(PYSIDE_WRAP_RC outfiles)
  FOREACH(it ${ARGN})
    GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
    GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-    SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_rc.py)
+    SET(outfile "${CMAKE_CURRENT_BINARY_DIR}/${outfile}_rc.py")
    #ADD_CUSTOM_TARGET(${it} ALL
    #  DEPENDS ${outfile}
    #)
@@ -69,14 +70,15 @@ MACRO(PYSIDE_WRAP_RC outfiles)
        )
    else(WIN32)
        # Especially on Open Build Service we don't want changing date like
-        # pyside-rcc generates in comments at beginning.
-        EXECUTE_PROCESS(
-          COMMAND ${PYSIDERCC4BINARY} ${infile} ${PY_ATTRIBUTE}
-          COMMAND sed "/^# /d"
-          OUTPUT_FILE ${outfile}
-       )
+        # pyside-rcc generates in comments at beginning, which is why
+        # we follow the tool command with in-place sed.
+        ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
+          COMMAND "${PYSIDERCC4BINARY}" "${infile}" ${PY_ATTRIBUTE} -o "${outfile}"
+          COMMAND sed -i "/^# /d" "${outfile}"
+          MAIN_DEPENDENCY "${infile}"
+        )
    endif(WIN32)
-    SET(${outfiles} ${${outfiles}} ${outfile})
+    list(APPEND ${outfiles} ${outfile})
  ENDFOREACH(it)
 ENDMACRO (PYSIDE_WRAP_RC)

@@ -3,164 +3,162 @@ include (CheckCXXSourceRuns)
 # ================================================================================
 # == Macros, mostly for special targets ==========================================

-MACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR FILES TARGETS TAGS)
-# Macro to implement copy_if_different for a list of files
-# Arguments - 
-#   FROM_DIR - this is the source directory
-#   TO_DIR   - this is the destination directory
-#   FILES    - names of the files to copy 
-#              TODO: add globing. 
-#   TARGETS  - List of targets
-#   TAGS     - Since only the file name is used
-#              to generate rules, pre-pend a user 
-#              supplied tag to prevent duplicate rule errors. 
-SET(AddTargets "")
-FOREACH(SRC ${FILES})
-    GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME) 
-    # Command to copy the files to ${STEP1}/src, if changed.
-    SET(TARGET  "${TAGS}/${SRCFILE}")
-    IF("${FROM_DIR}" STREQUAL "")
-        SET(FROM ${SRC})
-    ELSE("${FROM_DIR}" STREQUAL "")
-        SET(FROM ${FROM_DIR}/${SRC})
-    ENDIF("${FROM_DIR}" STREQUAL "")        
-    IF("${TO_DIR}" STREQUAL "")
-        SET(TO ${SRCFILE})
-    ELSE("${TO_DIR}" STREQUAL "")
-        SET(TO   ${TO_DIR}/${SRCFILE})
-    ENDIF("${TO_DIR}" STREQUAL "")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${TARGET}
-        COMMAND ${CMAKE_COMMAND}
-        ARGS    -E copy_if_different ${FROM} ${TO}
-        COMMENT "Copying ${SRCFILE} ${TO_DIR}"
-        )
-    SET(AddTargets ${AddTargets} ${TARGET})
-ENDFOREACH(SRC ${FILES})
-SET(${TARGETS} ${AddTargets})
-ENDMACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR FILES TARGETS TAGS)
-
 MACRO (fc_copy_sources target_name outpath)
+	if(BUILD_VERBOSE_GENERATION)
+		set(fc_details " (fc_copy_sources called from ${CMAKE_CURRENT_SOURCE_DIR})")
+	else()
+		set(fc_details "")
+	endif()
 	foreach(it ${ARGN})
-		file(TO_NATIVE_PATH "${outpath}/${it}" outfile)
 		get_filename_component(infile ${it} ABSOLUTE)
-		get_filename_component(outfile ${outfile} ABSOLUTE)
-		add_file_dependencies(${infile} ${outfile})
+		get_filename_component(outfile "${outpath}/${it}" ABSOLUTE)
+		add_file_dependencies("${infile}" "${outfile}")
 		ADD_CUSTOM_COMMAND(
-			SOURCE    ${infile}
-			COMMAND   ${CMAKE_COMMAND}
-			ARGS      -E copy ${infile} ${outfile}
-			TARGET    ${target_name}
-			OUTPUTS   ${outfile}
+			COMMAND   "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
+			OUTPUT   "${outfile}"
+			COMMENT "Copying ${infile} to ${outfile}${fc_details}"
+			MAIN_DEPENDENCY "${infile}"
 		)
 	endforeach(it)
 	ADD_CUSTOM_COMMAND(
-		SOURCE    ${target_name}
 		TARGET    ${target_name}
 		DEPENDS   ${ARGN}
 	)
 ENDMACRO(fc_copy_sources)

+MACRO (fc_copy_file_if_different inputfile outputfile)
+    if (EXISTS ${inputfile})
+        if (EXISTS ${outputfile})
+            execute_process(
+                COMMAND ${CMAKE_COMMAND} -E compare_files ${inputfile}
+                                                          ${outputfile}
+                RESULT_VARIABLE DIFFERENT_FILES
+                OUTPUT_QUIET
+                ERROR_QUIET
+            )
+
+            if (DIFFERENT_FILES)
+                execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${inputfile}"
+                                                                   "${outputfile}")
+            endif()
+        else()
+            execute_process(COMMAND "${CMAKE_COMMAND}" -E copy "${inputfile}"
+                                                               "${outputfile}")
+        endif()
+    endif()
+ENDMACRO(fc_copy_file_if_different)
+
 MACRO (fc_target_copy_resource target_name inpath outpath)
+# Macro to copy a list of files into a nested directory structure
+# Arguments -
+#   target_name - name of the target the files will be added to
+#   inpath      - name of the source directory
+#   outpath     - name of the destination directory
+#   ARGN        - a list of relative file names that will be copied
+#
+#   If a relative file name is foo/bar.txt then the foo directory
+#   part will be kept so that the destination file name will be
+#   ${outpath}/foo/bar.txt
+#
+	if(BUILD_VERBOSE_GENERATION)
+		set(fc_details " (fc_target_copy_resource called from ${CMAKE_CURRENT_SOURCE_DIR})")
+	else()
+		set(fc_details "")
+	endif()
 	foreach(it ${ARGN})
-		file(TO_NATIVE_PATH "${inpath}/${it}" infile)
-		file(TO_NATIVE_PATH "${outpath}/${it}" outfile)
-		get_filename_component(infile ${infile} ABSOLUTE)
-		get_filename_component(outfile ${outfile} ABSOLUTE)
-		add_file_dependencies(${infile} ${outfile})
+		get_filename_component(infile "${inpath}/${it}" ABSOLUTE)
+		get_filename_component(outfile "${outpath}/${it}" ABSOLUTE)
+		add_file_dependencies("${infile}" "${outfile}")
 		ADD_CUSTOM_COMMAND(
-			SOURCE    ${infile}
-			COMMAND   ${CMAKE_COMMAND}
-			ARGS      -E copy ${infile} ${outfile}
-			TARGET    ${target_name}
-			OUTPUTS   ${outfile}
+			COMMAND   "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
+			OUTPUT   "${outfile}"
+			COMMENT "Copying ${infile} to ${outfile}${fc_details}"
+			MAIN_DEPENDENCY "${infile}"
 		)
 	endforeach(it)
 	ADD_CUSTOM_COMMAND(
-		SOURCE    ${target_name}
 		TARGET    ${target_name}
 		DEPENDS   ${ARGN}
 	)
 ENDMACRO(fc_target_copy_resource)

-macro(copy_to_local_output_paths SOURCE_PATHS)
-		 if(CMAKE_CFG_INTDIR STREQUAL .)
-		 		 # No Debug/Release output paths
-		 		 set(DEBUG_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-		 		 set(RELEASE_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-		 else(CMAKE_CFG_INTDIR STREQUAL .)
-		 		 #set(DEBUG_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/Debug)
-		 		 #set(RELEASE_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/Release)
-		 		 set(DEBUG_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-		 		 set(RELEASE_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-		 endif(CMAKE_CFG_INTDIR STREQUAL .)
-		 file(TO_NATIVE_PATH ${SOURCE_PATHS} NATIVE_SOURCE)
-		 file(TO_NATIVE_PATH ${DEBUG_LOCAL_OUTPUT_PATH}/ NATIVE_DEBUG_DESTINATION)
-		 file(TO_NATIVE_PATH ${RELEASE_LOCAL_OUTPUT_PATH}/ NATIVE_RELESE_DESTINATION)
-		 message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEBUG_DESTINATION}")
-		 execute_process(
-		 		 COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEBUG_DESTINATION}
-		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-		 if(NOT ${DEBUG_LOCAL_OUTPUT_PATH} STREQUAL ${RELEASE_LOCAL_OUTPUT_PATH})
-		 		 message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_RELESE_DESTINATION}")
-		 		 execute_process(
-		 		 		 COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_RELESE_DESTINATION}
-		 		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-		 endif(NOT ${DEBUG_LOCAL_OUTPUT_PATH} STREQUAL ${RELEASE_LOCAL_OUTPUT_PATH})
-endmacro(copy_to_local_output_paths)
-
-macro(copy_to_main_output_paths SOURCE_PATHS)
-		 file(TO_NATIVE_PATH ${SOURCE_PATHS} NATIVE_SOURCE)
-		 file(TO_NATIVE_PATH ${DEBUG_MAIN_OUTPUT_PATH}/ NATIVE_DEBUG_DESTINATION)
-		 file(TO_NATIVE_PATH ${RELEASE_MAIN_OUTPUT_PATH}/ NATIVE_RELESE_DESTINATION)
-		 message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEBUG_DESTINATION}")
-		 execute_process(
-		 		 COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEBUG_DESTINATION}
-		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-		 if(NOT ${DEBUG_MAIN_OUTPUT_PATH} STREQUAL ${RELEASE_MAIN_OUTPUT_PATH})
-		 		 message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_RELESE_DESTINATION}")
-		 		 execute_process(
-		 		 		 COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_RELESE_DESTINATION}
-		 		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-		 endif(NOT ${DEBUG_MAIN_OUTPUT_PATH} STREQUAL ${RELEASE_MAIN_OUTPUT_PATH})
-endmacro(copy_to_main_output_paths)
+MACRO (fc_target_copy_resource_flat target_name inpath outpath)
+# Macro to copy a list of files into a flat directory structure
+# Arguments -
+#   target_name - name of the target the files will be added to
+#   inpath      - name of the source directory
+#   outpath     - name of the destination directory
+#   ARGN        - a list of relative file names that will be copied
+#
+#   If a relative file name is foo/bar.txt then the foo directory
+#   part will be removed so that the destination file name will be
+#   ${outpath}/bar.txt
+#
+	if(BUILD_VERBOSE_GENERATION)
+		set(fc_details " (fc_target_copy_resource_flat called from ${CMAKE_CURRENT_SOURCE_DIR})")
+	else()
+		set(fc_details "")
+	endif()
+	foreach(it ${ARGN})
+		get_filename_component(infile "${inpath}/${it}" ABSOLUTE)
+		get_filename_component(outfile "${it}" NAME)
+		get_filename_component(outfile "${outpath}/${outfile}" ABSOLUTE)
+		add_file_dependencies("${infile}" "${outfile}")
+		ADD_CUSTOM_COMMAND(
+			COMMAND   "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
+			OUTPUT    "${outfile}"
+			COMMENT "Copying ${infile} to ${outfile}${fc_details}"
+			MAIN_DEPENDENCY "${infile}"
+		)
+	endforeach(it)
+	ADD_CUSTOM_COMMAND(
+		TARGET    ${target_name}
+		DEPENDS   ${ARGN}
+	)
+ENDMACRO(fc_target_copy_resource_flat)

 # It would be a bit cleaner to generate these files in ${CMAKE_CURRENT_BINARY_DIR}

 macro(generate_from_xml BASE_NAME)
-    file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/src/Tools/generate.py TOOL_PATH)
-    file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.xml SOURCE_PATH)
+    set(TOOL_PATH "${CMAKE_SOURCE_DIR}/src/Tools/generate.py")
+    file(TO_NATIVE_PATH "${TOOL_PATH}" TOOL_NATIVE_PATH)
+    file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.xml" SOURCE_NATIVE_PATH)

-    file(TO_NATIVE_PATH ${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.cpp SOURCE_CPP_PATH)
+    set(SOURCE_CPP_PATH "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.cpp" )
+    
    # BASE_NAME may include also a path name
-    GET_FILENAME_COMPONENT(OUTPUT_PATH ${SOURCE_CPP_PATH} PATH)
-    if (NOT EXISTS ${SOURCE_CPP_PATH})
+    GET_FILENAME_COMPONENT(OUTPUT_PATH "${SOURCE_CPP_PATH}" PATH)
+    file(TO_NATIVE_PATH "${OUTPUT_PATH}" OUTPUT_NATIVE_PATH)
+    if(NOT EXISTS "${SOURCE_CPP_PATH}")
        # assures the source files are generated at least once
        message(STATUS "${SOURCE_CPP_PATH}")
-        execute_process(COMMAND ${PYTHON_EXECUTABLE} ${TOOL_PATH} --outputPath ${OUTPUT_PATH} ${SOURCE_PATH}
-                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}"
+                        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
        )
-    endif (NOT EXISTS ${SOURCE_CPP_PATH})
-
+    endif()
    add_custom_command(
-        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.h ${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.cpp
-        COMMAND ${PYTHON_EXECUTABLE} ${TOOL_PATH} --outputPath ${OUTPUT_PATH} ${BASE_NAME}.xml
-        MAIN_DEPENDENCY ${BASE_NAME}.xml
-        DEPENDS ${CMAKE_SOURCE_DIR}/src/Tools/generateTemplates/templateClassPyExport.py
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        COMMENT Building ${BASE_NAME}.h/.cpp out of ${BASE_NAME}.xml
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.cpp"
+        COMMAND ${PYTHON_EXECUTABLE} "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" ${BASE_NAME}.xml
+        MAIN_DEPENDENCY "${BASE_NAME}.xml"
+        DEPENDS
+        "${CMAKE_SOURCE_DIR}/src/Tools/generateTemplates/templateClassPyExport.py"
+        "${TOOL_PATH}"
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        COMMENT "Building ${BASE_NAME}.h/.cpp out of ${BASE_NAME}.xml"
    )
 endmacro(generate_from_xml)

 macro(generate_from_py BASE_NAME OUTPUT_FILE)
-		 file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR}/src/Tools/PythonToCPP.py TOOL_PATH)
-		 file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py SOURCE_PATH)
-		 add_custom_command(
-		 		 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}
-		 		 COMMAND ${PYTHON_EXECUTABLE} ${TOOL_PATH} ${SOURCE_PATH} ${OUTPUT_FILE}
-		 		 MAIN_DEPENDENCY ${BASE_NAME}.py
-		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-		 		 COMMENT Building files out of ${BASE_NAME}.py)
+		set(TOOL_PATH "${CMAKE_SOURCE_DIR}/src/Tools/PythonToCPP.py")
+		file(TO_NATIVE_PATH "${TOOL_PATH}" TOOL_NATIVE_PATH)
+		file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py" SOURCE_NATIVE_PATH)
+		add_custom_command(
+		 		OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}"
+		 		COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}"
+				MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py"
+				DEPENDS "${TOOL_PATH}"
+				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+				COMMENT "Building files out of ${BASE_NAME}.py")
 endmacro(generate_from_py)


@@ -236,15 +234,15 @@ MACRO(SET_BIN_DIR ProjectName OutputName)
    if(WIN32)
        set_target_properties(${ProjectName} PROPERTIES DEBUG_OUTPUT_NAME ${OutputName}_d)
    else(WIN32)
-        # FreeCADBase, SMDS, Driver, MEFISTO2 and area-native libs don't depend on parts from CMAKE_INSTALL_LIBDIR
-        if(NOT ${ProjectName} MATCHES "^(FreeCADBase|SMDS|Driver|MEFISTO2|area-native)$")
-            if(${ARGC} STREQUAL 4)
-                set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3})
-            else(${ARGC} STREQUAL 4)
-                set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
-            endif()
-        endif()
-    endif(WIN32)
+        # FreeCADBase, SMDS, Driver, MEFISTO2 and area-native libs don't depend on parts from CMAKE_INSTALL_LIBDIR
+        if(NOT ${ProjectName} MATCHES "^(FreeCADBase|SMDS|Driver|MEFISTO2|area-native)$")
+            if(${ARGC} STREQUAL 4)
+                set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${ARGV3})
+            else(${ARGC} STREQUAL 4)
+                set_property(TARGET ${ProjectName} APPEND PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_LIBDIR})
+            endif()
+        endif()
+    endif(WIN32)
 ENDMACRO(SET_BIN_DIR)

 # Set python prefix & suffix together
@@ -255,8 +253,8 @@ MACRO(SET_PYTHON_PREFIX_SUFFIX ProjectName)
    
    if(WIN32)
        set_target_properties(${ProjectName} PROPERTIES SUFFIX ".pyd")
-    # 0000661: cmake build on Mac OS: dealing with dylib versus so
-    elseif(APPLE)
+    # 0000661: cmake build on Mac OS: dealing with dylib versus so
+    elseif(APPLE)
        set_target_properties(${ProjectName} PROPERTIES SUFFIX ".so")
    endif(WIN32)
-ENDMACRO(SET_PYTHON_PREFIX_SUFFIX)
+ENDMACRO(SET_PYTHON_PREFIX_SUFFIX)
@@ -7,10 +7,48 @@ set(OCE_DIR ${FREECAD_LIBPACK_DIR}/lib/cmake CACHE PATH "" FORCE)

 set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/swig/swig.exe CACHE FILEPATH "Swig" FORCE)

-set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe CACHE FILEPATH "" FORCE)
-set(PYTHON_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27.lib CACHE FILEPATH "" FORCE)
-set(PYTHON_DEBUG_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27_d.lib CACHE FILEPATH "" FORCE)
-set(PYTHON_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/python2.7 CACHE PATH "" FORCE)
+#set(PYTHON_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/python.exe CACHE FILEPATH "" FORCE)
+#set(PYTHON_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27.lib CACHE FILEPATH "" FORCE)
+#set(PYTHON_DEBUG_LIBRARY ${FREECAD_LIBPACK_DIR}/lib/python27_d.lib CACHE FILEPATH "" FORCE)
+#set(PYTHON_INCLUDE_DIR ${FREECAD_LIBPACK_DIR}/include/python2.7 CACHE PATH "" FORCE)
+
+if (BUILD_QT5)
+
+# default Qt5 stuff
+# Set paths to cmake config files for each Qt module
+set(Qt5_ROOT_DIR ${FREECAD_LIBPACK_DIR} CACHE PATH "")
+
+set (Qt5_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5 CACHE PATH "")
+set (Qt5AxBase_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5AxBase CACHE PATH "")
+set (Qt5AxContainer_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5AxContainer CACHE PATH "")
+set (Qt5AxServer_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5AxServer CACHE PATH "")
+set (Qt5Concurrent_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Concurrent CACHE PATH "")
+set (Qt5Core_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Core CACHE PATH "")
+set (Qt5DBus_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5DBus CACHE PATH "")
+set (Qt5Designer_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Designer CACHE PATH "")
+set (Qt5Gui_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Gui CACHE PATH "")
+set (Qt5Help_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Help CACHE PATH "")
+set (Qt5LinguistTools_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5LinguistTools CACHE PATH "")
+set (Qt5Multimedia_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Multimedia CACHE PATH "")
+set (Qt5MultimediaWidgets_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5MultimediaWidgets CACHE PATH "")
+set (Qt5Network_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Network CACHE PATH "")
+set (Qt5OpenGL_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5OpenGL CACHE PATH "")
+set (Qt5OpenGLExtensions_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5OpenGLExtensions CACHE PATH "")
+set (Qt5PrintSupport_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5PrintSupport CACHE PATH "")
+set (Qt5Qml_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Qml CACHE PATH "")
+set (Qt5Quick_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Quick CACHE PATH "")
+set (Qt5QuickTest_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5QuickTest CACHE PATH "")
+set (Qt5QuickWidgets_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5QuickWidgets CACHE PATH "")
+set (Qt5Sql_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Sql CACHE PATH "")
+set (Qt5Svg_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Svg CACHE PATH "")
+set (Qt5Test_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Test CACHE PATH "")
+set (Qt5UiPlugin_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5UiPlugin CACHE PATH "")
+set (Qt5UiTools_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5UiTools CACHE PATH "")
+set (Qt5Widgets_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Widgets CACHE PATH "")
+set (Qt5Xml_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5Xml CACHE PATH "")
+set (Qt5XmlPatterns_DIR ${Qt5_ROOT_DIR}/lib/cmake/Qt5XmlPatterns CACHE PATH "")
+
+endif (BUILD_QT5)

 find_library(XercesC_LIBRARIES xerces-c_3 "${FREECAD_LIBPACK_DIR}/lib")
 find_library(XercesC_DEBUG_LIBRARIES xerces-c_3D "${FREECAD_LIBPACK_DIR}/lib")
@@ -1,23 +1,28 @@
 mkdir -p build
 cd build

-cmake -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=$PREFIX \
-      -DCMAKE_PREFIX_PATH=$PREFIX \
-      -DBUILD_QT5=ON \
-      -DNETGENDATA=$PREFIX/include/netgen \
-      -DNETGEN_INCLUDEDIR=$PREFIX/include/netgen \
-      -DNGLIB_INCLUDE_DIR=$PREFIX/include/nglib \
-      -DOCC_INCLUDE_DIR=$PREFIX/include/opencascade \
-      -DOCC_LIBRARY_DIR=$PREFIX/lib \
-      -DOCC_LIBRARIES=$PREFIX/lib CACHE PATH \
-      -DFREECAD_USE_OCC_VARIANT="Official Version" \
-      -DOCC_OCAF_LIBRARIES=$PREFIX/lib CACHE PATH \
-      -DSWIG_DIR=$PREFIX/share/swig/3.0.8 \
-      -DSWIG_EXECUTABLE=$PREFIX/bin/swig \
-      -DPYTHON_EXECUTABLE=$PYTHON \
-      -DBUILD_FEM_NETGEN=YES \
-      -DUSE_BOOST_PYTHON=NO \
+cmake -D CMAKE_BUILD_TYPE=Release \
+      -D CMAKE_INSTALL_PREFIX=$PREFIX \
+      -D CMAKE_PREFIX_PATH=$PREFIX \
+      -D CMAKE_LIBRARY_PATH=$PREFIX/lib \
+      -D BUILD_QT5=ON \
+      -D NETGENDATA=$PREFIX/include/netgen \
+      -D NETGEN_INCLUDEDIR=$PREFIX/include/netgen \
+      -D NGLIB_INCLUDE_DIR=$PREFIX/include/nglib \
+      -D OCC_INCLUDE_DIR=$PREFIX/include/opencascade \
+      -D OCC_LIBRARY_DIR=$PREFIX/lib \
+      -D OCC_LIBRARIES=$PREFIX/lib CACHE PATH \
+      -D FREECAD_USE_OCC_VARIANT="Official Version" \
+      -D OCC_OCAF_LIBRARIES=$PREFIX/lib CACHE PATH \
+      -D SWIG_DIR=$PREFIX/share/swig/3.0.8 \
+      -D SWIG_EXECUTABLE=$PREFIX/bin/swig \
+      -D PYTHON_EXECUTABLE=$PYTHON \
+      -D BUILD_FEM_NETGEN=YES \
+      -D USE_BOOST_PYTHON=NO \
+      -D FREECAD_USE_PYBIND11=YES \
+      -D BUILD_ENABLE_CXX11=ON \
+      -D SMESH_INCLUDE_DIR=$PREFIX/include/smesh \
+      -D FREECAD_USE_EXTERNAL_SMESH=ON \
      /source

 make -j${CPU_COUNT} 2>&1 | tee output.txt
@@ -1,38 +1,41 @@
 package:
    name: freecad_daily
-    version: 0.17
+    version: 0.18

 build:
    number: 0

 requirements:
    build:
-        - nomkl  # [unix]
+        - toolchain
+        - gcc  # [unix]
        - vc 14  # [win and py>=35]
-        - ninja  # [win and py>=35]
+        - ninja
        - cmake
+        - nomkl  # [unix]
        - swig
        - eigen
        - boost-cpp 1.66.0
-        - pybind11  # [unix]
        - boost 1.66.0  # [win]
+        - pybind11  # [unix]
        - python
        - matplotlib
        - coin3d
        - pivy
-        - qt 5.*
-        - pyside2  2.0.0.dev0 py36_0  # [unix]
-        - pyside2  2.0.0.dev0 py36_vc14_0  # [win]
+        - qt 5.6.*
+        - pyside2 5.6.*
        - occt 7.2.0
-        - netgen
-        - vtk 8.*
-        - libmed
+        - smesh
+        - netgen  # [not win32]
+        - vtk 8.1.*
        - hdf5
-        - xerces-c 3.2.0
+        - xerces-c 3.2.*
        - zlib 1.2.*
        - doxygen
        - git
+        - libglu  # [linux]
    run:
+        - libgcc  # [unix]
        - vc 14  # [win and py>=35]
        - boost-cpp 1.66.0
        - boost 1.66.0  # [win]
@@ -41,16 +44,17 @@ requirements:
        - matplotlib
        - coin3d
        - pivy
-        - qt 5.*
-        - pyside2
-        - occt
-        - netgen
-        - vtk 8.*
-        - libmed
-        - xerces-c 3.2.0
+        - qt 5.6.*
+        - pyside2 5.6.*
+        - occt 7.2.0
+        - vtk 8.1.*
+        - smesh
+        - netgen  # [not win32]
+        - xerces-c 3.2.*
        - zlib 1.2*
        - git
        - calculix  # [unix]
+        - libglu  # [linux]
 about:
    summary: freecad

@@ -1,305 +0,0 @@
-freecad (0.15-1precise3) precise; urgency=low
-
-  * control: added netgen-headers to Build Depends.
-
- -- Normand Chamberland <gemnoc@gmail.com>  Sat, 04 Apr 2015 11:14:23 -0400
-
-freecad (0.15-1precise2) precise; urgency=low
-
-  * control: added pyside-tools to build deps, broke down python-pyside depends
-
- -- Normand Chamberland <gemnoc@gmail.com>  Thu, 06 Nov 2014 22:10:44 -0500
-
-freecad (0.15-1precise1) precise; urgency=low
-
-  * Bumped version number as per upstream version
-
- -- Normand Chamberland <gemnoc@gmail.com>  Thu, 07 Aug 2014 11:34:39 -0400
-
-freecad (0.14-1precise2) precise; urgency=low
-
-  * Set new version number.
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 13 Jul 2013 12:53:55 +0200
-
-freecad (0.13-1precise2) precise; urgency=low
-
-  * Fix hard dependency on libgl1-mesa-glx preventing installation on
-    Ubuntu 12.04.2 with LTSEnablementStack. Removal of shlibs.local file
-    and libgl1-mesa-dev deleted from BuildDeps.
-  * Removed version number from libsoqt4-dev BD.
-
- -- Normand Chamberland <gemnoc@gmail.com>  Sun, 05 May 2013 18:31:47 -0400
-
-freecad (0.13-1precise1) precise; urgency=low
-
-  * New release for Ubuntu 12.04 (precise)
-
- -- Normand Chamberland <gemnoc@gmail.com>  Sun, 06 May 2012 14:38:12 -0400
-
-freecad (0.11.3729.dfsg-2) unstable; urgency=low
-
-  * Add gfortran and libopencascade-visualization-dev to BD
-    to fix FTBFS (closes: #622694)
-  * Add libqtwebkit-dev to BD (closes: #618241)
-  * Delete quilt from BD and corresponding changes in rules.
-  * Add description to freecad-occ650.patch
-  * Delete encoding string from .desktop
-  * Fix some spelling errors, pointed out by lintian.  
-
- -- Anton Gladky <gladky.anton@gmail.com>  Thu, 14 Apr 2011 10:23:25 +0100
-
-freecad (0.11.3729.dfsg-1) unstable; urgency=low
-
-  [ Denis Barbier ]
-  * Merge OpenCASCADE 6.5.0 compatibility patch (closes: #617545).
-
-  [ Adam C. Powell, IV ]
-  * New upstream (closes: #622213, #618241).
-  * Changed to source format 3.0 (quilt).
-  * Added patch target which forces autotools to run, and automake and autoconf
-    are now in Build-Depends (closes: #607181).
-  * Set aside src/Build/Version.h to prevent build problems.
-  * Does not install .la files (closes: #621298).
-  * Boost 1.46 compatibility patch (closes: #621877).
-  * Set aside files which autotools modifies so clean works.
-  * Added libtool to Build-Depends (thanks: PICCA Frédéric-Emmanuel).
-  * Bumped Standards-Version, no changes needed.
-
- -- "Adam C. Powell, IV" <hazelsct@debian.org>  Tue, 12 Apr 2011 23:40:30 -0400
-
-freecad (0.10.3247.dfsg-2ubuntu3) natty; urgency=low
-
-  * Fix build failure with ld --as-needed.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Dec 2010 01:12:39 +0100
-
-freecad (0.10.3247.dfsg-2ubuntu2) natty; urgency=low
-
-  * Rebuild with python 2.7 as the python default.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 09 Dec 2010 16:46:45 +0000
-
-freecad (0.10.3247.dfsg-2ubuntu1) natty; urgency=low
-
-  * Merge from debian unstable. Remaining changes:
-    - build on libqtwebkit-dev for qtwebkit transition
-
- -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 20 Oct 2010 08:40:53 +0530
-
-freecad (0.10.3247.dfsg-2) unstable; urgency=low
-
-  * control:
-    - Update to standars-version 3.9.0.
-    - Remove libblas-dev, libatlas-dev from build-deps.
-  * Add debian/shlibs.local file containing the correct binary dep
-    to libsoqt4-20 (closes: #575239).
-  * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes
-    the lintian warning copyright-refers-to-deprecated-bsd-license-file.
-  * Add kFreeBSD portability fixes. Thanks to Petr Salinger
-    <Petr.Salinger@seznam.cz> for the patch (closes: #592461).
-
- -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 18 Aug 2010 19:34:36 +0200
-
-freecad (0.10.3247.dfsg-1ubuntu2) maverick; urgency=low
-
-  * Rebuild on libqtwebkit-dev for qtwebkit transition
-
- -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 21 Jul 2010 10:06:31 +0100
-
-freecad (0.10.3247.dfsg-1ubuntu1) maverick; urgency=low
-
-  * Merge from Debian unstable, remaining changes:
-    - debian/control: Build-Depends on libqt4-webkit-dev due to
-      QtWebKit is no longer part of libqt4-dev (LP: #604078)
-
- -- Artur Rona <ari-tczew@tlen.pl>  Sat, 10 Jul 2010 21:06:47 +0200
-
-freecad (0.10.3247.dfsg-1) unstable; urgency=low
-
-  * New upstream version (closes: #582627)
-  * Add debian/source/format file with contents "1.0".
-  * Use freecad.xpm as icon in menu and desktop files.
-  * copyright: Add licensing information for new files in this release.
-  * src/Base/Makefile.in, src/Gui/Makefile.in: Do not remove *.tab.c files
-    in make distclean target.
-  * control:
-    - Add build-dep to libeigen2-dev.
-    - Update to standards-version 3.8.4.
-
- -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 05 Jul 2010 15:07:49 +0200
-
-freecad (0.9.2646.5.dfsg-1ubuntu1) maverick; urgency=low
-
-  * Add build-dep on libqt4-webkit-dev to fix FTBFS with Qt 4.7
-
- -- Scott Kitterman <scott@kitterman.com>  Sat, 19 Jun 2010 00:37:12 -0400
-
-freecad (0.9.2646.5.dfsg-1) unstable; urgency=low
-
-  * Add 'dfsg' extension to upstream version, upstream sources are unchanged.
-  * Remove libgl1-mesa-dev build-dep, rely on libcoin to pull in GL libraries.
-  * Change build-dep libatlas-headers to libatlas-dev (closes: #577309).
-
- -- Teemu Ikonen <tpikonen@gmail.com>  Fri, 14 May 2010 17:20:35 +0200
-
-freecad (0.9.2646.5-1) unstable; urgency=low
-
-  * New upstream version (closes: #561696).
-  * Added swig to Build-Depends (closes: #563523, #563772).
-  * Removed python-opencv from Build-Depends and Recommends (closes: #560768).
-
- -- Adam C. Powell, IV <hazelsct@debian.org>  Mon, 11 Jan 2010 08:48:33 -0500
-
-freecad (0.9.2646.4-1) unstable; urgency=low
-
-  * New upstream version (closes: #559849, #559846).
-
- -- Adam C. Powell, IV <hazelsct@debian.org>  Fri, 11 Dec 2009 20:21:32 -0500
-
-freecad (0.9.2646.3-1) unstable; urgency=low
-
-  * New upstream version. Removes TiddlySaver.jar, fixes help problems.
-
- -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 03 Dec 2009 19:39:27 +0100
-
-freecad (0.9.2646-1) unstable; urgency=low
-
-  [ Werner Mayer ]
-  * New upstream release
-  * In-source copy of PyCXX has been dropped (closes: #547936)
-  * In-source copy of zipios++ has been dropped (closes: #547941)
-  * Change build-dependency on python2.5-dev to python-dev
-  * Add freecad-doc binary package
-  * Remove Suggestion of a chm viewer, suggest freecad-doc instead
-
-  [ Teemu Ikonen ]
-  * Add override to dh_compress
-  * Add versioned build-deb to debhelper (>= 7.0.50)
-  * Add build-deps to libzipios++-dev and python-cxx-dev.
-
- -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 17 Nov 2009 14:22:00 +0100
-
-freecad (0.8.2237-2) unstable; urgency=low
-
-  * Added libboost-python-dev to Build-Depends (closes: #549738).
-  * Added myself to uploaders list.
-  * Bumped Standards-Version.
-
- -- Adam C. Powell, IV <hazelsct@debian.org>  Thu, 12 Nov 2009 12:02:42 -0500
-
-freecad (0.8.2237-1) unstable; urgency=low
-
-  * New Upstream release
-
- -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 16 Jul 2009 18:37:41 +0200
-
-freecad (0.7.1658-1) UNRELEASED; urgency=low
-
-  * New upstream release
-
- -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 20 Oct 2008 15:35:58 +0200
-
-freecad (0.7.1514-1) UNRELEASED; urgency=low
-
-  * New upstream version
-  * Add more stuff to the copyright file
-  * control: add build-dep to python-central
-
- -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 06 Aug 2008 18:25:02 +0200
-
-freecad (0.7.1350-1hardy1) UNRELEASED; urgency=low
-
-  * Package for Ubuntu 8.04 (Hardy Heron)
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 May 2008 11:11:20 +0200
-
-freecad (0.7.1350-1gutsy1) UNRELEASED; urgency=low
-
-  * Backport to Ubuntu 7.10 (Gutsy Gibbon)
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 01:54:39 +0200
-
-freecad (0.7.1350-1feisty1) UNRELEASED; urgency=low
-
-  * Backport to Ubuntu 7.04 (Feisty Fawn)
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 00:09:08 +0200
-
-freecad (0.7.1350-1) UNRELEASED; urgency=low
-
-  * New upstream release from sf.net
-  * Import to debian-science repository at git.debian.org
-  * control:
-    - Update to standards-version 3.7.3
-    - Add Vcs-* fields pointing to git.debian.org
-    - Improve descriptions
-  * Convert copyright to (pseudo) machine readable format, audit source
-  * Fix categories in .desktop file
-  * Change Section to Science/Engineering in .doc-base and menu files
-  * rules: do not ignore errors on clean target, add dh_desktop call
- -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 05 Aug 2008 18:58:07 +0200
-
-freecad (0.7.1344-1ubuntu2) UNRELEASED; urgency=low
-
-  * New package with fixed self-dependency problem
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 15:34:34 +0200
-
-freecad (0.7.1344-1ubuntu1) UNRELEASED; urgency=low
-
-  * New debian package for Feisty
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 11:04:06 +0200
-
-freecad (0.7.1344-1) UNRELEASED; urgency=low
-
-  * Write patch file to make builds with OpenCASCADE libs inside but with no
-    dependency to libopencascade6.2
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 21 May 2008 10:06:07 +0200
-
-freecad (0.7.1343-1) UNRELEASED; urgency=low
-
-  * Embed required OpenCASCADE libs into this package as long as no official
-    Debian package is available
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 20 May 2008 00:40:39 +0200
-
-freecad (0.7.1342-1) UNRELEASED; urgency=low
-
-  * Switch to new versioning scheme of OpenCASCADE packages
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 19 May 2008 23:55:31 +0200
-
-freecad (0.7.1316-1) UNRELEASED; urgency=low
-
-  * Support of pivy (Python binding for Coin/SoQt)
-  * Support of PyQt4
-  * General support of SWIG modules
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 26 Apr 2008 13:51:25 +0200
-
-freecad (0.7.1031-1) UNRELEASED; urgency=low
-
-  * Qt4 port finished
-  * Support of Python binding for Qt4
-  * Support of Python binding for Coin
-  * Support of entirely in Python written modules
-  * Added support of model driven architecture for Python binding
-  * Use boost's signal/slot mechanism to update data
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 04 Jan 2008 13:50:37 +0200
-
-freecad (0.7.645-1) UNRELEASED; urgency=low
-
-  * Qt4 port started
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 24 Jul 2007 13:04:37 +0200
-
-freecad (0.6.472-1) UNRELEASED; urgency=low
-
-  * Initial Release
-
- -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 26 Sep 2006 16:55:15 +0200
-
@@ -1 +0,0 @@
-7
@@ -1,69 +0,0 @@
-Source: freecad
-Section: science
-Priority: extra
-Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-Uploaders: Teemu Ikonen <tpikonen@gmail.com>, "Adam C. Powell, IV" <hazelsct@debian.org>, Anton Gladky <gladky.anton@gmail.com>
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git
-Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git
-Homepage: http://www.freecadweb.org/
-Build-Depends: debhelper (>= 7.0.50~), cmake, 
- libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
- libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
- libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
- libboost-thread-dev, libboost-python-dev, python-dev, python-support,
- libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev,
- libcoin60-dev, libsoqt4-dev, libeigen3-dev,
- zlib1g-dev, libxerces-c2-dev, liboce-foundation-dev,
- liboce-modeling-dev, liboce-ocaf-dev, liboce-visualization-dev,
- python-cxx-dev, libswscale-dev, libzipios++-dev, swig, gfortran,
- f2c, libqtwebkit-dev, libspnav-dev, libfreetype6-dev, libfreeimage-dev,
- libpyside-dev, libshiboken-dev, pyside-tools, netgen-headers
-Standards-Version: 3.9.3
-
-Package: freecad
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-pyside.qtcore,
- python-pyside.qtsvg, python-pyside.qtuitools
-Recommends: python-pivy, python
-Suggests: freecad-doc
-Description: Extensible Open Source CAx program (beta)
- FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
- It features some key concepts like macro recording, workbenches, ability
- to run as a server and dynamically loadable application extensions and
- it is designed to be platform independent.
- .
- Currently, FreeCAD can import and display CAD models in IGES, STEP, and
- BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats.
- Editing and modeling features are currently somewhat limited.
-
-Package: freecad-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, freecad (= ${binary:Version})
-Description: FreeCAD development files
- FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
- It features some key concepts like macro recording, workbenches, ability
- to run as a server and dynamically loadable application extensions and
- it is designed to be platform independent.
- For more details see http://sourceforge.net/projects/free-cad
- .
- This package contains headers and symlinks necessary to
- develop modules for FreeCAD.
-
-Package: freecad-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, qt4-dev-tools
-Description: FreeCAD documentation
- FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
- It features some key concepts like macro recording, workbenches, ability
- to run as a server and dynamically loadable application extensions and
- it is designed to be platform independent.
- For more details see http://sourceforge.net/projects/free-cad
- .
- This package contains the FreeCAD documentation.
- .
- The documentation is provided in Qt's new help format;
- the new help format version can be viewed in conjunction with the Qt Assistant
- found in the qt4-dev-tools package.
-
@@ -1,275 +0,0 @@
-Format: http://dep.debian.net/deps/dep5/
-Upstream-Contact: Werner Mayer <wmayer@users.sourceforge.net>
-X-Packaged-By: Werner Mayer <wmayer@users.sourceforge.net>
-X-Packaged-Date: 2006-09-26_16:55:15+02:00
-Source: http://sourceforge.net/projects/free-cad
-
-Files: *
-Copyright: 2001-2009 Jürgen Riegel <juergen.riegel@web.de>,
- Werner Mayer <wmayer@users.sourceforge.net>
-License: LGPL-2+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
- .
- On Debian systems, the complete text of the GNU Lesser General Public
- License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-
-Files: src/3rdParty/boost/numeric/bindings/*
-Copyright: 2002-2008 Kresimir Fresl, Karl Meerbergen, Toon Knapen,
- Andreas Kloeckner, Jeremy Conlin, Thomas Klimpel, Fabien Dekeyser,
- Quoc-Cuong Pham, Si-Lab b.v.b.a., Joerg Walter
-License: other-boost-1.0
- Boost Software License - Version 1.0 - August 17th, 2003
- .
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-Files: src/3rdParty/boost/numeric/bindings/lapack/lapack.hpp,
- src/3rdParty/boost/numeric/bindings/traits/std_valarray.hpp
-Copyright: 2003 Toon Knapen, Kresimir Fresl, Karl Meerbergen
-License: other
- * Permission to copy, modify, use and distribute this software
- * for any non-commercial or commercial purpose is granted provided
- * that this license appear on all copies of the software source code.
- *
- * Authors assume no responsibility whatsoever for its use and makes
- * no guarantees about its quality, correctness or reliability.
- *
- * KF acknowledges the support of the Faculty of Civil Engineering,
- * University of Zagreb, Croatia.
-
-Files: src/Base/Base64.*
-Copyright: 2004-2008 Rene Nyffenegger <rene.nyffenegger@adp-gmbh.ch>
-License: other
- This source code is provided 'as-is', without any express or implied
- warranty. In no event will the author be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
- .
- 1. The origin of this source code must not be misrepresented; you must not
-    claim that you wrote the original source code. If you use this source code
-    in a product, an acknowledgment in the product documentation would be
-    appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and must not be
-    misrepresented as being the original source code.
- .
- 3. This notice may not be removed or altered from any source distribution.
-
-Files: src/Base/fdstream.hpp
-Copyright: 2001 Nicolai M. Josuttis
-License: other
- Permission to copy, use, modify, sell and distribute this software
- is granted provided this copyright notice appears in all copies.
- This software is provided "as is" without express or implied
- warranty, and with no claim as to its suitability for any purpose.
-
-Files: src/Base/gzstream.*
-Copyright: 2001 Deepak Bandyopadhyay, Lutz Kettner
-License: LGPL-2.1+
-
-Files: src/Base/PyTools.*
-Copyright: 1996-2000 Mark Lutz, and O'Reilly and Associates.
-License: other
- Permission to use, copy, modify, and distribute this software
- for any purpose and without fee is hereby granted.  This software
- is provided on an as is basis, without warranties of any kind.
-
-Files: src/Doc/Start_Page.html
-Copyright: 2004-2009 UnaMesa Association
-License: BSD
- Copyright (c) UnaMesa Association 2004-2009
- .
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- .
- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- Neither the name of the UnaMesa Association nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS
- IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: src/Doc/Start_Page.html
-Copyright: 2009 John Resig
-License: GPL-2 or MIT
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in '/usr/share/common-licenses/GPL-2'.
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Files: src/Doc/Start_Page.html
-Copyright: 2009 The Dojo Foundation, http://sizzlejs.com/
-License: GPL-2 or MIT or BSD
-
-Files: src/Gui/iisTaskPanel/src/*
-Copyright: http://www.ii-system.com
-License: LGPL
-
-Files: src/Mod/Draft/*
-Copyright: Yorik van Havre, Werner Mayer, Martin Burbaum
-License: GPL-2+
-
-Files: src/Mod/Draft/draftlibs/dxf*
-Copyright: 2005-2008 Ed Blake, Remigiusz Fiedler, Stani Michiels
-License: GPL-2+
-
-Files: src/Mod/Draft/WorkingPlane.py
-Copyright: 2009-2010 Ken Cline <cline@frii.com>
-License: GPL-2+
-
-Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*,
- src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*,
- src/Mod/Mesh/App/Core/*
-Copyright: 2005 Imetric 3D GmbH
-License: LGPL-2+
-
-Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
- src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
-Copyright: 2005 Werner Mayer <werner.wm.mayer@gmx.de>
-License: LGPL-2+
-
-Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*
-Copyright: 2005 Berthold Grupp
-License: LGPL-2+
-
-Files: src/Mod/Mesh/BuildRegularGeoms.py
-Copyright: 2005 Berthold Grupp
-License: LGPL
-
-Files: src/Mod/Image/App/ImageBase.*, src/Mod/Image/Gui/GLImageBox.*,
- src/Mod/Image/Gui/ImageView.*, src/Mod/Image/Gui/XpmImages.h
-Copyright: 2004 Imetric 3D GmbH
-License: LGPL-2+
-
-Files: src/Mod/Mesh/App/Core/tritritest.h
-Copyright: 1997 Tomas Moller <tam@cs.lth.se>
-License: other
- tritritest.h has no licensing information, but Tomas Moller replied
- the following, when asked about it:
- .
- The code is free to use for anyone and any projects, but I give no
- warranties.
-
-Files: src/Mod/Mesh/App/WildMagic4/*
-Copyright: 1998-2007 David Eberly http://www.geometrictools.com
-License: LGPL-2.1+
-
-Files: src/Mod/Part/App/edgecluster.*
-Copyright: 2010 Joachim Zettler <Joachim.Zettler@gmx.de>
-License: LGPL-2+
-
-Files: src/Mod/Raytracing/App/resources/*
-Copyright: 2005 Georg Wiora <georg.wiora@quarkbox.de>,
- Juergen Riegel <juergen.riegel@web.de>
-License: LGPL-2+
-
-Files: src/Mod/Sketcher/App/sketchflat/*
-Copyright: 2008 Jonathan Westhues
-License: GPL-3+
- On Debian systems, the complete text of the GNU General Public License
- version 3 can be found in '/usr/share/common-licenses/GPL-3'.
-
-Files: src/Mod/Sketcher/App/sketchsolve_cp/*
-Copyright: 2009 Jonathan George
-License: BSD
-
-Files: src/Mod/Test/unittestgui.py
-Copyright: 1999-2001 Steve Purcell
-License: PSF
- This module is free software, and you may redistribute it and/or modify
- it under the same terms as Python itself, so long as this copyright message
- and disclaimer are retained in their original form.
- .
- IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
- SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
- THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
- .
- THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
- AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
- SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
-Files: src/Mod/Part/MakeBottle.py, src/Tools/*
-Copyright: 2002-2008 Jürgen Riegel <juergen.riegel@web.de>,
- Werner Mayer <wmayer@users.sourceforge.net>
-License: GPL-2+
-
-Files: src/Tools/generateBase/generateDS.py
-Copyright: 2003 Dave Kuhlman
-License: MIT
-
-Files: debian/*
-Copyright: 2007-2009 Werner Mayer <wmayer@users.sourceforge.net>,
- Teemu Ikonen <tpikonen@gmail.com>
-License: LGPL-2+
@@ -1,997 +0,0 @@
--- freecad-0.8.2237.orig/debian/changelog
-+++ freecad-0.8.2237/debian/changelog
-@@ -0,0 +1,155 @@
-+freecad (0.8.2237-1intrepid1) intrepid; urgency=low
-+
-+  * New release for Ubuntu 8.10 (Intrepid Ibex)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 11 Jul 2009 20:36:40 +0200
-+
-+freecad (0.7.2008-1intrepid1) intrepid; urgency=low
-+
-+  * New release for Ubuntu 8.10 (Intrepid Ibex)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 21 Mar 2009 19:23:57 +0100
-+
-+freecad (0.7.1779-1intrepid1) intrepid; urgency=low
-+
-+  * New release for Ubuntu 8.10 (Intrepid Ibex)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 14 Dec 2008 15:20:54 +0200
-+
-+freecad (0.7.1658-1intrepid1) intrepid; urgency=low
-+
-+  * New release for Ubuntu 8.10 (Intrepid Ibex)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 12 Oct 2008 16:20:54 +0200
-+
-+freecad (0.7.1658-1hardy1) hardy; urgency=low
-+
-+  * New release for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 11 Oct 2008 18:45:20 +0200
-+
-+freecad (0.7.1658-1gutsy1) gutsy; urgency=low
-+
-+  * New release for Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 11 Oct 2008 15:56:27 +0200
-+
-+freecad (0.7.1525-1feisty1) feisty; urgency=low
-+
-+  * Activate MIME support in rules file
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue,  5 Aug 2008 21:27:46 +0200
-+
-+freecad (0.7.1522-1feisty1) feisty; urgency=low
-+
-+  * Package for Ubuntu 7.04 (Feisty Fawn)
-+  * Abstract interface for geometric data types
-+  * Avoid flickering of cursor when cutting several meshes at once
-+  * Update to the latest debian policy version 3.7.3
-+  * Several bugs fixed with Python GIL
-+  * Providing a dev package for freecad
-+  * Make TopoDS_Shape and Geom_Geometry classes accessible from Python
-+  * Make Python interface for algorithms on shapes and geometries
-+  * Support of mesh segments
-+  * Add test/annotation object
-+  * Add simple measurement facility
-+  * Remove OpenCascade dependency in Mesh module
-+  * Thumbnail facility added
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 04 Aug 2008 20:11:20 +0200
-+
-+freecad (0.7.1514-1) unstable; urgency=low
-+
-+  * New upstream version
-+  * Add more stuff to the copyright file
-+  * control: add build-dep to python-central 
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 06 Aug 2008 18:25:02 +0200
-+
-+freecad (0.7.1350-1hardy1) hardy; urgency=low
-+
-+  * Package for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 May 2008 11:11:20 +0200
-+
-+freecad (0.7.1350-1gutsy1) gutsy; urgency=low
-+
-+  * Backport to Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 01:54:39 +0200
-+
-+freecad (0.7.1350-1feisty1) feisty; urgency=low
-+
-+  * Backport to Ubuntu 7.04 (Feisty Fawn)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 00:09:08 +0200
-+
-+freecad (0.7.1350-1) unstable; urgency=low
-+
-+  * Official release for version 0.7
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Fri, 23 May 2008 23:39:47 +0200
-+
-+freecad (0.7.1344-1ubuntu2) feisty; urgency=low
-+
-+  * New package with fixed self-dependency problem
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 15:34:34 +0200
-+
-+freecad (0.7.1344-1ubuntu1) feisty; urgency=low
-+
-+  * New debian package for Feisty
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 11:04:06 +0200
-+
-+freecad (0.7.1344-1) unstable; urgency=low
-+
-+  * Write patch file to make builds with OpenCASCADE libs inside but with no
-+    dependency to libopencascade6.2
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 21 May 2008 10:06:07 +0200
-+
-+freecad (0.7.1343-1) unstable; urgency=low
-+
-+  * Embed required OpenCASCADE libs into this package as long as no official
-+    Debian package is available  
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 20 May 2008 00:40:39 +0200
-+
-+freecad (0.7.1342-1) unstable; urgency=low
-+
-+  * Switch to new versioning scheme of OpenCASCADE packages 
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 19 May 2008 23:55:31 +0200
-+
-+freecad (0.7.1316-1) unstable; urgency=low
-+
-+  * Support of pivy (Python binding for Coin/SoQt)
-+  * Support of PyQt4
-+  * General support of SWIG modules
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 26 Apr 2008 13:51:25 +0200
-+
-+freecad (0.7.1031-1) unstable; urgency=low
-+
-+  * Qt4 port finished
-+  * Support of Python binding for Qt4
-+  * Support of Python binding for Coin
-+  * Support of entirely in Python written modules
-+  * Added support of model driven architecture for Python binding
-+  * Use boost's signal/slot mechanism to update data
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 04 Jan 2008 13:50:37 +0200
-+
-+freecad (0.7.645-1) unstable; urgency=low
-+
-+  * Qt4 port started
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 24 Jul 2007 13:04:37 +0200
-+
-+freecad (0.6.472-1) unstable; urgency=low
-+
-+  * Initial Release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 26 Sep 2006 16:55:15 +0200
-+
--- freecad-0.8.2237.orig/debian/menu
-+++ freecad-0.8.2237/debian/menu
-@@ -0,0 +1,6 @@
-+?package(freecad):needs="X11"\
-+  section="Applications/Science/Engineering"\
-+  title="FreeCAD"\
-+  command="/usr/bin/freecad"\
-+  icon="/usr/share/freecad/FCIcon.xpm"
-+
--- freecad-0.8.2237.orig/debian/freecad.doc-base
-+++ freecad-0.8.2237/debian/freecad.doc-base
-@@ -0,0 +1,14 @@
-+Document: freecad
-+Title: FreeCAD Manual
-+Author: Werner Mayer
-+Abstract: An extensible Open Source CAx program for Unix/X11
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+Section: Science/Engineering
-+
-+Format: text
-+Files: /usr/share/doc/freecad/README.Linux.gz
-+
--- freecad-0.8.2237.orig/debian/compat
-+++ freecad-0.8.2237/debian/compat
-@@ -0,0 +1 @@
-+5
--- freecad-0.8.2237.orig/debian/freecad.links
-+++ freecad-0.8.2237/debian/freecad.links
-@@ -0,0 +1,3 @@
-+usr/lib/freecad/bin/FreeCAD usr/bin/freecad
-+usr/lib/freecad/bin/FreeCADCmd usr/bin/freecadcmd
-+usr/share/man/man1/freecad.1.gz usr/share/man/man1/freecadcmd.1.gz
--- freecad-0.8.2237.orig/debian/copyright
-+++ freecad-0.8.2237/debian/copyright
-@@ -0,0 +1,393 @@
-+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-+Upstream-Maintainer: Werner Mayer <wmayer@users.sourceforge.net> 
-+Packaged-By: Werner Mayer <wmayer@users.sourceforge.net>
-+Packaged-Date: 2006-09-26_16:55:15+02:00 
-+Original-Source-Location: http://sourceforge.net/projects/free-cad
-+
-+Files: *
-+Copyright: 2001-2008 JÃ¼rgen Riegel <juergen.riegel@web.de>, 
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: LGPL-2+
-+ This package is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+ .
-+ This package is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ Lesser General Public License for more details.
-+ .
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this package; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
-+ .
-+ On Debian systems, the complete text of the GNU Lesser General Public 
-+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-+
-+Files: src/3rdParty/ANN/*
-+Copyright: 1997-2005 University of Maryland and Sunil Arya and David Mount
-+License: LGPL-2.1+
-+ On Debian systems, the complete text of the GNU Lesser General Public 
-+ License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-+
-+Files: src/3rdParty/atlas/clapack.h
-+Copyright: 1999 R. Clint Whaley
-+License: BSD-3
-+ On Debian systems, the complete text of the Three-clause BSD license
-+ can be found in `/usr/share/common-licenses/BSD'.
-+
-+Files: src/3rdParty/boost/numeric/bindings/*
-+Copyright: 2002-2004 Kresimir Fresl, Karl Meerbergen, Toon Knapen, 
-+ Andreas Kloeckner, Matthias Troyer
-+License: other 
-+ Permission to copy, modify, use and distribute this software 
-+ for any non-commercial or commercial purpose is granted provided 
-+ that this license appear on all copies of the software source code.
-+ .
-+ Author assumes no responsibility whatsoever for its use and makes 
-+ no guarantees about its quality, correctness or reliability.
-+ .
-+ Kresimir Fresl acknowledges the support of the Faculty of Civil Engineering, 
-+ University of Zagreb, Croatia.
-+
-+Files: src/3rdParty/boost/numeric/bindings/amos/*,
-+ src/3rdParty/boost/numeric/bindings/blas/*,
-+ src/3rdParty/boost/numeric/bindings/traits/config.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/fortran.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/matrix_raw.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/symm_herm_raw.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/vector_raw.hpp,
-+Copyright: 2002-2003 Toon Knapen, Kresimir Fresl, Si-Lab b.v.b.a, Joerg Walter
-+License: other 
-+ Permission to use, copy, modify, distribute and sell this software
-+ and its documentation for any purpose is hereby granted without fee,
-+ provided that the above copyright notice appear in all copies and
-+ that both that copyright notice and this permission notice appear
-+ in supporting documentation.  The authors make no representations
-+ about the suitability of this software for any purpose.
-+ It is provided "as is" without express or implied warranty.
-+
-+Files: src/3rdParty/boost/numeric/bindings/traits/type.h
-+Copyright: 2000,2001,2002,2003 Si-Lab b.v.b.a. and Toon Knapen
-+License: other-non-free 
-+ * License is hereby granted to use and modify this software 
-+ * as long as this copyright notice is retained and modifications
-+ * are clearly marked.
-+ * This License does not permit you to redistribute this software.
-+
-+Files: src/3rdParty/boost/numeric/bindings/lapack/steqr.hpp,
-+ src/3rdParty/boost/numeric/bindings/lapack/sytrd.hpp
-+Copyright: 2007 Karl Meerbergen
-+License: other 
-+ Boost Software License - Version 1.0 - August 17th, 2003
-+ .
-+ Permission is hereby granted, free of charge, to any person or organization
-+ obtaining a copy of the software and accompanying documentation covered by
-+ this license (the "Software") to use, reproduce, display, distribute,
-+ execute, and transmit the Software, and to prepare derivative works of the
-+ Software, and to permit third-parties to whom the Software is furnished to
-+ do so, all subject to the following:
-+ . 
-+ The copyright notices in the Software and this entire statement, including
-+ the above license grant, this restriction and the following disclaimer,
-+ must be included in all copies of the Software, in whole or in part, and
-+ all derivative works of the Software, unless such copies or derivative
-+ works are solely in the form of machine-executable object code generated by
-+ a source language processor.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/OCCAdaptMesh/*
-+Copyright: 1991-2000 Matra Datavision SA, 2001-2004 Open CASCADE SA
-+License: other
-+ This file is part of the Open CASCADE Technology software.
-+ .
-+ This software may be distributed and/or modified under the terms and
-+ conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-+ and appearing in the file LICENSE included in the packaging of this file.
-+ .  
-+ This software is distributed on an "AS IS" basis, without warranty of any
-+ kind, and Open CASCADE SA hereby disclaims all such warranties,
-+ including without limitation, any warranties of merchantability, fitness
-+ for a particular purpose or non-infringement. Please see the License for
-+ the specific terms and conditions governing rights and limitations under the
-+ License.
-+
-+Files: src/3rdParty/Pivy/*
-+Copyright: 2002-2007 Systems in Motion
-+License: other 
-+ Permission to use, copy, modify, and distribute this software for any
-+ purpose with or without fee is hereby granted, provided that the above
-+ copyright notice and this permission notice appear in all copies.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+
-+Files: src/Base/gzstream.*
-+Copyright: 2001 Deepak Bandyopadhyay, Lutz Kettner
-+License: LGPL-2.1+
-+
-+Files: src/Base/PyCXX/*
-+Copyright: ???
-+License: ???
-+
-+Files: src/Base/PyTools.h
-+Copyright: 1996-2000 Mark Lutz, and O'Reilly and Associates.
-+License: other 
-+ Permission to use, copy, modify, and distribute this software 
-+ for any purpose and without fee is hereby granted.  This software
-+ is provided on an as is basis, without warranties of any kind.
-+
-+Files: src/Base/zipios/*
-+Copyright: 2000 Thomas SÃ¸ndergaard
-+License: LGPL-2+
-+
-+Files: src/Base/zipios/directory.*
-+Copyright: 1998 Dietmar Kuehl, Claas Solutions GmbH
-+License: other
-+ Permission to use, copy, modify, distribute and sell this
-+ software for any purpose is hereby granted without fee, provided
-+ that the above copyright notice appears in all copies and that
-+ both that copyright notice and this permission notice appear in
-+ supporting documentation. Dietmar Kuehl and Claas Solutions make no
-+ representations about the suitability of this software for any
-+ purpose. It is provided "as is" without express or implied warranty.
-+
-+Files: src/Gui/SoFCOffscreenRenderer.cpp
-+Copyright: ???
-+License: ???
-+/*
-+ * wrjpgcom.c
-+ *
-+ * Copyright (C) 1994, Thomas G. Lane.
-+ * This file is part of the Independent JPEG Group's software.
-+ * For conditions of distribution and use, see the accompanying README file.
-+ *
-+ * This file contains a very simple stand-alone application that inserts
-+ * user-supplied text as a COM (comment) marker in a JFIF file.
-+ * This may be useful as an example of the minimum logic needed to parse
-+ * JPEG markers.
-+ */
-+
-+Files: src/Mod/Cam/App/*
-+Copyright: 2007 Joachim Zettler <Joachim.Zettler@gmx.de>,
-+ Human Rezai <human@mytum.de>, 
-+ Mohamad Najib Muhammad Noor <najib_bean@yahoo.co.uk>,
-+ Stephane Routelous <stephane.routelous@exotk.org>,
-+ JÃ¼rgen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*, 
-+ src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*, 
-+ src/Mod/Mesh/App/Core/*
-+Copyright: 2005 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
-+ src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
-+Copyright: 2005 Werner Mayer <werner.wm.mayer@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*,
-+Copyright: 2005 Berthold Grupp
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/BuildRegularGeoms.py
-+Copyright: 2005 Berthold Grupp
-+License: ???
-+
-+Files: src/Mod/Drawing/Gui/DrawingView.*, src/Mod/Image/App/ImageBase.*, 
-+ src/Mod/Image/Gui/GLImageBox.*, src/Mod/Image/Gui/ImageView.*,
-+ src/Mod/Image/Gui/XpmImages.h
-+Copyright: ??? Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/triangle.cpp, src/Mod/Mesh/App/Core/triangle.h,
-+ src/3rdParty/OCCAdaptMesh/src/TriangleAdapt/triangleAdapt.c,
-+ src/3rdParty/OCCAdaptMesh/Include/triangleAdapt.h 
-+Copyright: 1993, 1995, 1997, 1998, 2002, 2005 Jonathan Richard Shewchuk
-+License: other-non-free 
-+ /*  This program may be freely redistributed under the condition that the    *
-+ /*    copyright notices (including this entire header and the copyright      *
-+ /*    notice printed when the `-h' switch is selected) are not removed, and  *
-+ /*    no compensation is received.  Private, research, and institutional     *
-+ /*    use is free.  You may distribute modified versions of this code UNDER  *
-+ /*    THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE   *
-+ /*    SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE   *
-+ /*    AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR    *
-+ /*    NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as    *
-+ /*    part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT  *
-+ /*    WITH THE AUTHOR.  (If you are not directly supplying this code to a    *
-+ /*    customer, and you are instead telling them how they can obtain it for  *
-+ /*    free, then you are not required to make any arrangement with me.)      *
-+
-+Files: src/Mod/Mesh/App/Core/tritritest.h
-+Copyright: 1997 Tomas Moller
-+License: ???
-+
-+Files: src/Mod/Mesh/App/WildMagic4/*
-+Copyright: 1998-2007 David Eberly http://www.geometrictools.com
-+License: LGPL-2.1+
-+
-+Files: src/Mod/Raytracing/App/resources/*
-+Copyright: 2005 Georg Wiora <georg.wiora@quarkbox.de>,
-+ Juergen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Test/unittestgui.py
-+Copyright: 1999-2001 Steve Purcell
-+License: PSF 
-+ This module is free software, and you may redistribute it and/or modify
-+ it under the same terms as Python itself, so long as this copyright message
-+ and disclaimer are retained in their original form.
-+ . 
-+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
-+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ DAMAGE.
-+ .
-+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
-+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+
-+Files: src/Tools/ImageTools/ImageConv/CmdLine.*,
-+ src/Tools/ImageTools/ImageConv/cmdline.htm
-+Copyright: 1999 Chris Losinger, Smaller Animals Software 
-+ http://www.smalleranimals.com
-+License: ZLIB
-+ This software is provided 'as-is', without any express
-+ or implied warranty.  In no event will the authors be 
-+ held liable for any damages arising from the use of this software.
-+ .
-+ Permission is granted to anyone to use this software 
-+ for any purpose, including commercial applications, and 
-+ to alter it and redistribute it freely, subject to the 
-+ following restrictions:
-+ .
-+ 1. The origin of this software must not be misrepresented; 
-+ you must not claim that you wrote the original software. 
-+ If you use this software in a product, an acknowledgment 
-+ in the product documentation would be appreciated but is not required.
-+ .
-+ 2. Altered source versions must be plainly marked as such, 
-+ and must not be misrepresented as being the original software.
-+ .
-+ 3. This notice may not be removed or altered from any source 
-+ distribution.
-+
-+Files: src/Tools/generateBase/generateDS.py
-+Copyright: 2003 Dave Kuhlman
-+License: MIT
-+ Permission is hereby granted, free of charge, to any person obtaining
-+ a copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, sublicense, and/or sell copies of the Software, and to
-+ permit persons to whom the Software is furnished to do so, subject to
-+ the following conditions:
-+ .
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/atlas/cblas.h,
-+ src/3rdParty/boost/numeric/bindings/traits/algorithm.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/transpose.hpp
-+ src/3rdParty/boost/numeric/bindings/traits/type.hpp
-+ src/App/ComplexGeoDataPyImp.cpp, 
-+ src/App/DocumentObjectPyImp.cpp
-+ src/App/DocumentPyImp.cpp
-+ src/App/Doxygen.cpp
-+ src/App/FeaturePyImp.cpp
-+ src/App/PreCompiled.cpp
-+ src/App/PreCompiled.h
-+ src/App/PropertyContainerPyImp.cpp
-+ src/Base/BaseClassPyImp.cpp
-+ src/Base/BoundBoxPyImp.cpp
-+ src/Base/Doxygen.cpp
-+ src/Base/PersistancePyImp.cpp
-+ src/Base/PreCompiled.cpp
-+ src/Base/PreCompiled.h
-+ src/Base/PyExport.h
-+ src/Base/PyTools.c
-+ src/Base/VectorPyImp.cpp
-+ src/Base/zipios/meta-iostreams.h
-+ src/Gui/InventorAll.h
-+ src/Gui/PreCompiled.cpp
-+ src/Gui/PreCompiled.h
-+ src/Gui/Qt4All.h
-+ src/Gui/SoFCBoundingBox.cpp
-+ src/Gui/SoFCBoundingBox.h
-+ src/Mod/Cam/App/PreCompiled.h
-+ src/Mod/Cam/App/PreCompiled.cpp
-+ src/Mod/Cam/Gui/PreCompiled.h
-+ src/Mod/Cam/Gui/PreCompiled.cpp
-+ src/Mod/Drawing/App/PreCompiled.h
-+ src/Mod/Drawing/App/PreCompiled.cpp
-+ src/Mod/Drawing/Gui/PreCompiled.h
-+ src/Mod/Drawing/Gui/PreCompiled.cpp
-+ src/Mod/Drawing/Gui/AppDrawingGui.cpp
-+ src/Mod/Image/App/CaptureClass.h
-+ src/Mod/Image/App/PreCompiled.h
-+ src/Mod/Image/App/CaptureClass.cpp
-+ src/Mod/Image/App/PreCompiled.cpp
-+ src/Mod/Image/Gui/PreCompiled.h
-+ src/Mod/Image/Gui/PreCompiled.cpp
-+ src/Mod/Import/App/PreCompiled.h
-+ src/Mod/Import/App/PreCompiled.cpp
-+ src/Mod/Import/Gui/PreCompiled.h
-+ src/Mod/Import/Gui/PreCompiled.cpp
-+ src/Mod/JtReader/App/PreCompiled.h
-+ src/Mod/JtReader/App/JtReader.h
-+ src/Mod/JtReader/App/PreCompiled.cpp
-+ src/Mod/Mesh/App/Doxygen.cpp
-+ src/Mod/Mesh/App/PreCompiled.h
-+ src/Mod/Mesh/App/MeshPointPyImp.cpp
-+ src/Mod/Mesh/App/PreCompiled.cpp
-+ src/Mod/Mesh/Gui/Doxygen.cpp
-+ src/Mod/Mesh/Gui/PreCompiled.h
-+ src/Mod/Mesh/Gui/PreCompiled.cpp
-+ src/Mod/Part/App/TopoShapeFacePyImp.cpp
-+ src/Mod/Part/App/OpenCascadeAll.h
-+ src/Mod/Part/App/PreCompiled.h
-+ src/Mod/Part/App/TopoShapePyImp.cpp
-+ src/Mod/Part/App/PreCompiled.cpp
-+ src/Mod/Part/App/PartFeaturePyImp.cpp
-+ src/Mod/Part/Gui/PreCompiled.h
-+ src/Mod/Part/Gui/PreCompiled.cpp
-+ src/Mod/Points/App/PreCompiled.h
-+ src/Mod/Points/App/PreCompiled.cpp
-+ src/Mod/Points/Gui/AppPointsGui.cpp
-+ src/Mod/Points/Gui/PreCompiled.h
-+ src/Mod/Points/Gui/PreCompiled.cpp
-+ src/Mod/Raytracing/App/PreCompiled.h
-+ src/Mod/Raytracing/App/PreCompiled.cpp
-+ src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
-+ src/Mod/Raytracing/Gui/Command.cpp src
-+ src/Mod/Raytracing/Gui/PreCompiled.h
-+ src/Mod/Raytracing/Gui/PreCompiled.cpp
-+ src/Mod/Test/Gui/PreCompiled.h
-+ src/Mod/Test/Gui/PreCompiled.cpp
-+Copyright: Not marked
-+License: ???
--- freecad-0.8.2237.orig/debian/freecad.desktop
-+++ freecad-0.8.2237/debian/freecad.desktop
-@@ -0,0 +1,19 @@
-+[Desktop Entry]
-+Version=1.0
-+Encoding=UTF-8
-+Name=FreeCAD
-+Name[de]=FreeCAD
-+Comment=Feature based Parametric Modeler
-+Comment[de]=Feature-basierter parametrischer Modellierer
-+GenericName=CAD Application
-+GenericName[de]=CAD-Anwendung
-+Exec=/usr/bin/freecad %F
-+Path=/usr/lib/freecad
-+Terminal=false
-+Type=Application
-+Icon=/usr/share/freecad/FCIcon.xpm
-+Categories=Graphics;Science;Engineering
-+StartupNotify=true
-+GenericName[de_DE]=Feature-basierter parametrischer Modellierer
-+Comment[de_DE]=Feature-basierter parametrischer Modellierer
-+MimeType=application/x-extension-fcstd
--- freecad-0.8.2237.orig/debian/control
-+++ freecad-0.8.2237/debian/control
-@@ -0,0 +1,50 @@
-+Source: freecad
-+Section: x11
-+Priority: optional
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+Homepage: http://sourceforge.net/projects/free-cad
-+Build-Depends: debhelper (>= 5), autotools-dev, libc6-dev (>= 2.1.3),
-+ libstdc++6, libboost1.35-dev, libboost-date-time1.35-dev, libboost-filesystem1.35-dev,
-+ libboost-graph1.35-dev, libboost-iostreams1.35-dev, libboost-program-options1.35-dev,
-+ libboost-regex1.35-dev, libboost-serialization1.35-dev, libboost-signals1.35-dev, libboost-system1.35-dev,
-+ zlib1g-dev, libxerces27-dev | libxerces-c2-dev,
-+ libxt-dev, libxmu-dev, libxi-dev, libx11-dev, libxext-dev,
-+ libqt4-dev, libsoqt4-dev, libcoin40-dev, libgl1-mesa-dev,
-+ python2.5-dev, python, python-central (>= 0.5.6),
-+ libgts-dev, libcv-dev, libopencascade-dev
-+Standards-Version: 3.7.3
-+XS-Python-Version: current
-+
-+Package: freecad
-+Architecture: any
-+Section: science
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+XB-Python-Version: ${python:Versions}
-+Conflicts: freecad (<= 0.6.472-1)
-+Suggests: gnochm | kchmviewer | kchmviewer-nokde | xchm, python-opencv
-+Description: An extensible Open Source CAx program (alpha)
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ .
-+ Currently, FreeCAD can import and display CAD models in IGES, STEP, and
-+ BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats.
-+ Editing and modeling features are currently somewhat limited.
-+
-+Package: freecad-dev
-+Architecture: any
-+Section: libdevel
-+Depends: freecad (>= ${source:Version})
-+XB-Python-Version: ${python:Versions}
-+Description: FreeCAD development files
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the libtool .la files, headers and symlinks necessary to
-+ develop modules for FreeCAD.
-+
-+
--- freecad-0.8.2237.orig/debian/freecad.sharedmimeinfo
-+++ freecad-0.8.2237/debian/freecad.sharedmimeinfo
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+	<mime-type type="application/x-extension-fcstd">
-+		<sub-class-of type="application/zip"/>
-+		<comment>FreeCAD document files</comment>
-+		<glob pattern="*.fcstd"/>
-+	</mime-type>
-+</mime-info>
--- freecad-0.8.2237.orig/debian/docs
-+++ freecad-0.8.2237/debian/docs
-@@ -0,0 +1,2 @@
-+ChangeLog.txt
-+README.Linux
--- freecad-0.8.2237.orig/debian/README.Debian
-+++ freecad-0.8.2237/debian/README.Debian
-@@ -0,0 +1,6 @@
-+freecad for Debian
-+------------------
-+
-+- First Debian package for FreeCAD.
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>, Tue, 26 Sep 2006 16:55:15 +0200
--- freecad-0.8.2237.orig/debian/freecad.1
-+++ freecad-0.8.2237/debian/freecad.1
-@@ -0,0 +1,73 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH FREECAD 1 "July  25, 2007" freecad "Linux User's Manual"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+freecad \- An extensible Open Source CAx program for Unix/X11
-+.SH SYNOPSIS
-+.B freecad
-+.RI [ options ] " files"
-+.br
-+.B freecadcmd
-+.RI [ options ] " files"
-+.SH DESCRIPTION
-+.B FreeCAD
-+is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features 
-+some key concepts like macro recording, workbenches, ability to run as a 
-+server and dynamically loadable application extensions and it is designed 
-+to be platform independent.
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-+.\" respectively.
-+.SH USAGE
-+\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
-+.SH OPTIONS
-+These programs follow the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of the options supported by \fBfreecad\fR is included below.
-+.SS "Generic options"
-+.TP
-+\fB\-h, \-\-help\fR
-+Show summary of options.
-+.TP
-+\fB\-v, \-\-version\fR
-+Show version of program.
-+.TP
-+\fB\-c, \-\-console\fR
-+Start in console mode.
-+.TP
-+\fB\-\-response\-file\fR \fIarg\fR
-+Can be specified with '@name', too.
-+
-+.SS "Configuration"
-+.TP
-+\fB\-l, \-\-write\-log\fR
-+Write a log file.
-+.TP
-+\fB\-t, \-\-run\-test\fR \fIarg\fR
-+Test level.
-+.TP
-+\fB\-M, \-\-module\-path\fR \fIarg\fR
-+Additional module path.
-+.TP
-+\fB\-P, \-\-python\-path\fR \fIarg\fR
-+Additional Python path.
-+.SH SEE ALSO
-+To get more information about \fBFreeCAD\fR, please visit \fIhttps://freecadweb.org/wiki\fR
-+.SH BUGS
-+To report a bug, please visit \fIhttps://freecadweb.org/tracker/\fR
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
--- freecad-0.8.2237.orig/debian/rules
-+++ freecad-0.8.2237/debian/rules
-@@ -0,0 +1,143 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+# Sample debian/rules that uses debhelper.
-+# This file was originally written by Joey Hess and Craig Small.
-+# As a special exception, when this file is copied by dh-make into a
-+# dh-make output file, you may use that output file without restriction.
-+# This special exception was added by Craig Small in version 0.37 of dh-make.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete
-+
-+# 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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+configure: autogen.sh
-+	chmod u+x autogen.sh
-+	./autogen.sh
-+
-+config.status: configure
-+	dh_testdir
-+# Add here commands to configure the package.
-+	./configure --with-occ-include=/usr/include/opencascade --with-occ-lib=/usr/lib \
-+--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+--prefix=/usr/lib/freecad --mandir=/usr/share/man \
-+--infodir=/usr/share/info --datadir=/usr/share/freecad \
-+--includedir=/usr/include/freecad \
-+CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-+
-+build: build-stamp
-+
-+build-stamp:  config.status
-+	dh_testdir
-+
-+# Add here commands to compile the package.
-+	$(MAKE)
-+	#docbook-to-man debian/freecad.sgml > freecad.1
-+
-+	touch $@
-+
-+# Add here commands to clean up after the build process.
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp 
-+	[ ! -f Makefile ] || $(MAKE) distclean
-+	rm -f configure
-+	dh_clean
-+	find -name 'Makefile.in' | xargs rm -f
-+	find -name '*.pyc' | xargs rm -f
-+	find -name 'moc_*.cpp' | xargs rm -f
-+	find -name '*.lo' | xargs rm -f
-+	find -name '*.deps' | xargs rm -rf
-+	find -name '*.libs' | xargs rm -rf	
-+	rm -f stamp-h1 aclocal.m4 config.guess config.sub depcomp install-sh
-+	rm -f ltmain.sh missing config.log libtool
-+	
-+install: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k 
-+	dh_installdirs
-+
-+# Add here commands to install the package into debian/tmp/freecad.
-+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad
-+
-+# install the core system
-+	dh_install -pfreecad debian/tmp/freecad/usr/share/* usr/share/
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
-+
-+# install the modules
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so.* usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/*.py usr/lib/freecad/Mod/$(MODULE);)
-+
-+# special treating of Draft module
-+#	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.py usr/lib/freecad/Mod/Draft
-+#	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.svg usr/lib/freecad/Mod/Draft
-+#	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.ui usr/lib/freecad/Mod/Draft
-+#	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/draftlibs/*.py usr/lib/freecad/Mod/Draft/draftlibs
-+
-+# special treating of Test module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test
-+
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.la usr/lib/freecad/lib
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+	dh_testdir
-+	dh_testroot
-+	dh_installchangelogs ChangeLog.txt
-+	dh_installdocs
-+	dh_installexamples
-+	dh_install debian/freecad.desktop usr/share/applications
-+	dh_install debian/mime/freecad-thumbnailer usr/bin
-+	dh_install debian/mime/freecad.schemas etc/gconf/schemas
-+	dh_gconf -pfreecad
-+	dh_desktop
-+	dh_installmenu
-+	dh_installmime
-+	dh_pycentral
-+#	dh_installinfo
-+#	dh_installman debian/freecad.1
-+	dh_installman debian/freecad.1 debian/mime/freecad-thumbnailer.1
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_makeshlibs
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install 
--- freecad-0.8.2237.orig/debian/mime/freecad-thumbnailer.1
-+++ freecad-0.8.2237/debian/mime/freecad-thumbnailer.1
-@@ -0,0 +1,20 @@
-+.TH FREECAD 1 "August  04, 2008" freecad "Linux User's Manual"
-+.SH NAME
-+freecad-thumbnailer \- A thumbnailer for FreeCAD project files
-+.SH SYNOPSIS
-+\fBfreecad-thumbnailer\fP [ -s \fIsize\fP ] \fIinput file\fP \fIoutput file\fP
-+.SH DESCRIPTION
-+\fBfreecad-thumbnailer\fP
-+is a Python script that extracts an embedded thumbnail from a FreeCAD project file.
-+If no thumbnail is embedded then nothing happens. According to the specification of
-+freedesktop.org the thumbnail image is a PNG file. The required \fBinput file\fP argument
-+specifies the project file where the thumbnail should be extracted from and the 
-+\fBoutput file\fP specifies the file where the thumbnail should be written to.
-+.SH OPTIONS
-+.TP
-+\fB-s \fIsize\fR
-+Specify the size of the image in pixel. 
-+.SH "SEE ALSO"
-+freecad(1), freecadcmd(1)
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
--- freecad-0.8.2237.orig/debian/mime/freecad.schemas
-+++ freecad-0.8.2237/debian/mime/freecad.schemas
-@@ -0,0 +1,30 @@
-+<gconfschemafile>
-+    <schemalist>
-+
-+        <schema>
-+            <key>/schemas/desktop/gnome/thumbnailers/application@x-extension-fcstd/enable</key>
-+            <applyto>/desktop/gnome/thumbnailers/application@x-extension-fcstd/enable</applyto>
-+            <owner>freecad</owner>
-+            <type>bool</type>
-+            <default>true</default>
-+            <locale name="C">
-+                <short>Enable thumbnailing of FreeCAD documents.</short>
-+                <long>Enable thumbnailing of FreeCAD documents.</long>
-+            </locale>
-+        </schema>
-+
-+
-+        <schema>
-+            <key>/schemas/desktop/gnome/thumbnailers/application@x-extension-fcstd/command</key>
-+            <applyto>/desktop/gnome/thumbnailers/application@x-extension-fcstd/command</applyto>
-+            <owner>freecad</owner>
-+            <type>string</type>
-+            <default>/usr/bin/freecad-thumbnailer -s %s %u %o</default>
-+            <locale name="C">
-+                <short>Thumbnail command for documents from FreeCAD.</short>
-+                <long>Valid command plus arguments for freecad-thumbnailer.</long>
-+            </locale>
-+        </schema>
-+
-+    </schemalist>
-+</gconfschemafile>
--- freecad-0.8.2237.orig/debian/mime/freecad-thumbnailer
-+++ freecad-0.8.2237/debian/mime/freecad-thumbnailer
-@@ -0,0 +1,26 @@
-+#!/usr/bin/python
-+
-+import sys, zipfile, md5
-+import getopt
-+import gnomevfs
-+
-+opt,par = getopt.getopt(sys.argv[1:],'-s:')
-+inpfile = gnomevfs.get_local_path_from_uri(par[0])
-+outfile = par[1]
-+
-+try:
-+	zfile=zipfile.ZipFile(inpfile)
-+	files=zfile.namelist()
-+	# check for meta-file if it's really a FreeCAD document
-+	if files[0] != "Document.xml":
-+		sys.exit(1)
-+
-+	image="thumbnails/Thumbnail.png"
-+	if image in files:
-+		image=zfile.read(image)
-+		thumb=open(outfile,"wb")
-+		thumb.write(image)
-+		thumb.close()
-+except:
-+	sys.exit(1)
-+
@@ -1,997 +0,0 @@
--- freecad-0.8.2237.orig/debian/control
-+++ freecad-0.8.2237/debian/control
-@@ -0,0 +1,50 @@
-+Source: freecad
-+Section: x11
-+Priority: optional
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+Homepage: http://sourceforge.net/projects/free-cad
-+Build-Depends: debhelper (>= 5), autotools-dev, libc6-dev (>= 2.1.3),
-+ libstdc++6, libboost1.37-dev, libboost-date-time1.37-dev, libboost-filesystem1.37-dev,
-+ libboost-graph1.37-dev, libboost-iostreams1.37-dev, libboost-program-options1.37-dev,
-+ libboost-regex1.37-dev, libboost-serialization1.37-dev, libboost-signals1.37-dev, libboost-system1.37-dev,
-+ zlib1g-dev, libxerces27-dev | libxerces-c2-dev,
-+ libxt-dev, libxmu-dev, libxi-dev, libx11-dev, libxext-dev,
-+ libqt4-dev, libsoqt4-dev, libcoin40-dev, libgl1-mesa-dev,
-+ python2.5-dev, python, python-central (>= 0.5.6),
-+ libgts-dev, libcv-dev, libopencascade-dev
-+Standards-Version: 3.8.0
-+XS-Python-Version: current
-+
-+Package: freecad
-+Architecture: any
-+Section: science
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+XB-Python-Version: ${python:Versions}
-+Conflicts: freecad (<= 0.6.472-1)
-+Suggests: gnochm | kchmviewer | kchmviewer-nokde | xchm, python-opencv
-+Description: An extensible Open Source CAx program (alpha)
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ .
-+ Currently, FreeCAD can import and display CAD models in IGES, STEP, and
-+ BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats.
-+ Editing and modeling features are currently somewhat limited.
-+
-+Package: freecad-dev
-+Architecture: any
-+Section: libdevel
-+Depends: freecad (>= ${source:Version}), ${misc:Depends}
-+XB-Python-Version: ${python:Versions}
-+Description: FreeCAD development files
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the libtool .la files, headers and symlinks necessary to
-+ develop modules for FreeCAD.
-+
-+
--- freecad-0.8.2237.orig/debian/freecad.sharedmimeinfo
-+++ freecad-0.8.2237/debian/freecad.sharedmimeinfo
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+	<mime-type type="application/x-extension-fcstd">
-+		<sub-class-of type="application/zip"/>
-+		<comment>FreeCAD document files</comment>
-+		<glob pattern="*.fcstd"/>
-+	</mime-type>
-+</mime-info>
--- freecad-0.8.2237.orig/debian/freecad.links
-+++ freecad-0.8.2237/debian/freecad.links
-@@ -0,0 +1,3 @@
-+usr/lib/freecad/bin/FreeCAD usr/bin/freecad
-+usr/lib/freecad/bin/FreeCADCmd usr/bin/freecadcmd
-+usr/share/man/man1/freecad.1.gz usr/share/man/man1/freecadcmd.1.gz
--- freecad-0.8.2237.orig/debian/copyright
-+++ freecad-0.8.2237/debian/copyright
-@@ -0,0 +1,393 @@
-+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-+Upstream-Maintainer: Werner Mayer <wmayer@users.sourceforge.net> 
-+Packaged-By: Werner Mayer <wmayer@users.sourceforge.net>
-+Packaged-Date: 2006-09-26_16:55:15+02:00 
-+Original-Source-Location: http://sourceforge.net/projects/free-cad
-+
-+Files: *
-+Copyright: 2001-2008 JÃ¼rgen Riegel <juergen.riegel@web.de>, 
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: LGPL-2+
-+ This package is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+ .
-+ This package is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ Lesser General Public License for more details.
-+ .
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this package; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
-+ .
-+ On Debian systems, the complete text of the GNU Lesser General Public 
-+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-+
-+Files: src/3rdParty/ANN/*
-+Copyright: 1997-2005 University of Maryland and Sunil Arya and David Mount
-+License: LGPL-2.1+
-+ On Debian systems, the complete text of the GNU Lesser General Public 
-+ License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-+
-+Files: src/3rdParty/atlas/clapack.h
-+Copyright: 1999 R. Clint Whaley
-+License: BSD-3
-+ On Debian systems, the complete text of the Three-clause BSD license
-+ can be found in `/usr/share/common-licenses/BSD'.
-+
-+Files: src/3rdParty/boost/numeric/bindings/*
-+Copyright: 2002-2004 Kresimir Fresl, Karl Meerbergen, Toon Knapen, 
-+ Andreas Kloeckner, Matthias Troyer
-+License: other 
-+ Permission to copy, modify, use and distribute this software 
-+ for any non-commercial or commercial purpose is granted provided 
-+ that this license appear on all copies of the software source code.
-+ .
-+ Author assumes no responsibility whatsoever for its use and makes 
-+ no guarantees about its quality, correctness or reliability.
-+ .
-+ Kresimir Fresl acknowledges the support of the Faculty of Civil Engineering, 
-+ University of Zagreb, Croatia.
-+
-+Files: src/3rdParty/boost/numeric/bindings/amos/*,
-+ src/3rdParty/boost/numeric/bindings/blas/*,
-+ src/3rdParty/boost/numeric/bindings/traits/config.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/fortran.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/matrix_raw.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/symm_herm_raw.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/vector_raw.hpp,
-+Copyright: 2002-2003 Toon Knapen, Kresimir Fresl, Si-Lab b.v.b.a, Joerg Walter
-+License: other 
-+ Permission to use, copy, modify, distribute and sell this software
-+ and its documentation for any purpose is hereby granted without fee,
-+ provided that the above copyright notice appear in all copies and
-+ that both that copyright notice and this permission notice appear
-+ in supporting documentation.  The authors make no representations
-+ about the suitability of this software for any purpose.
-+ It is provided "as is" without express or implied warranty.
-+
-+Files: src/3rdParty/boost/numeric/bindings/traits/type.h
-+Copyright: 2000,2001,2002,2003 Si-Lab b.v.b.a. and Toon Knapen
-+License: other-non-free 
-+ * License is hereby granted to use and modify this software 
-+ * as long as this copyright notice is retained and modifications
-+ * are clearly marked.
-+ * This License does not permit you to redistribute this software.
-+
-+Files: src/3rdParty/boost/numeric/bindings/lapack/steqr.hpp,
-+ src/3rdParty/boost/numeric/bindings/lapack/sytrd.hpp
-+Copyright: 2007 Karl Meerbergen
-+License: other 
-+ Boost Software License - Version 1.0 - August 17th, 2003
-+ .
-+ Permission is hereby granted, free of charge, to any person or organization
-+ obtaining a copy of the software and accompanying documentation covered by
-+ this license (the "Software") to use, reproduce, display, distribute,
-+ execute, and transmit the Software, and to prepare derivative works of the
-+ Software, and to permit third-parties to whom the Software is furnished to
-+ do so, all subject to the following:
-+ . 
-+ The copyright notices in the Software and this entire statement, including
-+ the above license grant, this restriction and the following disclaimer,
-+ must be included in all copies of the Software, in whole or in part, and
-+ all derivative works of the Software, unless such copies or derivative
-+ works are solely in the form of machine-executable object code generated by
-+ a source language processor.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/OCCAdaptMesh/*
-+Copyright: 1991-2000 Matra Datavision SA, 2001-2004 Open CASCADE SA
-+License: other
-+ This file is part of the Open CASCADE Technology software.
-+ .
-+ This software may be distributed and/or modified under the terms and
-+ conditions of the Open CASCADE Public License as defined by Open CASCADE SA
-+ and appearing in the file LICENSE included in the packaging of this file.
-+ .  
-+ This software is distributed on an "AS IS" basis, without warranty of any
-+ kind, and Open CASCADE SA hereby disclaims all such warranties,
-+ including without limitation, any warranties of merchantability, fitness
-+ for a particular purpose or non-infringement. Please see the License for
-+ the specific terms and conditions governing rights and limitations under the
-+ License.
-+
-+Files: src/3rdParty/Pivy/*
-+Copyright: 2002-2007 Systems in Motion
-+License: other 
-+ Permission to use, copy, modify, and distribute this software for any
-+ purpose with or without fee is hereby granted, provided that the above
-+ copyright notice and this permission notice appear in all copies.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+
-+Files: src/Base/gzstream.*
-+Copyright: 2001 Deepak Bandyopadhyay, Lutz Kettner
-+License: LGPL-2.1+
-+
-+Files: src/Base/PyCXX/*
-+Copyright: ???
-+License: ???
-+
-+Files: src/Base/PyTools.h
-+Copyright: 1996-2000 Mark Lutz, and O'Reilly and Associates.
-+License: other 
-+ Permission to use, copy, modify, and distribute this software 
-+ for any purpose and without fee is hereby granted.  This software
-+ is provided on an as is basis, without warranties of any kind.
-+
-+Files: src/Base/zipios/*
-+Copyright: 2000 Thomas SÃ¸ndergaard
-+License: LGPL-2+
-+
-+Files: src/Base/zipios/directory.*
-+Copyright: 1998 Dietmar Kuehl, Claas Solutions GmbH
-+License: other
-+ Permission to use, copy, modify, distribute and sell this
-+ software for any purpose is hereby granted without fee, provided
-+ that the above copyright notice appears in all copies and that
-+ both that copyright notice and this permission notice appear in
-+ supporting documentation. Dietmar Kuehl and Claas Solutions make no
-+ representations about the suitability of this software for any
-+ purpose. It is provided "as is" without express or implied warranty.
-+
-+Files: src/Gui/SoFCOffscreenRenderer.cpp
-+Copyright: ???
-+License: ???
-+/*
-+ * wrjpgcom.c
-+ *
-+ * Copyright (C) 1994, Thomas G. Lane.
-+ * This file is part of the Independent JPEG Group's software.
-+ * For conditions of distribution and use, see the accompanying README file.
-+ *
-+ * This file contains a very simple stand-alone application that inserts
-+ * user-supplied text as a COM (comment) marker in a JFIF file.
-+ * This may be useful as an example of the minimum logic needed to parse
-+ * JPEG markers.
-+ */
-+
-+Files: src/Mod/Cam/App/*
-+Copyright: 2007 Joachim Zettler <Joachim.Zettler@gmx.de>,
-+ Human Rezai <human@mytum.de>, 
-+ Mohamad Najib Muhammad Noor <najib_bean@yahoo.co.uk>,
-+ Stephane Routelous <stephane.routelous@exotk.org>,
-+ JÃ¼rgen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*, 
-+ src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*, 
-+ src/Mod/Mesh/App/Core/*
-+Copyright: 2005 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
-+ src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
-+Copyright: 2005 Werner Mayer <werner.wm.mayer@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*,
-+Copyright: 2005 Berthold Grupp
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/BuildRegularGeoms.py
-+Copyright: 2005 Berthold Grupp
-+License: ???
-+
-+Files: src/Mod/Drawing/Gui/DrawingView.*, src/Mod/Image/App/ImageBase.*, 
-+ src/Mod/Image/Gui/GLImageBox.*, src/Mod/Image/Gui/ImageView.*,
-+ src/Mod/Image/Gui/XpmImages.h
-+Copyright: ??? Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/triangle.cpp, src/Mod/Mesh/App/Core/triangle.h,
-+ src/3rdParty/OCCAdaptMesh/src/TriangleAdapt/triangleAdapt.c,
-+ src/3rdParty/OCCAdaptMesh/Include/triangleAdapt.h 
-+Copyright: 1993, 1995, 1997, 1998, 2002, 2005 Jonathan Richard Shewchuk
-+License: other-non-free 
-+ /*  This program may be freely redistributed under the condition that the    *
-+ /*    copyright notices (including this entire header and the copyright      *
-+ /*    notice printed when the `-h' switch is selected) are not removed, and  *
-+ /*    no compensation is received.  Private, research, and institutional     *
-+ /*    use is free.  You may distribute modified versions of this code UNDER  *
-+ /*    THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE   *
-+ /*    SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE   *
-+ /*    AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR    *
-+ /*    NOTICE IS GIVEN OF THE MODIFICATIONS.  Distribution of this code as    *
-+ /*    part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT  *
-+ /*    WITH THE AUTHOR.  (If you are not directly supplying this code to a    *
-+ /*    customer, and you are instead telling them how they can obtain it for  *
-+ /*    free, then you are not required to make any arrangement with me.)      *
-+
-+Files: src/Mod/Mesh/App/Core/tritritest.h
-+Copyright: 1997 Tomas Moller
-+License: ???
-+
-+Files: src/Mod/Mesh/App/WildMagic4/*
-+Copyright: 1998-2007 David Eberly http://www.geometrictools.com
-+License: LGPL-2.1+
-+
-+Files: src/Mod/Raytracing/App/resources/*
-+Copyright: 2005 Georg Wiora <georg.wiora@quarkbox.de>,
-+ Juergen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Test/unittestgui.py
-+Copyright: 1999-2001 Steve Purcell
-+License: PSF 
-+ This module is free software, and you may redistribute it and/or modify
-+ it under the same terms as Python itself, so long as this copyright message
-+ and disclaimer are retained in their original form.
-+ . 
-+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
-+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ DAMAGE.
-+ .
-+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
-+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+
-+Files: src/Tools/ImageTools/ImageConv/CmdLine.*,
-+ src/Tools/ImageTools/ImageConv/cmdline.htm
-+Copyright: 1999 Chris Losinger, Smaller Animals Software 
-+ http://www.smalleranimals.com
-+License: ZLIB
-+ This software is provided 'as-is', without any express
-+ or implied warranty.  In no event will the authors be 
-+ held liable for any damages arising from the use of this software.
-+ .
-+ Permission is granted to anyone to use this software 
-+ for any purpose, including commercial applications, and 
-+ to alter it and redistribute it freely, subject to the 
-+ following restrictions:
-+ .
-+ 1. The origin of this software must not be misrepresented; 
-+ you must not claim that you wrote the original software. 
-+ If you use this software in a product, an acknowledgment 
-+ in the product documentation would be appreciated but is not required.
-+ .
-+ 2. Altered source versions must be plainly marked as such, 
-+ and must not be misrepresented as being the original software.
-+ .
-+ 3. This notice may not be removed or altered from any source 
-+ distribution.
-+
-+Files: src/Tools/generateBase/generateDS.py
-+Copyright: 2003 Dave Kuhlman
-+License: MIT
-+ Permission is hereby granted, free of charge, to any person obtaining
-+ a copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, sublicense, and/or sell copies of the Software, and to
-+ permit persons to whom the Software is furnished to do so, subject to
-+ the following conditions:
-+ .
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/atlas/cblas.h,
-+ src/3rdParty/boost/numeric/bindings/traits/algorithm.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/transpose.hpp
-+ src/3rdParty/boost/numeric/bindings/traits/type.hpp
-+ src/App/ComplexGeoDataPyImp.cpp, 
-+ src/App/DocumentObjectPyImp.cpp
-+ src/App/DocumentPyImp.cpp
-+ src/App/Doxygen.cpp
-+ src/App/FeaturePyImp.cpp
-+ src/App/PreCompiled.cpp
-+ src/App/PreCompiled.h
-+ src/App/PropertyContainerPyImp.cpp
-+ src/Base/BaseClassPyImp.cpp
-+ src/Base/BoundBoxPyImp.cpp
-+ src/Base/Doxygen.cpp
-+ src/Base/PersistancePyImp.cpp
-+ src/Base/PreCompiled.cpp
-+ src/Base/PreCompiled.h
-+ src/Base/PyExport.h
-+ src/Base/PyTools.c
-+ src/Base/VectorPyImp.cpp
-+ src/Base/zipios/meta-iostreams.h
-+ src/Gui/InventorAll.h
-+ src/Gui/PreCompiled.cpp
-+ src/Gui/PreCompiled.h
-+ src/Gui/Qt4All.h
-+ src/Gui/SoFCBoundingBox.cpp
-+ src/Gui/SoFCBoundingBox.h
-+ src/Mod/Cam/App/PreCompiled.h
-+ src/Mod/Cam/App/PreCompiled.cpp
-+ src/Mod/Cam/Gui/PreCompiled.h
-+ src/Mod/Cam/Gui/PreCompiled.cpp
-+ src/Mod/Drawing/App/PreCompiled.h
-+ src/Mod/Drawing/App/PreCompiled.cpp
-+ src/Mod/Drawing/Gui/PreCompiled.h
-+ src/Mod/Drawing/Gui/PreCompiled.cpp
-+ src/Mod/Drawing/Gui/AppDrawingGui.cpp
-+ src/Mod/Image/App/CaptureClass.h
-+ src/Mod/Image/App/PreCompiled.h
-+ src/Mod/Image/App/CaptureClass.cpp
-+ src/Mod/Image/App/PreCompiled.cpp
-+ src/Mod/Image/Gui/PreCompiled.h
-+ src/Mod/Image/Gui/PreCompiled.cpp
-+ src/Mod/Import/App/PreCompiled.h
-+ src/Mod/Import/App/PreCompiled.cpp
-+ src/Mod/Import/Gui/PreCompiled.h
-+ src/Mod/Import/Gui/PreCompiled.cpp
-+ src/Mod/JtReader/App/PreCompiled.h
-+ src/Mod/JtReader/App/JtReader.h
-+ src/Mod/JtReader/App/PreCompiled.cpp
-+ src/Mod/Mesh/App/Doxygen.cpp
-+ src/Mod/Mesh/App/PreCompiled.h
-+ src/Mod/Mesh/App/MeshPointPyImp.cpp
-+ src/Mod/Mesh/App/PreCompiled.cpp
-+ src/Mod/Mesh/Gui/Doxygen.cpp
-+ src/Mod/Mesh/Gui/PreCompiled.h
-+ src/Mod/Mesh/Gui/PreCompiled.cpp
-+ src/Mod/Part/App/TopoShapeFacePyImp.cpp
-+ src/Mod/Part/App/OpenCascadeAll.h
-+ src/Mod/Part/App/PreCompiled.h
-+ src/Mod/Part/App/TopoShapePyImp.cpp
-+ src/Mod/Part/App/PreCompiled.cpp
-+ src/Mod/Part/App/PartFeaturePyImp.cpp
-+ src/Mod/Part/Gui/PreCompiled.h
-+ src/Mod/Part/Gui/PreCompiled.cpp
-+ src/Mod/Points/App/PreCompiled.h
-+ src/Mod/Points/App/PreCompiled.cpp
-+ src/Mod/Points/Gui/AppPointsGui.cpp
-+ src/Mod/Points/Gui/PreCompiled.h
-+ src/Mod/Points/Gui/PreCompiled.cpp
-+ src/Mod/Raytracing/App/PreCompiled.h
-+ src/Mod/Raytracing/App/PreCompiled.cpp
-+ src/Mod/Raytracing/Gui/AppRaytracingGui.cpp
-+ src/Mod/Raytracing/Gui/Command.cpp src
-+ src/Mod/Raytracing/Gui/PreCompiled.h
-+ src/Mod/Raytracing/Gui/PreCompiled.cpp
-+ src/Mod/Test/Gui/PreCompiled.h
-+ src/Mod/Test/Gui/PreCompiled.cpp
-+Copyright: Not marked
-+License: ???
--- freecad-0.8.2237.orig/debian/freecad.desktop
-+++ freecad-0.8.2237/debian/freecad.desktop
-@@ -0,0 +1,19 @@
-+[Desktop Entry]
-+Version=1.0
-+Encoding=UTF-8
-+Name=FreeCAD
-+Name[de]=FreeCAD
-+Comment=Feature based Parametric Modeler
-+Comment[de]=Feature-basierter parametrischer Modellierer
-+GenericName=CAD Application
-+GenericName[de]=CAD-Anwendung
-+Exec=/usr/bin/freecad %F
-+Path=/usr/lib/freecad
-+Terminal=false
-+Type=Application
-+Icon=/usr/share/freecad/FCIcon.xpm
-+Categories=Graphics;Science;Engineering
-+StartupNotify=true
-+GenericName[de_DE]=Feature-basierter parametrischer Modellierer
-+Comment[de_DE]=Feature-basierter parametrischer Modellierer
-+MimeType=application/x-extension-fcstd
--- freecad-0.8.2237.orig/debian/compat
-+++ freecad-0.8.2237/debian/compat
-@@ -0,0 +1 @@
-+5
--- freecad-0.8.2237.orig/debian/freecad.doc-base
-+++ freecad-0.8.2237/debian/freecad.doc-base
-@@ -0,0 +1,14 @@
-+Document: freecad
-+Title: FreeCAD Manual
-+Author: Werner Mayer
-+Abstract: An extensible Open Source CAx program for Unix/X11
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+Section: Science/Engineering
-+
-+Format: text
-+Files: /usr/share/doc/freecad/README.Linux.gz
-+
--- freecad-0.8.2237.orig/debian/changelog
-+++ freecad-0.8.2237/debian/changelog
-@@ -0,0 +1,155 @@
-+freecad (0.8.2237-1jaunty1) jaunty; urgency=low
-+
-+  * New release for Ubuntu 9.04 (Jackalope Jaunty)
-+
-+ -- Werner Mayer <werner@users.sourceforge.net>  Sat, 11 Jul 2009 21:59:53 +0200
-+
-+freecad (0.7.2008-1jaunty1) intrepid; urgency=low
-+
-+  * New release for Ubuntu 9.04 (Jackalope Jaunty)
-+
-+ -- Werner Mayer <werner@users.sourceforge.net>  Sat, 21 Mar 2009 19:23:57 +0100
-+
-+freecad (0.7.1779-1intrepid1) intrepid; urgency=low
-+
-+  * New release for Ubuntu 8.10 (Intrepid Ibex)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 14 Dec 2008 15:20:54 +0200
-+
-+freecad (0.7.1658-1intrepid1) intrepid; urgency=low
-+
-+  * New release for Ubuntu 8.10 (Intrepid Ibex)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 12 Oct 2008 16:20:54 +0200
-+
-+freecad (0.7.1658-1hardy1) hardy; urgency=low
-+
-+  * New release for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 11 Oct 2008 18:45:20 +0200
-+
-+freecad (0.7.1658-1gutsy1) gutsy; urgency=low
-+
-+  * New release for Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 11 Oct 2008 15:56:27 +0200
-+
-+freecad (0.7.1525-1feisty1) feisty; urgency=low
-+
-+  * Activate MIME support in rules file
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue,  5 Aug 2008 21:27:46 +0200
-+
-+freecad (0.7.1522-1feisty1) feisty; urgency=low
-+
-+  * Package for Ubuntu 7.04 (Feisty Fawn)
-+  * Abstract interface for geometric data types
-+  * Avoid flickering of cursor when cutting several meshes at once
-+  * Update to the latest debian policy version 3.7.3
-+  * Several bugs fixed with Python GIL
-+  * Providing a dev package for freecad
-+  * Make TopoDS_Shape and Geom_Geometry classes accessible from Python
-+  * Make Python interface for algorithms on shapes and geometries
-+  * Support of mesh segments
-+  * Add test/annotation object
-+  * Add simple measurement facility
-+  * Remove OpenCascade dependency in Mesh module
-+  * Thumbnail facility added
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 04 Aug 2008 20:11:20 +0200
-+
-+freecad (0.7.1514-1) unstable; urgency=low
-+
-+  * New upstream version
-+  * Add more stuff to the copyright file
-+  * control: add build-dep to python-central 
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 06 Aug 2008 18:25:02 +0200
-+
-+freecad (0.7.1350-1hardy1) hardy; urgency=low
-+
-+  * Package for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 May 2008 11:11:20 +0200
-+
-+freecad (0.7.1350-1gutsy1) gutsy; urgency=low
-+
-+  * Backport to Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 01:54:39 +0200
-+
-+freecad (0.7.1350-1feisty1) feisty; urgency=low
-+
-+  * Backport to Ubuntu 7.04 (Feisty Fawn)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 00:09:08 +0200
-+
-+freecad (0.7.1350-1) unstable; urgency=low
-+
-+  * Official release for version 0.7
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Fri, 23 May 2008 23:39:47 +0200
-+
-+freecad (0.7.1344-1ubuntu2) feisty; urgency=low
-+
-+  * New package with fixed self-dependency problem
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 15:34:34 +0200
-+
-+freecad (0.7.1344-1ubuntu1) feisty; urgency=low
-+
-+  * New debian package for Feisty
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 11:04:06 +0200
-+
-+freecad (0.7.1344-1) unstable; urgency=low
-+
-+  * Write patch file to make builds with OpenCASCADE libs inside but with no
-+    dependency to libopencascade6.2
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 21 May 2008 10:06:07 +0200
-+
-+freecad (0.7.1343-1) unstable; urgency=low
-+
-+  * Embed required OpenCASCADE libs into this package as long as no official
-+    Debian package is available  
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 20 May 2008 00:40:39 +0200
-+
-+freecad (0.7.1342-1) unstable; urgency=low
-+
-+  * Switch to new versioning scheme of OpenCASCADE packages 
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 19 May 2008 23:55:31 +0200
-+
-+freecad (0.7.1316-1) unstable; urgency=low
-+
-+  * Support of pivy (Python binding for Coin/SoQt)
-+  * Support of PyQt4
-+  * General support of SWIG modules
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 26 Apr 2008 13:51:25 +0200
-+
-+freecad (0.7.1031-1) unstable; urgency=low
-+
-+  * Qt4 port finished
-+  * Support of Python binding for Qt4
-+  * Support of Python binding for Coin
-+  * Support of entirely in Python written modules
-+  * Added support of model driven architecture for Python binding
-+  * Use boost's signal/slot mechanism to update data
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 04 Jan 2008 13:50:37 +0200
-+
-+freecad (0.7.645-1) unstable; urgency=low
-+
-+  * Qt4 port started
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 24 Jul 2007 13:04:37 +0200
-+
-+freecad (0.6.472-1) unstable; urgency=low
-+
-+  * Initial Release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 26 Sep 2006 16:55:15 +0200
-+
--- freecad-0.8.2237.orig/debian/freecad.1
-+++ freecad-0.8.2237/debian/freecad.1
-@@ -0,0 +1,73 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH FREECAD 1 "July  25, 2007" freecad "Linux User's Manual"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+freecad \- An extensible Open Source CAx program for Unix/X11
-+.SH SYNOPSIS
-+.B freecad
-+.RI [ options ] " files"
-+.br
-+.B freecadcmd
-+.RI [ options ] " files"
-+.SH DESCRIPTION
-+.B FreeCAD
-+is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features 
-+some key concepts like macro recording, workbenches, ability to run as a 
-+server and dynamically loadable application extensions and it is designed 
-+to be platform independent.
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-+.\" respectively.
-+.SH USAGE
-+\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
-+.SH OPTIONS
-+These programs follow the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of the options supported by \fBfreecad\fR is included below.
-+.SS "Generic options"
-+.TP
-+\fB\-h, \-\-help\fR
-+Show summary of options.
-+.TP
-+\fB\-v, \-\-version\fR
-+Show version of program.
-+.TP
-+\fB\-c, \-\-console\fR
-+Start in console mode.
-+.TP
-+\fB\-\-response\-file\fR \fIarg\fR
-+Can be specified with '@name', too.
-+
-+.SS "Configuration"
-+.TP
-+\fB\-l, \-\-write\-log\fR
-+Write a log file.
-+.TP
-+\fB\-t, \-\-run\-test\fR \fIarg\fR
-+Test level.
-+.TP
-+\fB\-M, \-\-module\-path\fR \fIarg\fR
-+Additional module path.
-+.TP
-+\fB\-P, \-\-python\-path\fR \fIarg\fR
-+Additional Python path.
-+.SH SEE ALSO
-+To get more information about \fBFreeCAD\fR, please visit \fIhttps://freecadweb.org/wiki\fR
-+.SH BUGS
-+To report a bug, please visit \fIhttps://freecadweb.org/tracker/\fR
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
--- freecad-0.8.2237.orig/debian/rules
-+++ freecad-0.8.2237/debian/rules
-@@ -0,0 +1,143 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+# Sample debian/rules that uses debhelper.
-+# This file was originally written by Joey Hess and Craig Small.
-+# As a special exception, when this file is copied by dh-make into a
-+# dh-make output file, you may use that output file without restriction.
-+# This special exception was added by Craig Small in version 0.37 of dh-make.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete
-+
-+# 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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+configure: autogen.sh
-+	chmod u+x autogen.sh
-+	./autogen.sh
-+
-+config.status: configure
-+	dh_testdir
-+# Add here commands to configure the package.
-+	./configure --with-occ-include=/usr/include/opencascade --with-occ-lib=/usr/lib \
-+--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+--prefix=/usr/lib/freecad --mandir=/usr/share/man \
-+--infodir=/usr/share/info --datadir=/usr/share/freecad \
-+--includedir=/usr/include/freecad \
-+CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-+
-+build: build-stamp
-+
-+build-stamp:  config.status
-+	dh_testdir
-+
-+# Add here commands to compile the package.
-+	$(MAKE)
-+	#docbook-to-man debian/freecad.sgml > freecad.1
-+
-+	touch $@
-+
-+# Add here commands to clean up after the build process.
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp 
-+	[ ! -f Makefile ] || $(MAKE) distclean
-+	rm -f configure
-+	dh_clean
-+	find -name 'Makefile.in' | xargs rm -f
-+	find -name '*.pyc' | xargs rm -f
-+	find -name 'moc_*.cpp' | xargs rm -f
-+	find -name '*.lo' | xargs rm -f
-+	find -name '*.deps' | xargs rm -rf
-+	find -name '*.libs' | xargs rm -rf	
-+	rm -f stamp-h1 aclocal.m4 config.guess config.sub depcomp install-sh
-+	rm -f ltmain.sh missing config.log libtool
-+	
-+install: build
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k 
-+	dh_installdirs
-+
-+# Add here commands to install the package into debian/tmp/freecad.
-+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad
-+
-+# install the core system
-+	dh_install -pfreecad debian/tmp/freecad/usr/share/* usr/share/
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
-+
-+# install the modules
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so.* usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/*.py usr/lib/freecad/Mod/$(MODULE);)
-+
-+# special treating of Draft module
-+#	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.py usr/lib/freecad/Mod/Draft
-+#	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.svg usr/lib/freecad/Mod/Draft
-+#	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.ui usr/lib/freecad/Mod/Draft
-+#	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/draftlibs/*.py usr/lib/freecad/Mod/Draft/draftlibs
-+
-+# special treating of Test module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test
-+
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.la usr/lib/freecad/lib
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+	dh_testdir
-+	dh_testroot
-+	dh_installchangelogs ChangeLog.txt
-+	dh_installdocs
-+	dh_installexamples
-+	dh_install debian/freecad.desktop usr/share/applications
-+	dh_install debian/mime/freecad-thumbnailer usr/bin
-+	dh_install debian/mime/freecad.schemas etc/gconf/schemas
-+	dh_gconf -pfreecad
-+	dh_desktop
-+	dh_installmenu
-+	dh_installmime
-+	dh_pycentral
-+#	dh_installinfo
-+#	dh_installman debian/freecad.1
-+	dh_installman debian/freecad.1 debian/mime/freecad-thumbnailer.1
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_makeshlibs
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install 
--- freecad-0.8.2237.orig/debian/menu
-+++ freecad-0.8.2237/debian/menu
-@@ -0,0 +1,6 @@
-+?package(freecad):needs="X11"\
-+  section="Applications/Science/Engineering"\
-+  title="FreeCAD"\
-+  command="/usr/bin/freecad"\
-+  icon="/usr/share/freecad/FCIcon.xpm"
-+
--- freecad-0.8.2237.orig/debian/README.Debian
-+++ freecad-0.8.2237/debian/README.Debian
-@@ -0,0 +1,6 @@
-+freecad for Debian
-+------------------
-+
-+- First Debian package for FreeCAD.
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>, Tue, 26 Sep 2006 16:55:15 +0200
--- freecad-0.8.2237.orig/debian/docs
-+++ freecad-0.8.2237/debian/docs
-@@ -0,0 +1,2 @@
-+ChangeLog.txt
-+README.Linux
--- freecad-0.8.2237.orig/debian/mime/freecad.schemas
-+++ freecad-0.8.2237/debian/mime/freecad.schemas
-@@ -0,0 +1,30 @@
-+<gconfschemafile>
-+    <schemalist>
-+
-+        <schema>
-+            <key>/schemas/desktop/gnome/thumbnailers/application@x-extension-fcstd/enable</key>
-+            <applyto>/desktop/gnome/thumbnailers/application@x-extension-fcstd/enable</applyto>
-+            <owner>freecad</owner>
-+            <type>bool</type>
-+            <default>true</default>
-+            <locale name="C">
-+                <short>Enable thumbnailing of FreeCAD documents.</short>
-+                <long>Enable thumbnailing of FreeCAD documents.</long>
-+            </locale>
-+        </schema>
-+
-+
-+        <schema>
-+            <key>/schemas/desktop/gnome/thumbnailers/application@x-extension-fcstd/command</key>
-+            <applyto>/desktop/gnome/thumbnailers/application@x-extension-fcstd/command</applyto>
-+            <owner>freecad</owner>
-+            <type>string</type>
-+            <default>/usr/bin/freecad-thumbnailer -s %s %u %o</default>
-+            <locale name="C">
-+                <short>Thumbnail command for documents from FreeCAD.</short>
-+                <long>Valid command plus arguments for freecad-thumbnailer.</long>
-+            </locale>
-+        </schema>
-+
-+    </schemalist>
-+</gconfschemafile>
--- freecad-0.8.2237.orig/debian/mime/freecad-thumbnailer
-+++ freecad-0.8.2237/debian/mime/freecad-thumbnailer
-@@ -0,0 +1,26 @@
-+#!/usr/bin/python
-+
-+import sys, zipfile, md5
-+import getopt
-+import gnomevfs
-+
-+opt,par = getopt.getopt(sys.argv[1:],'-s:')
-+inpfile = gnomevfs.get_local_path_from_uri(par[0])
-+outfile = par[1]
-+
-+try:
-+	zfile=zipfile.ZipFile(inpfile)
-+	files=zfile.namelist()
-+	# check for meta-file if it's really a FreeCAD document
-+	if files[0] != "Document.xml":
-+		sys.exit(1)
-+
-+	image="thumbnails/Thumbnail.png"
-+	if image in files:
-+		image=zfile.read(image)
-+		thumb=open(outfile,"wb")
-+		thumb.write(image)
-+		thumb.close()
-+except:
-+	sys.exit(1)
-+
--- freecad-0.8.2237.orig/debian/mime/freecad-thumbnailer.1
-+++ freecad-0.8.2237/debian/mime/freecad-thumbnailer.1
-@@ -0,0 +1,20 @@
-+.TH FREECAD 1 "August  04, 2008" freecad "Linux User's Manual"
-+.SH NAME
-+freecad-thumbnailer \- A thumbnailer for FreeCAD project files
-+.SH SYNOPSIS
-+\fBfreecad-thumbnailer\fP [ -s \fIsize\fP ] \fIinput file\fP \fIoutput file\fP
-+.SH DESCRIPTION
-+\fBfreecad-thumbnailer\fP
-+is a Python script that extracts an embedded thumbnail from a FreeCAD project file.
-+If no thumbnail is embedded then nothing happens. According to the specification of
-+freedesktop.org the thumbnail image is a PNG file. The required \fBinput file\fP argument
-+specifies the project file where the thumbnail should be extracted from and the 
-+\fBoutput file\fP specifies the file where the thumbnail should be written to.
-+.SH OPTIONS
-+.TP
-+\fB-s \fIsize\fR
-+Specify the size of the image in pixel. 
-+.SH "SEE ALSO"
-+freecad(1), freecadcmd(1)
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
@@ -1,736 +0,0 @@
--- freecad-0.9.2646.orig/debian/compat
-+++ freecad-0.9.2646/debian/compat
-@@ -0,0 +1 @@
-+7
--- freecad-0.9.2646.orig/debian/rules
-+++ freecad-0.9.2646/debian/rules
-@@ -0,0 +1,106 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete
-+
-+# 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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+configure: autogen.sh
-+	dh_testdir
-+	chmod u+x autogen.sh
-+	./autogen.sh
-+
-+config.status: configure
-+	dh_testdir
-+	./configure --with-occ-include=/usr/include/opencascade \
-+--with-occ-lib=/usr/lib \
-+--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+--prefix=/usr/lib/freecad --mandir=/usr/share/man \
-+--infodir=/usr/share/info --datadir=/usr/share/freecad \
-+--includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \
-+CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-+
-+build: build-stamp
-+
-+build-stamp: config.status
-+	dh_testdir
-+	$(MAKE)
-+	touch $@
-+
-+clean:
-+	dh clean
-+	rm -f build-stamp
-+	find -name '*.pyc' | xargs rm -f
-+	find -name 'moc_*.cpp' | xargs rm -f
-+	find -name '*.lo' | xargs rm -f
-+	find -name '*.deps' | xargs rm -rf
-+	find -name '*.libs' | xargs rm -rf
-+	rm -f stamp-h1 config.log libtool
-+
-+install: build install-stamp
-+install-stamp:
-+	dh_testdir
-+	dh_testroot
-+	dh_prep
-+	dh_installdirs
-+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad
-+	# Remove testing modules we don't want to have in the deb
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/_TEMPLATE_
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/TemplatePyMod
-+	# install the core system
-+	dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/* usr/share/freecad/
-+	#dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
-+	dh_install debian/freecad.desktop usr/share/applications
-+	dh_installman debian/freecad.1
-+	dh_installchangelogs ChangeLog.txt
-+	# install the modules
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so.* usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/*.py usr/lib/freecad/Mod/$(MODULE);)
-+	# special treating of Draft module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.py usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.svg usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.ui usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/draftlibs/*.py usr/lib/freecad/Mod/Draft/draftlibs
-+	# special treating of Test module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test
-+
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.la usr/lib/freecad/lib
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
-+
-+	# install the help system
-+	dh_install -pfreecad-doc debian/tmp/freecad/usr/share/doc/* usr/share/doc/
-+	touch install-stamp
-+
-+binary-indep: build install
-+	# We have nothing to do by default.
-+
-+binary-arch: build install
-+	dh binary-arch
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
--- freecad-0.9.2646.orig/debian/copyright
-+++ freecad-0.9.2646/debian/copyright
-@@ -0,0 +1,294 @@
-+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-+Upstream-Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+Packaged-By: Werner Mayer <wmayer@users.sourceforge.net>
-+Packaged-Date: 2006-09-26_16:55:15+02:00
-+Original-Source-Location: http://sourceforge.net/projects/free-cad
-+
-+Files: *
-+Copyright: 2001-2009 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: LGPL-2+
-+ This package is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+ .
-+ This package is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ Lesser General Public License for more details.
-+ .
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this package; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
-+ .
-+ On Debian systems, the complete text of the GNU Lesser General Public 
-+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-+
-+Files: src/3rdParty/boost/numeric/bindings/*
-+Copyright: 2002-2008 Kresimir Fresl, Karl Meerbergen, Toon Knapen,
-+ Andreas Kloeckner, Jeremy Conlin, Thomas Klimpel, Fabien Dekeyser,
-+ Quoc-Cuong Pham, Si-Lab b.v.b.a., Joerg Walter
-+License: other-boost-1.0
-+ Boost Software License - Version 1.0 - August 17th, 2003
-+ .
-+ Permission is hereby granted, free of charge, to any person or organization
-+ obtaining a copy of the software and accompanying documentation covered by
-+ this license (the "Software") to use, reproduce, display, distribute,
-+ execute, and transmit the Software, and to prepare derivative works of the
-+ Software, and to permit third-parties to whom the Software is furnished to
-+ do so, all subject to the following:
-+ .
-+ The copyright notices in the Software and this entire statement, including
-+ the above license grant, this restriction and the following disclaimer,
-+ must be included in all copies of the Software, in whole or in part, and
-+ all derivative works of the Software, unless such copies or derivative
-+ works are solely in the form of machine-executable object code generated by
-+ a source language processor.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/boost/numeric/bindings/lapack/lapack.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/std_valarray.hpp
-+Copyright: 2003 Toon Knapen, Kresimir Fresl, Karl Meerbergen
-+License: other
-+ * Permission to copy, modify, use and distribute this software
-+ * for any non-commercial or commercial purpose is granted provided
-+ * that this license appear on all copies of the software source code.
-+ *
-+ * Authors assume no responsibility whatsoever for its use and makes
-+ * no guarantees about its quality, correctness or reliability.
-+ *
-+ * KF acknowledges the support of the Faculty of Civil Engineering,
-+ * University of Zagreb, Croatia.
-+
-+Files: src/Base/Base64.*
-+Copyright: 2004-2008 Rene Nyffenegger <rene.nyffenegger@adp-gmbh.ch>
-+License: other
-+ This source code is provided 'as-is', without any express or implied
-+ warranty. In no event will the author be held liable for any damages
-+ arising from the use of this software.
-+ .
-+ Permission is granted to anyone to use this software for any purpose,
-+ including commercial applications, and to alter it and redistribute it
-+ freely, subject to the following restrictions:
-+ .
-+ 1. The origin of this source code must not be misrepresented; you must not
-+    claim that you wrote the original source code. If you use this source code
-+    in a product, an acknowledgment in the product documentation would be
-+    appreciated but is not required.
-+ .
-+ 2. Altered source versions must be plainly marked as such, and must not be
-+    misrepresented as being the original source code.
-+ .
-+ 3. This notice may not be removed or altered from any source distribution.
-+
-+Files: src/Base/fdstream.hpp
-+Copyright: 2001 Nicolai M. Josuttis
-+License: other
-+ Permission to copy, use, modify, sell and distribute this software
-+ is granted provided this copyright notice appears in all copies.
-+ This software is provided "as is" without express or implied
-+ warranty, and with no claim as to its suitability for any purpose.
-+
-+Files: src/Base/gzstream.*
-+Copyright: 2001 Deepak Bandyopadhyay, Lutz Kettner
-+License: LGPL-2.1+
-+
-+Files: src/Base/PyTools.*
-+Copyright: 1996-2000 Mark Lutz, and O'Reilly and Associates.
-+License: other
-+ Permission to use, copy, modify, and distribute this software
-+ for any purpose and without fee is hereby granted.  This software
-+ is provided on an as is basis, without warranties of any kind.
-+
-+Files: src/Base/zipios/*
-+Copyright: 2000 Thomas Søndergaard
-+License: LGPL-2+
-+
-+Files: src/Base/zipios/directory.*
-+Copyright: 1998 Dietmar Kuehl, Claas Solutions GmbH
-+License: other
-+ Permission to use, copy, modify, distribute and sell this
-+ software for any purpose is hereby granted without fee, provided
-+ that the above copyright notice appears in all copies and that
-+ both that copyright notice and this permission notice appear in
-+ supporting documentation. Dietmar Kuehl and Claas Solutions make no
-+ representations about the suitability of this software for any
-+ purpose. It is provided "as is" without express or implied warranty.
-+
-+Files: src/CXX/*
-+Copyright: 1998-2007 The Regents of the University of California
-+License: BSD-3
-+                           Copyright (c) 1998 - 2007
-+                  The Regents of the University of California
-+             Produced at the Lawrence Livermore National Laboratory
-+             Written by Geoff Furnish, Paul F. Dubois, Barry A. Scott
-+                               UCRL-CODE-227018
-+                             All rights reserved.
-+ .
-+ This file is part of PyCXX. For details, see http://cxx.sourceforge.net.
-+ .
-+ Redistribution  and  use   in  source  and  binary  forms,   with  or  without
-+ modification, are permitted provided that the following conditions are met:
-+ .
-+ - Redistributions of source code must retain the above copyright notice, this
-+   list of conditions and the disclaimer below.
-+ - Redistributions in  binary form must reproduce the above  copyright notice,
-+   this  list of  conditions  and  the  disclaimer (as  noted  below)  in  the
-+   documentation and/or materials provided with the distribution.
-+ - Neither the name  of the UC/LLNL nor  the names of its  contributors may be
-+   used to  endorse or  promote products  derived from  this software  without
-+   specific prior written permission.
-+ .
-+ THIS SOFTWARE IS  PROVIDED BY THE COPYRIGHT  HOLDERS AND CONTRIBUTORS  "AS IS"
-+ AND ANY  EXPRESS OR  IMPLIED WARRANTIES, INCLUDING,  BUT NOT  LIMITED  TO, THE
-+ IMPLIED WARRANTIES  OF MERCHANTABILITY AND  FITNESS FOR  A PARTICULAR  PURPOSE
-+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OF THE UNIVERSITY OF CALIFORNIA,
-+ THE U.S.  DEPARTMENT  OF  ENERGY  OR CONTRIBUTORS BE  LIABLE  FOR  ANY DIRECT,
-+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+ BUT NOT LIMITED TO, PROCUREMENT OF  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ DATA, OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER  CAUSED AND ON ANY THEORY
-+ OF LIABILITY,  WHETHER  IN  CONTRACT,  STRICT  LIABILITY,  OR  TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE)  ARISING IN ANY WAY OUT OF THE  USE OF THIS SOFTWARE,
-+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ .
-+ Additional BSD Notice
-+ .
-+ 1. This notice  is required to be  provided under our  contract with  the U.S.
-+    Department of Energy  (DOE).  This work was produced  at the  University of
-+    California,  Lawrence  Livermore  National Laboratory  under  Contract  No.
-+    W-7405-ENG-48 with the DOE.
-+ .
-+ 2. Neither the  United  States  Government nor  the University  of  California
-+    nor any  of their  employees,  makes any warranty,  express or  implied, or
-+    assumes any  liability or  responsibility for  the accuracy,  completeness,
-+    or usefulness of any information, apparatus, product, or process disclosed,
-+    or represents that its use would not infringe privately-owned rights.
-+ .
-+ 3. Also, reference  herein to any  specific commercial  products,  process, or
-+    services by  trade name,  trademark,  manufacturer  or otherwise  does  not
-+    necessarily  constitute  or  imply   its  endorsement,  recommendation,  or
-+    favoring by the  United States Government or the  University of California.
-+    The views  and opinions  of authors  expressed herein  do  not  necessarily
-+    state or reflect  those of the  United States Government  or the University
-+    of California, and shall not be used for advertising or product endorsement
-+    purposes.
-+
-+Files: src/Gui/iisTaskPanel/src/*
-+Copyright: http://www.ii-system.com
-+License: LGPL
-+
-+Files: src/Mod/Draft/*
-+Copyright: Yorik van Havre, Werner Mayer, Martin Burbaum
-+License: GPL-2+
-+
-+Files: src/Mod/Draft/draftlibs/dxf*
-+Copyright: 2005-2008 Ed Blake, Remigiusz Fiedler, Stani Michiels
-+License: GPL-2+
-+
-+Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*,
-+ src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*,
-+ src/Mod/Mesh/App/Core/*
-+Copyright: 2005 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
-+ src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
-+Copyright: 2005 Werner Mayer <werner.wm.mayer@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*
-+Copyright: 2005 Berthold Grupp
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/BuildRegularGeoms.py
-+Copyright: 2005 Berthold Grupp
-+License: LGPL
-+
-+Files: src/Mod/Image/App/ImageBase.*, src/Mod/Image/Gui/GLImageBox.*,
-+ src/Mod/Image/Gui/ImageView.*, src/Mod/Image/Gui/XpmImages.h
-+Copyright: 2004 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/tritritest.h
-+Copyright: 1997 Tomas Moller <tam@cs.lth.se>
-+License: other
-+ tritritest.h has no licensing information, but Tomas Moller replied
-+ the following, when asked about it:
-+ .
-+ The code is free to use for anyone and any projects, but I give no
-+ warranties.
-+
-+Files: src/Mod/Mesh/App/WildMagic4/*
-+Copyright: 1998-2007 David Eberly http://www.geometrictools.com
-+License: LGPL-2.1+
-+
-+Files: src/Mod/Raytracing/App/resources/*
-+Copyright: 2005 Georg Wiora <georg.wiora@quarkbox.de>,
-+ Juergen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Sketcher/App/sketchflat/*
-+Copyright: 2008 Jonathan Westhues
-+License: GPL-3+
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 3 can be found in '/usr/share/common-licenses/GPL-3'.
-+
-+Files: src/Mod/Test/unittestgui.py
-+Copyright: 1999-2001 Steve Purcell
-+License: PSF
-+ This module is free software, and you may redistribute it and/or modify
-+ it under the same terms as Python itself, so long as this copyright message
-+ and disclaimer are retained in their original form.
-+ .
-+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
-+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ DAMAGE.
-+ .
-+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
-+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+
-+Files: src/Mod/Part/MakeBottle.py, src/Tools/*
-+Copyright: 2002-2008 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: GPL-2+
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 2 can be found in '/usr/share/common-licenses/GPL-2'.
-+
-+Files: src/Tools/generateBase/generateDS.py
-+Copyright: 2003 Dave Kuhlman
-+License: MIT
-+ Permission is hereby granted, free of charge, to any person obtaining
-+ a copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, sublicense, and/or sell copies of the Software, and to
-+ permit persons to whom the Software is furnished to do so, subject to
-+ the following conditions:
-+ .
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Files: debian/*
-+Copyright: 2007-2009 Werner Mayer <wmayer@users.sourceforge.net>,
-+ Teemu Ikonen <tpikonen@gmail.com>
-+License: LGPL-2+
--- freecad-0.9.2646.orig/debian/freecad.links
-+++ freecad-0.9.2646/debian/freecad.links
-@@ -0,0 +1,3 @@
-+usr/lib/freecad/bin/FreeCAD usr/bin/freecad
-+usr/lib/freecad/bin/FreeCADCmd usr/bin/freecadcmd
-+usr/share/man/man1/freecad.1.gz usr/share/man/man1/freecadcmd.1.gz
--- freecad-0.9.2646.orig/debian/freecad.1
-+++ freecad-0.9.2646/debian/freecad.1
-@@ -0,0 +1,73 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH FREECAD 1 "July  25, 2007" freecad "Linux User's Manual"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+freecad \- An extensible Open Source CAx program for Unix/X11
-+.SH SYNOPSIS
-+.B freecad
-+.RI [ options ] " files"
-+.br
-+.B freecadcmd
-+.RI [ options ] " files"
-+.SH DESCRIPTION
-+.B FreeCAD
-+is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features 
-+some key concepts like macro recording, workbenches, ability to run as a 
-+server and dynamically loadable application extensions and it is designed 
-+to be platform independent.
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-+.\" respectively.
-+.SH USAGE
-+\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
-+.SH OPTIONS
-+These programs follow the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of the options supported by \fBfreecad\fR is included below.
-+.SS "Generic options"
-+.TP
-+\fB\-h, \-\-help\fR
-+Show summary of options.
-+.TP
-+\fB\-v, \-\-version\fR
-+Show version of program.
-+.TP
-+\fB\-c, \-\-console\fR
-+Start in console mode.
-+.TP
-+\fB\-\-response\-file\fR \fIarg\fR
-+Can be specified with '@name', too.
-+
-+.SS "Configuration"
-+.TP
-+\fB\-l, \-\-write\-log\fR
-+Write a log file.
-+.TP
-+\fB\-t, \-\-run\-test\fR \fIarg\fR
-+Test level.
-+.TP
-+\fB\-M, \-\-module\-path\fR \fIarg\fR
-+Additional module path.
-+.TP
-+\fB\-P, \-\-python\-path\fR \fIarg\fR
-+Additional Python path.
-+.SH SEE ALSO
-+To get more information about \fBFreeCAD\fR, please visit \fIhttps://freecadweb.org/wiki\fR
-+.SH BUGS
-+To report a bug, please visit \fIhttps://freecadweb.org/tracker/\fR
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
--- freecad-0.9.2646.orig/debian/changelog
-+++ freecad-0.9.2646/debian/changelog
-@@ -0,0 +1,130 @@
-+freecad (0.9.2646-1karmic) karmic; urgency=low
-+
-+
-+  * New upstream release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 14 Nov 2009 22:00:00 +0200
-+
-+freecad (0.8.2237-2) unstable; urgency=low
-+
-+  * Added libboost-python-dev to Build-Depends (closes: #549738).
-+  * Added myself to uploaders list.
-+  * Bumped Standards-Version.
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu, 12 Nov 2009 12:02:42 -0500
-+
-+freecad (0.8.2237-1) unstable; urgency=low
-+
-+  * New Upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 16 Jul 2009 18:37:41 +0200
-+
-+freecad (0.7.1658-1) UNRELEASED; urgency=low
-+
-+  * New upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 20 Oct 2008 15:35:58 +0200
-+
-+freecad (0.7.1514-1) UNRELEASED; urgency=low
-+
-+  * New upstream version
-+  * Add more stuff to the copyright file
-+  * control: add build-dep to python-central
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 06 Aug 2008 18:25:02 +0200
-+
-+freecad (0.7.1350-1hardy1) UNRELEASED; urgency=low
-+
-+  * Package for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 May 2008 11:11:20 +0200
-+
-+freecad (0.7.1350-1gutsy1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 01:54:39 +0200
-+
-+freecad (0.7.1350-1feisty1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.04 (Feisty Fawn)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 00:09:08 +0200
-+
-+freecad (0.7.1350-1) UNRELEASED; urgency=low
-+
-+  * New upstream release from sf.net
-+  * Import to debian-science repository at git.debian.org
-+  * control:
-+    - Update to standards-version 3.7.3
-+    - Add Vcs-* fields pointing to git.debian.org
-+    - Improve descriptions
-+  * Convert copyright to (pseudo) machine readable format, audit source
-+  * Fix categories in .desktop file
-+  * Change Section to Science/Engineering in .doc-base and menu files
-+  * rules: do not ignore errors on clean target, add dh_desktop call
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 05 Aug 2008 18:58:07 +0200
-+
-+freecad (0.7.1344-1ubuntu2) UNRELEASED; urgency=low
-+
-+  * New package with fixed self-dependency problem
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 15:34:34 +0200
-+
-+freecad (0.7.1344-1ubuntu1) UNRELEASED; urgency=low
-+
-+  * New debian package for Feisty
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 11:04:06 +0200
-+
-+freecad (0.7.1344-1) UNRELEASED; urgency=low
-+
-+  * Write patch file to make builds with OpenCASCADE libs inside but with no
-+    dependency to libopencascade6.2
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 21 May 2008 10:06:07 +0200
-+
-+freecad (0.7.1343-1) UNRELEASED; urgency=low
-+
-+  * Embed required OpenCASCADE libs into this package as long as no official
-+    Debian package is available
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 20 May 2008 00:40:39 +0200
-+
-+freecad (0.7.1342-1) UNRELEASED; urgency=low
-+
-+  * Switch to new versioning scheme of OpenCASCADE packages
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 19 May 2008 23:55:31 +0200
-+
-+freecad (0.7.1316-1) UNRELEASED; urgency=low
-+
-+  * Support of pivy (Python binding for Coin/SoQt)
-+  * Support of PyQt4
-+  * General support of SWIG modules
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 26 Apr 2008 13:51:25 +0200
-+
-+freecad (0.7.1031-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port finished
-+  * Support of Python binding for Qt4
-+  * Support of Python binding for Coin
-+  * Support of entirely in Python written modules
-+  * Added support of model driven architecture for Python binding
-+  * Use boost's signal/slot mechanism to update data
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 04 Jan 2008 13:50:37 +0200
-+
-+freecad (0.7.645-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port started
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 24 Jul 2007 13:04:37 +0200
-+
-+freecad (0.6.472-1) UNRELEASED; urgency=low
-+
-+  * Initial Release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 26 Sep 2006 16:55:15 +0200
-+
--- freecad-0.9.2646.orig/debian/control
-+++ freecad-0.9.2646/debian/control
-@@ -0,0 +1,66 @@
-+Source: freecad
-+Section: science
-+Priority: extra
-+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-+Uploaders: Teemu Ikonen <tpikonen@gmail.com>, "Adam C. Powell, IV" <hazelsct@debian.org>
-+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git
-+Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git
-+Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page
-+Build-Depends: debhelper (>= 7), autotools-dev,
-+ libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
-+ libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
-+ libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
-+ libboost-python-dev, python-dev, python-opencv, python-support,
-+ libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev,
-+ libcoin60-dev, libsoqt4-dev (>= 1.4.2~svn20090224), libgl1-mesa-dev,
-+ libgts-bin, libgts-dev, libcv-dev, zlib1g-dev, libxerces-c2-dev,
-+ libopencascade-foundation-dev, libopencascade-modeling-dev,
-+ libswscale-dev, libblas-dev, libatlas-headers, python-cxx-dev, libzipios++-dev
-+Standards-Version: 3.8.3
-+
-+Package: freecad
-+Architecture: any
-+Section: science
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-pivy, python-qt4
-+Suggests: freecad-doc, python-opencv
-+Description: An extensible Open Source CAx program (alpha)
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ .
-+ Currently, FreeCAD can import and display CAD models in IGES, STEP, and
-+ BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats.
-+ Editing and modeling features are currently somewhat limited.
-+
-+Package: freecad-dev
-+Architecture: any
-+Section: libdevel
-+Depends: ${shlibs:Depends}, ${misc:Depends}, freecad (= ${binary:Version})
-+Description: FreeCAD development files
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the libtool .la files, headers and symlinks necessary to
-+ develop modules for FreeCAD.
-+
-+Package: freecad-doc
-+Architecture: all
-+Section: doc
-+Depends: ${misc:Depends}, qt4-dev-tools
-+Description: FreeCAD documentation
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the FreeCAD documentation.
-+ .
-+ The documentation is provided in Qt's new help format;
-+ the new help format version can be viewed in conjunction with the Qt Assistant
-+ found in the qt4-dev-tools package.
-+
--- freecad-0.9.2646.orig/debian/freecad.desktop
-+++ freecad-0.9.2646/debian/freecad.desktop
-@@ -0,0 +1,19 @@
-+[Desktop Entry]
-+Version=1.0
-+Encoding=UTF-8
-+Name=FreeCAD
-+Name[de]=FreeCAD
-+Comment=Feature based Parametric Modeler
-+Comment[de]=Feature-basierter parametrischer Modellierer
-+GenericName=CAD Application
-+GenericName[de]=CAD-Anwendung
-+Exec=/usr/bin/freecad %F
-+Path=/usr/lib/freecad
-+Terminal=false
-+Type=Application
-+Icon=/usr/share/freecad/FCIcon.xpm
-+Categories=Graphics;Science;Engineering
-+StartupNotify=true
-+GenericName[de_DE]=Feature-basierter parametrischer Modellierer
-+Comment[de_DE]=Feature-basierter parametrischer Modellierer
-+MimeType=application/x-extension-fcstd
--- freecad-0.9.2646.orig/debian/menu
-+++ freecad-0.9.2646/debian/menu
-@@ -0,0 +1,6 @@
-+?package(freecad):needs="X11"\
-+  section="Applications/Science/Engineering"\
-+  title="FreeCAD"\
-+  command="/usr/bin/freecad"\
-+  icon="/usr/share/freecad/FCIcon.xpm"
-+
--- freecad-0.9.2646.orig/debian/freecad.sharedmimeinfo
-+++ freecad-0.9.2646/debian/freecad.sharedmimeinfo
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+	<mime-type type="application/x-extension-fcstd">
-+		<sub-class-of type="application/zip"/>
-+		<comment>FreeCAD document files</comment>
-+		<glob pattern="*.fcstd"/>
-+	</mime-type>
-+</mime-info>
@@ -1,892 +0,0 @@
--- freecad-0.11.4446.orig/debian/changelog
-+++ freecad-0.11.4446/debian/changelog
-@@ -0,0 +1,239 @@
-+freecad (0.11.4446-1lucid1) lucid; urgency=low
-+
-+  * New release for Ubuntu 10.04.2 LTS (lucid)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 27 Apr 2011 10:59:21 +0200
-+
-+freecad (0.11.4446-1lucid1) lucid; urgency=low
-+
-+  * New release for Ubuntu 10.04.2 LTS (lucid)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 27 Apr 2011 10:47:15 +0200
-+
-+freecad (0.11.3729.dfsg-2) unstable; urgency=low
-+
-+  * Add gfortran and libopencascade-visualization-dev to BD
-+    to fix FTBFS (closes: #622694)
-+  * Add libqtwebkit-dev to BD (closes: #618241)
-+  * Delete quilt from BD and corresponding changes in rules.
-+  * Add description to freecad-occ650.patch
-+  * Delete encoding string from .desktop
-+  * Fix some spelling errors, pointed out by lintian.  
-+
-+ -- Anton Gladky <gladky.anton@gmail.com>  Thu, 14 Apr 2011 10:23:25 +0100
-+
-+freecad (0.11.3729.dfsg-1) unstable; urgency=low
-+
-+  [ Denis Barbier ]
-+  * Merge OpenCASCADE 6.5.0 compatibility patch (closes: #617545).
-+
-+  [ Adam C. Powell, IV ]
-+  * New upstream (closes: #622213, #618241).
-+  * Changed to source format 3.0 (quilt).
-+  * Added patch target which forces autotools to run, and automake and autoconf
-+    are now in Build-Depends (closes: #607181).
-+  * Set aside src/Build/Version.h to prevent build problems.
-+  * Does not install .la files (closes: #621298).
-+  * Boost 1.46 compatibility patch (closes: #621877).
-+  * Set aside files which autotools modifies so clean works.
-+  * Added libtool to Build-Depends (thanks: PICCA Frédéric-Emmanuel).
-+  * Bumped Standards-Version, no changes needed.
-+
-+ -- "Adam C. Powell, IV" <hazelsct@debian.org>  Tue, 12 Apr 2011 23:40:30 -0400
-+
-+freecad (0.10.3247.dfsg-2) unstable; urgency=low
-+
-+  * control:
-+    - Update to standars-version 3.9.0.
-+    - Remove libblas-dev, libatlas-dev from build-deps.
-+  * Add debian/shlibs.local file containing the correct binary dep
-+    to libsoqt4-20 (closes: #575239).
-+  * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes
-+    the lintian warning copyright-refers-to-deprecated-bsd-license-file.
-+  * Add kFreeBSD portability fixes. Thanks to Petr Salinger
-+    <Petr.Salinger@seznam.cz> for the patch (closes: #592461).
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 18 Aug 2010 19:34:36 +0200
-+
-+freecad (0.10.3247.dfsg-1) unstable; urgency=low
-+
-+  * New upstream version (closes: #582627)
-+  * Add debian/source/format file with contents "1.0".
-+  * Use freecad.xpm as icon in menu and desktop files.
-+  * copyright: Add licensing information for new files in this release.
-+  * src/Base/Makefile.in, src/Gui/Makefile.in: Do not remove *.tab.c files
-+    in make distclean target.
-+  * control:
-+    - Add build-dep to libeigen2-dev.
-+    - Update to standards-version 3.8.4.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 05 Jul 2010 15:07:49 +0200
-+
-+freecad (0.9.2646.5.dfsg-1) unstable; urgency=low
-+
-+  * Add 'dfsg' extension to upstream version, upstream sources are unchanged.
-+  * Remove libgl1-mesa-dev build-dep, rely on libcoin to pull in GL libraries.
-+  * Change build-dep libatlas-headers to libatlas-dev (closes: #577309).
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Fri, 14 May 2010 17:20:35 +0200
-+
-+freecad (0.9.2646.5-1) unstable; urgency=low
-+
-+  * New upstream version (closes: #561696).
-+  * Added swig to Build-Depends (closes: #563523, #563772).
-+  * Removed python-opencv from Build-Depends and Recommends (closes: #560768).
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Mon, 11 Jan 2010 08:48:33 -0500
-+
-+freecad (0.9.2646.4-1) unstable; urgency=low
-+
-+  * New upstream version (closes: #559849, #559846).
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Fri, 11 Dec 2009 20:21:32 -0500
-+
-+freecad (0.9.2646.3-1) unstable; urgency=low
-+
-+  * New upstream version. Removes TiddlySaver.jar, fixes help problems.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 03 Dec 2009 19:39:27 +0100
-+
-+freecad (0.9.2646-1) unstable; urgency=low
-+
-+  [ Werner Mayer ]
-+  * New upstream release
-+  * In-source copy of PyCXX has been dropped (closes: #547936)
-+  * In-source copy of zipios++ has been dropped (closes: #547941)
-+  * Change build-dependency on python2.5-dev to python-dev
-+  * Add freecad-doc binary package
-+  * Remove Suggestion of a chm viewer, suggest freecad-doc instead
-+
-+  [ Teemu Ikonen ]
-+  * Add override to dh_compress
-+  * Add versioned build-deb to debhelper (>= 7.0.50)
-+  * Add build-deps to libzipios++-dev and python-cxx-dev.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 17 Nov 2009 14:22:00 +0100
-+
-+freecad (0.8.2237-2) unstable; urgency=low
-+
-+  * Added libboost-python-dev to Build-Depends (closes: #549738).
-+  * Added myself to uploaders list.
-+  * Bumped Standards-Version.
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu, 12 Nov 2009 12:02:42 -0500
-+
-+freecad (0.8.2237-1) unstable; urgency=low
-+
-+  * New Upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 16 Jul 2009 18:37:41 +0200
-+
-+freecad (0.7.1658-1) UNRELEASED; urgency=low
-+
-+  * New upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 20 Oct 2008 15:35:58 +0200
-+
-+freecad (0.7.1514-1) UNRELEASED; urgency=low
-+
-+  * New upstream version
-+  * Add more stuff to the copyright file
-+  * control: add build-dep to python-central
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 06 Aug 2008 18:25:02 +0200
-+
-+freecad (0.7.1350-1hardy1) UNRELEASED; urgency=low
-+
-+  * Package for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 May 2008 11:11:20 +0200
-+
-+freecad (0.7.1350-1gutsy1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 01:54:39 +0200
-+
-+freecad (0.7.1350-1feisty1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.04 (Feisty Fawn)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 00:09:08 +0200
-+
-+freecad (0.7.1350-1) UNRELEASED; urgency=low
-+
-+  * New upstream release from sf.net
-+  * Import to debian-science repository at git.debian.org
-+  * control:
-+    - Update to standards-version 3.7.3
-+    - Add Vcs-* fields pointing to git.debian.org
-+    - Improve descriptions
-+  * Convert copyright to (pseudo) machine readable format, audit source
-+  * Fix categories in .desktop file
-+  * Change Section to Science/Engineering in .doc-base and menu files
-+  * rules: do not ignore errors on clean target, add dh_desktop call
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 05 Aug 2008 18:58:07 +0200
-+
-+freecad (0.7.1344-1ubuntu2) UNRELEASED; urgency=low
-+
-+  * New package with fixed self-dependency problem
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 15:34:34 +0200
-+
-+freecad (0.7.1344-1ubuntu1) UNRELEASED; urgency=low
-+
-+  * New debian package for Feisty
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 11:04:06 +0200
-+
-+freecad (0.7.1344-1) UNRELEASED; urgency=low
-+
-+  * Write patch file to make builds with OpenCASCADE libs inside but with no
-+    dependency to libopencascade6.2
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 21 May 2008 10:06:07 +0200
-+
-+freecad (0.7.1343-1) UNRELEASED; urgency=low
-+
-+  * Embed required OpenCASCADE libs into this package as long as no official
-+    Debian package is available
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 20 May 2008 00:40:39 +0200
-+
-+freecad (0.7.1342-1) UNRELEASED; urgency=low
-+
-+  * Switch to new versioning scheme of OpenCASCADE packages
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 19 May 2008 23:55:31 +0200
-+
-+freecad (0.7.1316-1) UNRELEASED; urgency=low
-+
-+  * Support of pivy (Python binding for Coin/SoQt)
-+  * Support of PyQt4
-+  * General support of SWIG modules
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 26 Apr 2008 13:51:25 +0200
-+
-+freecad (0.7.1031-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port finished
-+  * Support of Python binding for Qt4
-+  * Support of Python binding for Coin
-+  * Support of entirely in Python written modules
-+  * Added support of model driven architecture for Python binding
-+  * Use boost's signal/slot mechanism to update data
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 04 Jan 2008 13:50:37 +0200
-+
-+freecad (0.7.645-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port started
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 24 Jul 2007 13:04:37 +0200
-+
-+freecad (0.6.472-1) UNRELEASED; urgency=low
-+
-+  * Initial Release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 26 Sep 2006 16:55:15 +0200
-+
--- freecad-0.11.4446.orig/debian/shlibs.local
-+++ freecad-0.11.4446/debian/shlibs.local
-@@ -0,0 +1,2 @@
-+libGL 1 libgl1-mesa-glx (>= 7.7.1-1)
-+libSoQt4 20 libsoqt4-20 (>= 1.4.2~svn20090224)
--- freecad-0.11.4446.orig/debian/freecad.1
-+++ freecad-0.11.4446/debian/freecad.1
-@@ -0,0 +1,73 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH FREECAD 1 "July  25, 2007" freecad "Linux User's Manual"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+freecad \- An extensible Open Source CAx program for Unix/X11
-+.SH SYNOPSIS
-+.B freecad
-+.RI [ options ] " files"
-+.br
-+.B freecadcmd
-+.RI [ options ] " files"
-+.SH DESCRIPTION
-+.B FreeCAD
-+is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features 
-+some key concepts like macro recording, workbenches, ability to run as a 
-+server and dynamically loadable application extensions and it is designed 
-+to be platform independent.
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-+.\" respectively.
-+.SH USAGE
-+\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
-+.SH OPTIONS
-+These programs follow the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of the options supported by \fBfreecad\fR is included below.
-+.SS "Generic options"
-+.TP
-+\fB\-h, \-\-help\fR
-+Show summary of options.
-+.TP
-+\fB\-v, \-\-version\fR
-+Show version of program.
-+.TP
-+\fB\-c, \-\-console\fR
-+Start in console mode.
-+.TP
-+\fB\-\-response\-file\fR \fIarg\fR
-+Can be specified with '@name', too.
-+
-+.SS "Configuration"
-+.TP
-+\fB\-l, \-\-write\-log\fR
-+Write a log file.
-+.TP
-+\fB\-t, \-\-run\-test\fR \fIarg\fR
-+Test level.
-+.TP
-+\fB\-M, \-\-module\-path\fR \fIarg\fR
-+Additional module path.
-+.TP
-+\fB\-P, \-\-python\-path\fR \fIarg\fR
-+Additional Python path.
-+.SH SEE ALSO
-+To get more information about \fBFreeCAD\fR, please visit \fIhttps://freecadweb.org/wiki\fR
-+.SH BUGS
-+To report a bug, please visit \fIhttps://freecadweb.org/tracker/\fR
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
--- freecad-0.11.4446.orig/debian/rules
-+++ freecad-0.11.4446/debian/rules
-@@ -0,0 +1,132 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+patch-stamp:
-+	touch $@
-+
-+configure: autogen.sh patch-stamp
-+	dh_testdir
-+	#for autotools_mod_file in `find . -name Makefile.in` aclocal.m4 \
-+	#    configure m4/libtool.m4 m4/ltmain.sh m4/ltoptions.m4 \
-+	#    m4/ltversion.m4 m4/lt~obsolete.m4; do \
-+	#  cp -a $$autotools_mod_file $$autotools_mod_file.setaside; \
-+	#done
-+	chmod u+x autogen.sh
-+	./autogen.sh
-+
-+config.status: configure
-+	dh_testdir
-+	./configure --with-occ-include=/usr/include/opencascade \
-+--with-occ-lib=/usr/lib \
-+--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+--prefix=/usr/lib/freecad --mandir=/usr/share/man \
-+--infodir=/usr/share/info --datadir=/usr/share/freecad \
-+--includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \
-+CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-+	touch src/Build/Version.h
-+
-+build: build-stamp
-+
-+build-stamp: config.status
-+	dh_testdir
-+	$(MAKE)
-+	touch $@
-+
-+clean:
-+	mv src/Build/Version.h src/Build/Version.h.old
-+	dh clean
-+	mv src/Build/Version.h.old src/Build/Version.h
-+	rm -f build-stamp
-+	find -name '*.pyc' | xargs rm -f
-+	find -name 'moc_*.cpp' | xargs rm -f
-+	find -name '*.lo' | xargs rm -f
-+	find -name '*.deps' | xargs rm -rf
-+	find -name '*.libs' | xargs rm -rf
-+	rm -f stamp-h1 config.log libtool 71
-+	#if [ -e Makefile.in.setaside ]; then \
-+	#for autotools_mod_file in `find . -name Makefile.in` aclocal.m4 \
-+	#    configure m4/libtool.m4 m4/ltmain.sh m4/ltoptions.m4 \
-+	#    m4/ltversion.m4 m4/lt~obsolete.m4; do \
-+	#  mv -f $$autotools_mod_file.setaside $$autotools_mod_file; \
-+	#done; fi
-+	dh clean
-+	rm -f patch-stamp
-+	#quilt pop -a
-+	#rm -rf .pc/
-+
-+install: build install-stamp
-+install-stamp:
-+	dh_testdir
-+	dh_testroot
-+	dh_prep
-+	dh_installdirs
-+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad
-+	# Remove testing modules we don't want to have in the deb
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/_TEMPLATE_
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/TemplatePyMod
-+	# install the core system
-+	dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/* usr/share/freecad/
-+	#dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
-+	dh_install debian/freecad.desktop usr/share/applications
-+	dh_installman debian/freecad.1
-+	dh_installchangelogs ChangeLog.txt
-+	# install the modules
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so.* usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/*.py usr/lib/freecad/Mod/$(MODULE);)
-+	# special treating of PartDesign module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/PartDesign/Scripts/*.py usr/lib/freecad/Mod/PartDesign/Scripts;)
-+	# special treating of Draft module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.py usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/draftlibs/*.py usr/lib/freecad/Mod/Draft/draftlibs
-+	# special treating of Test module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test
-+
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
-+
-+	# install the help system
-+	dh_install -pfreecad-doc debian/tmp/freecad/usr/share/doc/* usr/share/doc/
-+	touch install-stamp
-+
-+override_dh_compress:
-+	dh_compress -X.qch -X.qhc
-+
-+override_dh_makeshlibs:
-+
-+
-+binary-indep: build install
-+	dh binary-indep
-+
-+binary-arch: build install
-+	dh binary-arch
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
--- freecad-0.11.4446.orig/debian/menu
-+++ freecad-0.11.4446/debian/menu
-@@ -0,0 +1,6 @@
-+?package(freecad):needs="X11"\
-+  section="Applications/Science/Engineering"\
-+  title="FreeCAD"\
-+  command="/usr/bin/freecad"\
-+  icon="/usr/share/freecad/freecad.xpm"
-+
--- freecad-0.11.4446.orig/debian/control
-+++ freecad-0.11.4446/debian/control
-@@ -0,0 +1,66 @@
-+Source: freecad
-+Section: science
-+Priority: extra
-+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-+Uploaders: Teemu Ikonen <tpikonen@gmail.com>, "Adam C. Powell, IV" <hazelsct@debian.org>, Anton Gladky <gladky.anton@gmail.com>
-+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git
-+Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git
-+Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page
-+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libtool, automake, 
-+ autoconf, libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
-+ libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
-+ libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
-+ libboost-python-dev, python-dev, python-support,
-+ libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev,
-+ libcoin60-dev, libsoqt4-dev (>= 1.4.2~svn20090224), libeigen2-dev, libeigen3-dev, libgl1-mesa-dev,
-+ zlib1g-dev, libxerces-c2-dev, libopencascade-foundation-dev, libopencascade-modeling-dev, 
-+ libopencascade-visualization-dev, python-cxx-dev, libswscale-dev, 
-+ libzipios++-dev, swig, gfortran
-+Standards-Version: 3.8.4
-+
-+Package: freecad
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+Recommends: python-pivy
-+Suggests: freecad-doc
-+Description: Extensible Open Source CAx program (alpha)
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ .
-+ Currently, FreeCAD can import and display CAD models in IGES, STEP, and
-+ BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats.
-+ Editing and modeling features are currently somewhat limited.
-+
-+Package: freecad-dev
-+Architecture: any
-+Section: libdevel
-+Depends: ${shlibs:Depends}, ${misc:Depends}, freecad (= ${binary:Version})
-+Description: FreeCAD development files
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains headers and symlinks necessary to
-+ develop modules for FreeCAD.
-+
-+Package: freecad-doc
-+Architecture: all
-+Section: doc
-+Depends: ${misc:Depends}, qt4-dev-tools
-+Description: FreeCAD documentation
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the FreeCAD documentation.
-+ .
-+ The documentation is provided in Qt's new help format;
-+ the new help format version can be viewed in conjunction with the Qt Assistant
-+ found in the qt4-dev-tools package.
-+
--- freecad-0.11.4446.orig/debian/freecad.sharedmimeinfo
-+++ freecad-0.11.4446/debian/freecad.sharedmimeinfo
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+	<mime-type type="application/x-extension-fcstd">
-+		<sub-class-of type="application/zip"/>
-+		<comment>FreeCAD document files</comment>
-+		<glob pattern="*.fcstd"/>
-+	</mime-type>
-+</mime-info>
--- freecad-0.11.4446.orig/debian/compat
-+++ freecad-0.11.4446/debian/compat
-@@ -0,0 +1 @@
-+7
--- freecad-0.11.4446.orig/debian/freecad.links
-+++ freecad-0.11.4446/debian/freecad.links
-@@ -0,0 +1,3 @@
-+usr/lib/freecad/bin/FreeCAD usr/bin/freecad
-+usr/lib/freecad/bin/FreeCADCmd usr/bin/freecadcmd
-+usr/share/man/man1/freecad.1.gz usr/share/man/man1/freecadcmd.1.gz
--- freecad-0.11.4446.orig/debian/freecad.desktop
-+++ freecad-0.11.4446/debian/freecad.desktop
-@@ -0,0 +1,18 @@
-+[Desktop Entry]
-+Version=1.0
-+Name=FreeCAD
-+Name[de]=FreeCAD
-+Comment=Feature based Parametric Modeler
-+Comment[de]=Feature-basierter parametrischer Modellierer
-+GenericName=CAD Application
-+GenericName[de]=CAD-Anwendung
-+Exec=/usr/bin/freecad %F
-+Path=/usr/lib/freecad
-+Terminal=false
-+Type=Application
-+Icon=/usr/share/freecad/freecad.xpm
-+Categories=Graphics;Science;Engineering
-+StartupNotify=true
-+GenericName[de_DE]=Feature-basierter parametrischer Modellierer
-+Comment[de_DE]=Feature-basierter parametrischer Modellierer
-+MimeType=application/x-extension-fcstd
--- freecad-0.11.4446.orig/debian/watch
-+++ freecad-0.11.4446/debian/watch
-@@ -0,0 +1,2 @@
-+version=3
-+http://sf.net/free-cad/freecad_(.+)\.orig\.tar\.gz
--- freecad-0.11.4446.orig/debian/freecad-doc.doc-base
-+++ freecad-0.11.4446/debian/freecad-doc.doc-base
-@@ -0,0 +1,18 @@
-+Document: freecad-development-documentation
-+Title: FreeCAD development documentation
-+Author: FreeCAD developers
-+Abstract: FreeCAD is a general purpose Open Source 3D 
-+ CAD/MCAD/CAx/CAE/PLM modeler, aimed directly at mechanical engineering 
-+ and product design but also fits in a wider range of uses around 
-+ engineering, such as architecture or other engineering specialties. 
-+ It is a feature-based parametric modeler with a modular software 
-+ architecture which makes it easy to provide additional functionality 
-+ without modifying the core system.
-+Section: Science/Engineering
-+
-+Format: HTML
-+Index: /usr/share/doc/freecad/Start_Page.html
-+Files: /usr/share/doc/freecad/*.q*
-+
-+Format: PDF
-+Files: /usr/share/doc/freecad/kr_16.pdf.gz /usr/share/doc/freecad/kr_210_2.pdf.gz /usr/share/doc/freecad/kr_500_2.pdf.gz
--- freecad-0.11.4446.orig/debian/copyright
-+++ freecad-0.11.4446/debian/copyright
-@@ -0,0 +1,275 @@
-+Format-Specification: http://dep.debian.net/deps/dep5/
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+X-Packaged-By: Werner Mayer <wmayer@users.sourceforge.net>
-+X-Packaged-Date: 2006-09-26_16:55:15+02:00
-+Source: http://sourceforge.net/projects/free-cad
-+
-+Files: *
-+Copyright: 2001-2009 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: LGPL-2+
-+ This package is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+ .
-+ This package is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ Lesser General Public License for more details.
-+ .
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this package; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
-+ .
-+ On Debian systems, the complete text of the GNU Lesser General Public
-+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-+
-+Files: src/3rdParty/boost/numeric/bindings/*
-+Copyright: 2002-2008 Kresimir Fresl, Karl Meerbergen, Toon Knapen,
-+ Andreas Kloeckner, Jeremy Conlin, Thomas Klimpel, Fabien Dekeyser,
-+ Quoc-Cuong Pham, Si-Lab b.v.b.a., Joerg Walter
-+License: other-boost-1.0
-+ Boost Software License - Version 1.0 - August 17th, 2003
-+ .
-+ Permission is hereby granted, free of charge, to any person or organization
-+ obtaining a copy of the software and accompanying documentation covered by
-+ this license (the "Software") to use, reproduce, display, distribute,
-+ execute, and transmit the Software, and to prepare derivative works of the
-+ Software, and to permit third-parties to whom the Software is furnished to
-+ do so, all subject to the following:
-+ .
-+ The copyright notices in the Software and this entire statement, including
-+ the above license grant, this restriction and the following disclaimer,
-+ must be included in all copies of the Software, in whole or in part, and
-+ all derivative works of the Software, unless such copies or derivative
-+ works are solely in the form of machine-executable object code generated by
-+ a source language processor.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/boost/numeric/bindings/lapack/lapack.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/std_valarray.hpp
-+Copyright: 2003 Toon Knapen, Kresimir Fresl, Karl Meerbergen
-+License: other
-+ * Permission to copy, modify, use and distribute this software
-+ * for any non-commercial or commercial purpose is granted provided
-+ * that this license appear on all copies of the software source code.
-+ *
-+ * Authors assume no responsibility whatsoever for its use and makes
-+ * no guarantees about its quality, correctness or reliability.
-+ *
-+ * KF acknowledges the support of the Faculty of Civil Engineering,
-+ * University of Zagreb, Croatia.
-+
-+Files: src/Base/Base64.*
-+Copyright: 2004-2008 Rene Nyffenegger <rene.nyffenegger@adp-gmbh.ch>
-+License: other
-+ This source code is provided 'as-is', without any express or implied
-+ warranty. In no event will the author be held liable for any damages
-+ arising from the use of this software.
-+ .
-+ Permission is granted to anyone to use this software for any purpose,
-+ including commercial applications, and to alter it and redistribute it
-+ freely, subject to the following restrictions:
-+ .
-+ 1. The origin of this source code must not be misrepresented; you must not
-+    claim that you wrote the original source code. If you use this source code
-+    in a product, an acknowledgment in the product documentation would be
-+    appreciated but is not required.
-+ .
-+ 2. Altered source versions must be plainly marked as such, and must not be
-+    misrepresented as being the original source code.
-+ .
-+ 3. This notice may not be removed or altered from any source distribution.
-+
-+Files: src/Base/fdstream.hpp
-+Copyright: 2001 Nicolai M. Josuttis
-+License: other
-+ Permission to copy, use, modify, sell and distribute this software
-+ is granted provided this copyright notice appears in all copies.
-+ This software is provided "as is" without express or implied
-+ warranty, and with no claim as to its suitability for any purpose.
-+
-+Files: src/Base/gzstream.*
-+Copyright: 2001 Deepak Bandyopadhyay, Lutz Kettner
-+License: LGPL-2.1+
-+
-+Files: src/Base/PyTools.*
-+Copyright: 1996-2000 Mark Lutz, and O'Reilly and Associates.
-+License: other
-+ Permission to use, copy, modify, and distribute this software
-+ for any purpose and without fee is hereby granted.  This software
-+ is provided on an as is basis, without warranties of any kind.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2004-2009 UnaMesa Association
-+License: BSD
-+ Copyright (c) UnaMesa Association 2004-2009
-+ .
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions are
-+ met:
-+ .
-+ Redistributions of source code must retain the above copyright notice,
-+ this list of conditions and the following disclaimer.
-+ .
-+ Redistributions in binary form must reproduce the above copyright notice,
-+ this list of conditions and the following disclaimer in the documentation
-+ and/or other materials provided with the distribution.
-+ .
-+ Neither the name of the UnaMesa Association nor the names of its
-+ contributors may be used to endorse or promote products derived from this
-+ software without specific prior written permission.
-+ .
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS
-+ IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2009 John Resig
-+License: GPL-2 or MIT
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 2 can be found in '/usr/share/common-licenses/GPL-2'.
-+
-+License: MIT
-+ Permission is hereby granted, free of charge, to any person obtaining
-+ a copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, sublicense, and/or sell copies of the Software, and to
-+ permit persons to whom the Software is furnished to do so, subject to
-+ the following conditions:
-+ .
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2009 The Dojo Foundation, http://sizzlejs.com/
-+License: GPL-2 or MIT or BSD
-+
-+Files: src/Gui/iisTaskPanel/src/*
-+Copyright: http://www.ii-system.com
-+License: LGPL
-+
-+Files: src/Mod/Draft/*
-+Copyright: Yorik van Havre, Werner Mayer, Martin Burbaum
-+License: GPL-2+
-+
-+Files: src/Mod/Draft/draftlibs/dxf*
-+Copyright: 2005-2008 Ed Blake, Remigiusz Fiedler, Stani Michiels
-+License: GPL-2+
-+
-+Files: src/Mod/Draft/WorkingPlane.py
-+Copyright: 2009-2010 Ken Cline <cline@frii.com>
-+License: GPL-2+
-+
-+Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*,
-+ src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*,
-+ src/Mod/Mesh/App/Core/*
-+Copyright: 2005 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
-+ src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
-+Copyright: 2005 Werner Mayer <werner.wm.mayer@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*
-+Copyright: 2005 Berthold Grupp
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/BuildRegularGeoms.py
-+Copyright: 2005 Berthold Grupp
-+License: LGPL
-+
-+Files: src/Mod/Image/App/ImageBase.*, src/Mod/Image/Gui/GLImageBox.*,
-+ src/Mod/Image/Gui/ImageView.*, src/Mod/Image/Gui/XpmImages.h
-+Copyright: 2004 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/tritritest.h
-+Copyright: 1997 Tomas Moller <tam@cs.lth.se>
-+License: other
-+ tritritest.h has no licensing information, but Tomas Moller replied
-+ the following, when asked about it:
-+ .
-+ The code is free to use for anyone and any projects, but I give no
-+ warranties.
-+
-+Files: src/Mod/Mesh/App/WildMagic4/*
-+Copyright: 1998-2007 David Eberly http://www.geometrictools.com
-+License: LGPL-2.1+
-+
-+Files: src/Mod/Part/App/edgecluster.*
-+Copyright: 2010 Joachim Zettler <Joachim.Zettler@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Raytracing/App/resources/*
-+Copyright: 2005 Georg Wiora <georg.wiora@quarkbox.de>,
-+ Juergen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Sketcher/App/sketchflat/*
-+Copyright: 2008 Jonathan Westhues
-+License: GPL-3+
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 3 can be found in '/usr/share/common-licenses/GPL-3'.
-+
-+Files: src/Mod/Sketcher/App/sketchsolve_cp/*
-+Copyright: 2009 Jonathan George
-+License: BSD
-+
-+Files: src/Mod/Test/unittestgui.py
-+Copyright: 1999-2001 Steve Purcell
-+License: PSF
-+ This module is free software, and you may redistribute it and/or modify
-+ it under the same terms as Python itself, so long as this copyright message
-+ and disclaimer are retained in their original form.
-+ .
-+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
-+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ DAMAGE.
-+ .
-+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
-+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+
-+Files: src/Mod/Part/MakeBottle.py, src/Tools/*
-+Copyright: 2002-2008 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: GPL-2+
-+
-+Files: src/Tools/generateBase/generateDS.py
-+Copyright: 2003 Dave Kuhlman
-+License: MIT
-+
-+Files: debian/*
-+Copyright: 2007-2009 Werner Mayer <wmayer@users.sourceforge.net>,
-+ Teemu Ikonen <tpikonen@gmail.com>
-+License: LGPL-2+
--- freecad-0.11.4446.orig/debian/source/format
-+++ freecad-0.11.4446/debian/source/format
-@@ -0,0 +1 @@
-+1.0
--- freecad-0.11.4446.orig/debian/source/lintian-overrides
-+++ freecad-0.11.4446/debian/source/lintian-overrides
-@@ -0,0 +1,3 @@
-+# Lintian thinks uploader Adam Powell's name violates policy
-+freecad source: uploader-address-missing "Adam C. Powell
-+freecad source: uploader-not-full-name IV"
@@ -1,740 +0,0 @@
--- freecad-0.11.3729.orig/debian/changelog
-+++ freecad-0.11.3729/debian/changelog
-@@ -0,0 +1,172 @@
-+freecad (0.11.3729-1lucid1) lucid; urgency=low
-+
-+  * New release for Ubuntu 10.04.1 LTS (lucid)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 14 Nov 2010 18:09:17 +0100
-+
-+freecad (0.10.3139-1lucid1) lucid; urgency=low
-+
-+  * New release for Ubuntu 10.04 LTS (lucid)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 Apr 2010 23:43:06 +0200
-+
-+freecad (0.10.3139-1) unstable; urgency=low
-+
-+  * New upstream version (closes: #561696).
-+  * Added swig to Build-Depends (closes: #563523, #563772).
-+  * Removed python-opencv from Build-Depends and Recommends (closes: #560768).
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Mon, 11 Jan 2010 08:48:33 -0500
-+
-+freecad (0.9.2646.4-1) unstable; urgency=low
-+
-+  * New upstream version (closes: #559849, #559846).
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Fri, 11 Dec 2009 20:21:32 -0500
-+
-+freecad (0.9.2646.3-1) unstable; urgency=low
-+
-+  * New upstream version. Removes TiddlySaver.jar, fixes help problems.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 03 Dec 2009 19:39:27 +0100
-+
-+freecad (0.9.2646-1) unstable; urgency=low
-+
-+  [ Werner Mayer ]
-+  * New upstream release
-+  * In-source copy of PyCXX has been dropped (closes: #547936)
-+  * In-source copy of zipios++ has been dropped (closes: #547941)
-+  * Change build-dependency on python2.5-dev to python-dev
-+  * Add freecad-doc binary package
-+  * Remove Suggestion of a chm viewer, suggest freecad-doc instead
-+
-+  [ Teemu Ikonen ]
-+  * Add override to dh_compress
-+  * Add versioned build-deb to debhelper (>= 7.0.50)
-+  * Add build-deps to libzipios++-dev and python-cxx-dev.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 17 Nov 2009 14:22:00 +0100
-+
-+freecad (0.8.2237-2) unstable; urgency=low
-+
-+  * Added libboost-python-dev to Build-Depends (closes: #549738).
-+  * Added myself to uploaders list.
-+  * Bumped Standards-Version.
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu, 12 Nov 2009 12:02:42 -0500
-+
-+freecad (0.8.2237-1) unstable; urgency=low
-+
-+  * New Upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 16 Jul 2009 18:37:41 +0200
-+
-+freecad (0.7.1658-1) UNRELEASED; urgency=low
-+
-+  * New upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 20 Oct 2008 15:35:58 +0200
-+
-+freecad (0.7.1514-1) UNRELEASED; urgency=low
-+
-+  * New upstream version
-+  * Add more stuff to the copyright file
-+  * control: add build-dep to python-central
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 06 Aug 2008 18:25:02 +0200
-+
-+freecad (0.7.1350-1hardy1) UNRELEASED; urgency=low
-+
-+  * Package for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 May 2008 11:11:20 +0200
-+
-+freecad (0.7.1350-1gutsy1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 01:54:39 +0200
-+
-+freecad (0.7.1350-1feisty1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.04 (Feisty Fawn)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 00:09:08 +0200
-+
-+freecad (0.7.1350-1) UNRELEASED; urgency=low
-+
-+  * New upstream release from sf.net
-+  * Import to debian-science repository at git.debian.org
-+  * control:
-+    - Update to standards-version 3.7.3
-+    - Add Vcs-* fields pointing to git.debian.org
-+    - Improve descriptions
-+  * Convert copyright to (pseudo) machine readable format, audit source
-+  * Fix categories in .desktop file
-+  * Change Section to Science/Engineering in .doc-base and menu files
-+  * rules: do not ignore errors on clean target, add dh_desktop call
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 05 Aug 2008 18:58:07 +0200
-+
-+freecad (0.7.1344-1ubuntu2) UNRELEASED; urgency=low
-+
-+  * New package with fixed self-dependency problem
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 15:34:34 +0200
-+
-+freecad (0.7.1344-1ubuntu1) UNRELEASED; urgency=low
-+
-+  * New debian package for Feisty
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 11:04:06 +0200
-+
-+freecad (0.7.1344-1) UNRELEASED; urgency=low
-+
-+  * Write patch file to make builds with OpenCASCADE libs inside but with no
-+    dependency to libopencascade6.2
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 21 May 2008 10:06:07 +0200
-+
-+freecad (0.7.1343-1) UNRELEASED; urgency=low
-+
-+  * Embed required OpenCASCADE libs into this package as long as no official
-+    Debian package is available
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 20 May 2008 00:40:39 +0200
-+
-+freecad (0.7.1342-1) UNRELEASED; urgency=low
-+
-+  * Switch to new versioning scheme of OpenCASCADE packages
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 19 May 2008 23:55:31 +0200
-+
-+freecad (0.7.1316-1) UNRELEASED; urgency=low
-+
-+  * Support of pivy (Python binding for Coin/SoQt)
-+  * Support of PyQt4
-+  * General support of SWIG modules
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 26 Apr 2008 13:51:25 +0200
-+
-+freecad (0.7.1031-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port finished
-+  * Support of Python binding for Qt4
-+  * Support of Python binding for Coin
-+  * Support of entirely in Python written modules
-+  * Added support of model driven architecture for Python binding
-+  * Use boost's signal/slot mechanism to update data
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 04 Jan 2008 13:50:37 +0200
-+
-+freecad (0.7.645-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port started
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 24 Jul 2007 13:04:37 +0200
-+
-+freecad (0.6.472-1) UNRELEASED; urgency=low
-+
-+  * Initial Release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 26 Sep 2006 16:55:15 +0200
-+
--- freecad-0.11.3729.orig/debian/shlibs.local
-+++ freecad-0.11.3729/debian/shlibs.local
-@@ -0,0 +1 @@
-+libGL 1 libgl1-mesa-glx (>= 7.7.1-1)
--- freecad-0.11.3729.orig/debian/freecad.1
-+++ freecad-0.11.3729/debian/freecad.1
-@@ -0,0 +1,73 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH FREECAD 1 "July  25, 2007" freecad "Linux User's Manual"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+freecad \- An extensible Open Source CAx program for Unix/X11
-+.SH SYNOPSIS
-+.B freecad
-+.RI [ options ] " files"
-+.br
-+.B freecadcmd
-+.RI [ options ] " files"
-+.SH DESCRIPTION
-+.B FreeCAD
-+is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features 
-+some key concepts like macro recording, workbenches, ability to run as a 
-+server and dynamically loadable application extensions and it is designed 
-+to be platform independent.
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-+.\" respectively.
-+.SH USAGE
-+\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
-+.SH OPTIONS
-+These programs follow the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of the options supported by \fBfreecad\fR is included below.
-+.SS "Generic options"
-+.TP
-+\fB\-h, \-\-help\fR
-+Show summary of options.
-+.TP
-+\fB\-v, \-\-version\fR
-+Show version of program.
-+.TP
-+\fB\-c, \-\-console\fR
-+Start in console mode.
-+.TP
-+\fB\-\-response\-file\fR \fIarg\fR
-+Can be specified with '@name', too.
-+
-+.SS "Configuration"
-+.TP
-+\fB\-l, \-\-write\-log\fR
-+Write a log file.
-+.TP
-+\fB\-t, \-\-run\-test\fR \fIarg\fR
-+Test level.
-+.TP
-+\fB\-M, \-\-module\-path\fR \fIarg\fR
-+Additional module path.
-+.TP
-+\fB\-P, \-\-python\-path\fR \fIarg\fR
-+Additional Python path.
-+.SH SEE ALSO
-+To get more information about \fBFreeCAD\fR, please visit \fIhttps://freecadweb.org/wiki\fR
-+.SH BUGS
-+To report a bug, please visit \fIhttps://freecadweb.org/tracker/\fR
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
--- freecad-0.11.3729.orig/debian/rules
-+++ freecad-0.11.3729/debian/rules
-@@ -0,0 +1,109 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete Fem Robot
-+
-+# 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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+configure: autogen.sh
-+	dh_testdir
-+	chmod u+x autogen.sh
-+	./autogen.sh
-+
-+config.status: configure
-+	dh_testdir
-+	./configure --with-occ-include=/usr/include/opencascade \
-+--with-occ-lib=/usr/lib \
-+--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+--prefix=/usr/lib/freecad --mandir=/usr/share/man \
-+--infodir=/usr/share/info --datadir=/usr/share/freecad \
-+--includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \
-+CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-+
-+build: build-stamp
-+
-+build-stamp: config.status
-+	dh_testdir
-+	$(MAKE)
-+	touch $@
-+
-+clean:
-+	dh clean
-+	rm -f build-stamp
-+	find -name '*.pyc' | xargs rm -f
-+	find -name 'moc_*.cpp' | xargs rm -f
-+	find -name '*.lo' | xargs rm -f
-+	find -name '*.deps' | xargs rm -rf
-+	find -name '*.libs' | xargs rm -rf
-+	rm -f stamp-h1 config.log libtool
-+
-+install: build install-stamp
-+install-stamp:
-+	dh_testdir
-+	dh_testroot
-+	dh_prep
-+	dh_installdirs
-+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad
-+	# Remove testing modules we don't want to have in the deb
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/_TEMPLATE_
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/TemplatePyMod
-+	# install the core system
-+	dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/* usr/share/freecad/
-+	#dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
-+	dh_install debian/freecad.desktop usr/share/applications
-+	dh_installman debian/freecad.1
-+	dh_installchangelogs ChangeLog.txt
-+	# install the modules
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so.* usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/*.py usr/lib/freecad/Mod/$(MODULE);)
-+	# special treating of PartDesign module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/PartDesign/Scripts/*.py usr/lib/freecad/Mod/PartDesign/Scripts;)
-+	# special treating of Draft module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.py usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.svg usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.ui usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/draftlibs/*.py usr/lib/freecad/Mod/Draft/draftlibs
-+	# special treating of Test module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test
-+
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.la usr/lib/freecad/lib
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
-+
-+	# install the help system
-+	dh_install -pfreecad-doc debian/tmp/freecad/usr/share/doc/* usr/share/doc/
-+	touch install-stamp
-+
-+override_dh_compress:
-+	dh_compress -X.qch -X.qhc
-+
-+binary-indep: build install
-+	dh binary-indep
-+
-+binary-arch: build install
-+	dh binary-arch
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
--- freecad-0.11.3729.orig/debian/menu
-+++ freecad-0.11.3729/debian/menu
-@@ -0,0 +1,6 @@
-+?package(freecad):needs="X11"\
-+  section="Applications/Science/Engineering"\
-+  title="FreeCAD"\
-+  command="/usr/bin/freecad"\
-+  icon="/usr/share/freecad/freecad.xpm"
-+
--- freecad-0.11.3729.orig/debian/control
-+++ freecad-0.11.3729/debian/control
-@@ -0,0 +1,67 @@
-+Source: freecad
-+Section: science
-+Priority: extra
-+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-+Uploaders: Teemu Ikonen <tpikonen@gmail.com>, "Adam C. Powell, IV" <hazelsct@debian.org>
-+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git
-+Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git
-+Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page
-+Build-Depends: debhelper (>= 7.0.50~), autotools-dev,
-+ libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
-+ libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
-+ libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
-+ libboost-python-dev, python-dev, python-support,
-+ libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev,
-+ libcoin60-dev, libsoqt4-dev (>= 1.4.2~svn20090224), libgl1-mesa-dev,
-+ zlib1g-dev, libxerces-c2-dev, libopencascade-visualization-dev,
-+ libopencascade-foundation-dev, libopencascade-modeling-dev, python-cxx-dev,
-+ libswscale-dev, libzipios++-dev, swig, libeigen2-dev, libeigen3-dev
-+Standards-Version: 3.8.4
-+
-+Package: freecad
-+Architecture: any
-+Section: science
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+Recommends: python-pivy
-+Suggests: freecad-doc
-+Description: An extensible Open Source CAx program (alpha)
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ .
-+ Currently, FreeCAD can import and display CAD models in IGES, STEP, and
-+ BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats.
-+ Editing and modeling features are currently somewhat limited.
-+
-+Package: freecad-dev
-+Architecture: any
-+Section: libdevel
-+Depends: ${shlibs:Depends}, ${misc:Depends}, freecad (= ${binary:Version})
-+Description: FreeCAD development files
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the libtool .la files, headers and symlinks necessary to
-+ develop modules for FreeCAD.
-+
-+Package: freecad-doc
-+Architecture: all
-+Section: doc
-+Depends: ${misc:Depends}, qt4-dev-tools
-+Description: FreeCAD documentation
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the FreeCAD documentation.
-+ .
-+ The documentation is provided in Qt's new help format;
-+ the new help format version can be viewed in conjunction with the Qt Assistant
-+ found in the qt4-dev-tools package.
-+
--- freecad-0.11.3729.orig/debian/freecad.sharedmimeinfo
-+++ freecad-0.11.3729/debian/freecad.sharedmimeinfo
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+	<mime-type type="application/x-extension-fcstd">
-+		<sub-class-of type="application/zip"/>
-+		<comment>FreeCAD document files</comment>
-+		<glob pattern="*.fcstd"/>
-+	</mime-type>
-+</mime-info>
--- freecad-0.11.3729.orig/debian/compat
-+++ freecad-0.11.3729/debian/compat
-@@ -0,0 +1 @@
-+7
--- freecad-0.11.3729.orig/debian/freecad.links
-+++ freecad-0.11.3729/debian/freecad.links
-@@ -0,0 +1,3 @@
-+usr/lib/freecad/bin/FreeCAD usr/bin/freecad
-+usr/lib/freecad/bin/FreeCADCmd usr/bin/freecadcmd
-+usr/share/man/man1/freecad.1.gz usr/share/man/man1/freecadcmd.1.gz
--- freecad-0.11.3729.orig/debian/freecad.desktop
-+++ freecad-0.11.3729/debian/freecad.desktop
-@@ -0,0 +1,19 @@
-+[Desktop Entry]
-+Version=1.0
-+Encoding=UTF-8
-+Name=FreeCAD
-+Name[de]=FreeCAD
-+Comment=Feature based Parametric Modeler
-+Comment[de]=Feature-basierter parametrischer Modellierer
-+GenericName=CAD Application
-+GenericName[de]=CAD-Anwendung
-+Exec=/usr/bin/freecad %F
-+Path=/usr/lib/freecad
-+Terminal=false
-+Type=Application
-+Icon=/usr/share/freecad/freecad.xpm
-+Categories=Graphics;Science;Engineering
-+StartupNotify=true
-+GenericName[de_DE]=Feature-basierter parametrischer Modellierer
-+Comment[de_DE]=Feature-basierter parametrischer Modellierer
-+MimeType=application/x-extension-fcstd
--- freecad-0.11.3729.orig/debian/watch
-+++ freecad-0.11.3729/debian/watch
-@@ -0,0 +1,2 @@
-+version=3
-+http://sf.net/free-cad/freecad_(.+)\.orig\.tar\.gz
--- freecad-0.11.3729.orig/debian/copyright
-+++ freecad-0.11.3729/debian/copyright
-@@ -0,0 +1,237 @@
-+Format-Specification: http://dep.debian.net/deps/dep5/
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+X-Packaged-By: Werner Mayer <wmayer@users.sourceforge.net>
-+X-Packaged-Date: 2006-09-26_16:55:15+02:00
-+Source: http://sourceforge.net/projects/free-cad
-+
-+Files: *
-+Copyright: 2001-2009 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: LGPL-2+
-+ This package is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+ .
-+ This package is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ Lesser General Public License for more details.
-+ .
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this package; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
-+ .
-+ On Debian systems, the complete text of the GNU Lesser General Public
-+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-+
-+Files: src/3rdParty/boost/numeric/bindings/*
-+Copyright: 2002-2008 Kresimir Fresl, Karl Meerbergen, Toon Knapen,
-+ Andreas Kloeckner, Jeremy Conlin, Thomas Klimpel, Fabien Dekeyser,
-+ Quoc-Cuong Pham, Si-Lab b.v.b.a., Joerg Walter
-+License: other-boost-1.0
-+ Boost Software License - Version 1.0 - August 17th, 2003
-+ .
-+ Permission is hereby granted, free of charge, to any person or organization
-+ obtaining a copy of the software and accompanying documentation covered by
-+ this license (the "Software") to use, reproduce, display, distribute,
-+ execute, and transmit the Software, and to prepare derivative works of the
-+ Software, and to permit third-parties to whom the Software is furnished to
-+ do so, all subject to the following:
-+ .
-+ The copyright notices in the Software and this entire statement, including
-+ the above license grant, this restriction and the following disclaimer,
-+ must be included in all copies of the Software, in whole or in part, and
-+ all derivative works of the Software, unless such copies or derivative
-+ works are solely in the form of machine-executable object code generated by
-+ a source language processor.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/boost/numeric/bindings/lapack/lapack.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/std_valarray.hpp
-+Copyright: 2003 Toon Knapen, Kresimir Fresl, Karl Meerbergen
-+License: other
-+ * Permission to copy, modify, use and distribute this software
-+ * for any non-commercial or commercial purpose is granted provided
-+ * that this license appear on all copies of the software source code.
-+ *
-+ * Authors assume no responsibility whatsoever for its use and makes
-+ * no guarantees about its quality, correctness or reliability.
-+ *
-+ * KF acknowledges the support of the Faculty of Civil Engineering,
-+ * University of Zagreb, Croatia.
-+
-+Files: src/Base/Base64.*
-+Copyright: 2004-2008 Rene Nyffenegger <rene.nyffenegger@adp-gmbh.ch>
-+License: other
-+ This source code is provided 'as-is', without any express or implied
-+ warranty. In no event will the author be held liable for any damages
-+ arising from the use of this software.
-+ .
-+ Permission is granted to anyone to use this software for any purpose,
-+ including commercial applications, and to alter it and redistribute it
-+ freely, subject to the following restrictions:
-+ .
-+ 1. The origin of this source code must not be misrepresented; you must not
-+    claim that you wrote the original source code. If you use this source code
-+    in a product, an acknowledgment in the product documentation would be
-+    appreciated but is not required.
-+ .
-+ 2. Altered source versions must be plainly marked as such, and must not be
-+    misrepresented as being the original source code.
-+ .
-+ 3. This notice may not be removed or altered from any source distribution.
-+
-+Files: src/Base/fdstream.hpp
-+Copyright: 2001 Nicolai M. Josuttis
-+License: other
-+ Permission to copy, use, modify, sell and distribute this software
-+ is granted provided this copyright notice appears in all copies.
-+ This software is provided "as is" without express or implied
-+ warranty, and with no claim as to its suitability for any purpose.
-+
-+Files: src/Base/gzstream.*
-+Copyright: 2001 Deepak Bandyopadhyay, Lutz Kettner
-+License: LGPL-2.1+
-+
-+Files: src/Base/PyTools.*
-+Copyright: 1996-2000 Mark Lutz, and O'Reilly and Associates.
-+License: other
-+ Permission to use, copy, modify, and distribute this software
-+ for any purpose and without fee is hereby granted.  This software
-+ is provided on an as is basis, without warranties of any kind.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2004-2009 UnaMesa Association
-+License: BSD
-+ On Debian systems, the complete text of the BSD license
-+ can be found in `/usr/share/common-licenses/BSD'.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2009 John Resig
-+License: GPL-2 or MIT
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 2 can be found in '/usr/share/common-licenses/GPL-2'.
-+
-+License: MIT
-+ Permission is hereby granted, free of charge, to any person obtaining
-+ a copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, sublicense, and/or sell copies of the Software, and to
-+ permit persons to whom the Software is furnished to do so, subject to
-+ the following conditions:
-+ .
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2009 The Dojo Foundation, http://sizzlejs.com/
-+License: GPL-2 or MIT or BSD
-+
-+Files: src/Gui/iisTaskPanel/src/*
-+Copyright: http://www.ii-system.com
-+License: LGPL
-+
-+Files: src/Mod/Draft/*
-+Copyright: Yorik van Havre, Werner Mayer, Martin Burbaum
-+License: GPL-2+
-+
-+Files: src/Mod/Draft/draftlibs/dxf*
-+Copyright: 2005-2008 Ed Blake, Remigiusz Fiedler, Stani Michiels
-+License: GPL-2+
-+
-+Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*,
-+ src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*,
-+ src/Mod/Mesh/App/Core/*
-+Copyright: 2005 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
-+ src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
-+Copyright: 2005 Werner Mayer <werner.wm.mayer@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*
-+Copyright: 2005 Berthold Grupp
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/BuildRegularGeoms.py
-+Copyright: 2005 Berthold Grupp
-+License: LGPL
-+
-+Files: src/Mod/Image/App/ImageBase.*, src/Mod/Image/Gui/GLImageBox.*,
-+ src/Mod/Image/Gui/ImageView.*, src/Mod/Image/Gui/XpmImages.h
-+Copyright: 2004 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/tritritest.h
-+Copyright: 1997 Tomas Moller <tam@cs.lth.se>
-+License: other
-+ tritritest.h has no licensing information, but Tomas Moller replied
-+ the following, when asked about it:
-+ .
-+ The code is free to use for anyone and any projects, but I give no
-+ warranties.
-+
-+Files: src/Mod/Mesh/App/WildMagic4/*
-+Copyright: 1998-2007 David Eberly http://www.geometrictools.com
-+License: LGPL-2.1+
-+
-+Files: src/Mod/Raytracing/App/resources/*
-+Copyright: 2005 Georg Wiora <georg.wiora@quarkbox.de>,
-+ Juergen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Sketcher/App/sketchflat/*
-+Copyright: 2008 Jonathan Westhues
-+License: GPL-3+
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 3 can be found in '/usr/share/common-licenses/GPL-3'.
-+
-+Files: src/Mod/Test/unittestgui.py
-+Copyright: 1999-2001 Steve Purcell
-+License: PSF
-+ This module is free software, and you may redistribute it and/or modify
-+ it under the same terms as Python itself, so long as this copyright message
-+ and disclaimer are retained in their original form.
-+ .
-+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
-+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ DAMAGE.
-+ .
-+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
-+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+
-+Files: src/Mod/Part/MakeBottle.py, src/Tools/*
-+Copyright: 2002-2008 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: GPL-2+
-+
-+Files: src/Tools/generateBase/generateDS.py
-+Copyright: 2003 Dave Kuhlman
-+License: MIT
-+
-+Files: debian/*
-+Copyright: 2007-2009 Werner Mayer <wmayer@users.sourceforge.net>,
-+ Teemu Ikonen <tpikonen@gmail.com>
-+License: LGPL-2+
--- freecad-0.11.3729.orig/debian/source/format
-+++ freecad-0.11.3729/debian/source/format
-@@ -0,0 +1 @@
-+1.0
@@ -1,886 +0,0 @@
--- freecad-0.12.4484.orig/debian/changelog
-+++ freecad-0.12.4484/debian/changelog
-@@ -0,0 +1,272 @@
-+freecad (0.12.4484-1natty1) natty; urgency=low
-+
-+  * New release for Ubuntu 11.04 (natty)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 11 May 2011 22:55:03 +0200
-+
-+freecad (0.11.3729.dfsg-2) unstable; urgency=low
-+
-+  * Add gfortran and libopencascade-visualization-dev to BD
-+    to fix FTBFS (closes: #622694)
-+  * Add libqtwebkit-dev to BD (closes: #618241)
-+  * Delete quilt from BD and corresponding changes in rules.
-+  * Add description to freecad-occ650.patch
-+  * Delete encoding string from .desktop
-+  * Fix some spelling errors, pointed out by lintian.  
-+
-+ -- Anton Gladky <gladky.anton@gmail.com>  Thu, 14 Apr 2011 10:23:25 +0100
-+
-+freecad (0.11.3729.dfsg-1) unstable; urgency=low
-+
-+  [ Denis Barbier ]
-+  * Merge OpenCASCADE 6.5.0 compatibility patch (closes: #617545).
-+
-+  [ Adam C. Powell, IV ]
-+  * New upstream (closes: #622213, #618241).
-+  * Changed to source format 3.0 (quilt).
-+  * Added patch target which forces autotools to run, and automake and autoconf
-+    are now in Build-Depends (closes: #607181).
-+  * Set aside src/Build/Version.h to prevent build problems.
-+  * Does not install .la files (closes: #621298).
-+  * Boost 1.46 compatibility patch (closes: #621877).
-+  * Set aside files which autotools modifies so clean works.
-+  * Added libtool to Build-Depends (thanks: PICCA Frédéric-Emmanuel).
-+  * Bumped Standards-Version, no changes needed.
-+
-+ -- "Adam C. Powell, IV" <hazelsct@debian.org>  Tue, 12 Apr 2011 23:40:30 -0400
-+
-+freecad (0.10.3247.dfsg-2ubuntu3) natty; urgency=low
-+
-+  * Fix build failure with ld --as-needed.
-+
-+ -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Dec 2010 01:12:39 +0100
-+
-+freecad (0.10.3247.dfsg-2ubuntu2) natty; urgency=low
-+
-+  * Rebuild with python 2.7 as the python default.
-+
-+ -- Matthias Klose <doko@ubuntu.com>  Thu, 09 Dec 2010 16:46:45 +0000
-+
-+freecad (0.10.3247.dfsg-2ubuntu1) natty; urgency=low
-+
-+  * Merge from debian unstable. Remaining changes:
-+    - build on libqtwebkit-dev for qtwebkit transition
-+
-+ -- Bhavani Shankar <bhavi@ubuntu.com>  Wed, 20 Oct 2010 08:40:53 +0530
-+
-+freecad (0.10.3247.dfsg-2) unstable; urgency=low
-+
-+  * control:
-+    - Update to standars-version 3.9.0.
-+    - Remove libblas-dev, libatlas-dev from build-deps.
-+  * Add debian/shlibs.local file containing the correct binary dep
-+    to libsoqt4-20 (closes: #575239).
-+  * copyright: Add a verbatim copy of Tiddlywiki BSD license. Fixes
-+    the lintian warning copyright-refers-to-deprecated-bsd-license-file.
-+  * Add kFreeBSD portability fixes. Thanks to Petr Salinger
-+    <Petr.Salinger@seznam.cz> for the patch (closes: #592461).
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 18 Aug 2010 19:34:36 +0200
-+
-+freecad (0.10.3247.dfsg-1ubuntu2) maverick; urgency=low
-+
-+  * Rebuild on libqtwebkit-dev for qtwebkit transition
-+
-+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 21 Jul 2010 10:06:31 +0100
-+
-+freecad (0.10.3247.dfsg-1ubuntu1) maverick; urgency=low
-+
-+  * Merge from Debian unstable, remaining changes:
-+    - debian/control: Build-Depends on libqt4-webkit-dev due to
-+      QtWebKit is no longer part of libqt4-dev (LP: #604078)
-+
-+ -- Artur Rona <ari-tczew@tlen.pl>  Sat, 10 Jul 2010 21:06:47 +0200
-+
-+freecad (0.10.3247.dfsg-1) unstable; urgency=low
-+
-+  * New upstream version (closes: #582627)
-+  * Add debian/source/format file with contents "1.0".
-+  * Use freecad.xpm as icon in menu and desktop files.
-+  * copyright: Add licensing information for new files in this release.
-+  * src/Base/Makefile.in, src/Gui/Makefile.in: Do not remove *.tab.c files
-+    in make distclean target.
-+  * control:
-+    - Add build-dep to libeigen2-dev.
-+    - Update to standards-version 3.8.4.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 05 Jul 2010 15:07:49 +0200
-+
-+freecad (0.9.2646.5.dfsg-1ubuntu1) maverick; urgency=low
-+
-+  * Add build-dep on libqt4-webkit-dev to fix FTBFS with Qt 4.7
-+
-+ -- Scott Kitterman <scott@kitterman.com>  Sat, 19 Jun 2010 00:37:12 -0400
-+
-+freecad (0.9.2646.5.dfsg-1) unstable; urgency=low
-+
-+  * Add 'dfsg' extension to upstream version, upstream sources are unchanged.
-+  * Remove libgl1-mesa-dev build-dep, rely on libcoin to pull in GL libraries.
-+  * Change build-dep libatlas-headers to libatlas-dev (closes: #577309).
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Fri, 14 May 2010 17:20:35 +0200
-+
-+freecad (0.9.2646.5-1) unstable; urgency=low
-+
-+  * New upstream version (closes: #561696).
-+  * Added swig to Build-Depends (closes: #563523, #563772).
-+  * Removed python-opencv from Build-Depends and Recommends (closes: #560768).
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Mon, 11 Jan 2010 08:48:33 -0500
-+
-+freecad (0.9.2646.4-1) unstable; urgency=low
-+
-+  * New upstream version (closes: #559849, #559846).
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Fri, 11 Dec 2009 20:21:32 -0500
-+
-+freecad (0.9.2646.3-1) unstable; urgency=low
-+
-+  * New upstream version. Removes TiddlySaver.jar, fixes help problems.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 03 Dec 2009 19:39:27 +0100
-+
-+freecad (0.9.2646-1) unstable; urgency=low
-+
-+  [ Werner Mayer ]
-+  * New upstream release
-+  * In-source copy of PyCXX has been dropped (closes: #547936)
-+  * In-source copy of zipios++ has been dropped (closes: #547941)
-+  * Change build-dependency on python2.5-dev to python-dev
-+  * Add freecad-doc binary package
-+  * Remove Suggestion of a chm viewer, suggest freecad-doc instead
-+
-+  [ Teemu Ikonen ]
-+  * Add override to dh_compress
-+  * Add versioned build-deb to debhelper (>= 7.0.50)
-+  * Add build-deps to libzipios++-dev and python-cxx-dev.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 17 Nov 2009 14:22:00 +0100
-+
-+freecad (0.8.2237-2) unstable; urgency=low
-+
-+  * Added libboost-python-dev to Build-Depends (closes: #549738).
-+  * Added myself to uploaders list.
-+  * Bumped Standards-Version.
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu, 12 Nov 2009 12:02:42 -0500
-+
-+freecad (0.8.2237-1) unstable; urgency=low
-+
-+  * New Upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 16 Jul 2009 18:37:41 +0200
-+
-+freecad (0.7.1658-1) UNRELEASED; urgency=low
-+
-+  * New upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 20 Oct 2008 15:35:58 +0200
-+
-+freecad (0.7.1514-1) UNRELEASED; urgency=low
-+
-+  * New upstream version
-+  * Add more stuff to the copyright file
-+  * control: add build-dep to python-central
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 06 Aug 2008 18:25:02 +0200
-+
-+freecad (0.7.1350-1hardy1) UNRELEASED; urgency=low
-+
-+  * Package for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 May 2008 11:11:20 +0200
-+
-+freecad (0.7.1350-1gutsy1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 01:54:39 +0200
-+
-+freecad (0.7.1350-1feisty1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.04 (Feisty Fawn)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 00:09:08 +0200
-+
-+freecad (0.7.1350-1) UNRELEASED; urgency=low
-+
-+  * New upstream release from sf.net
-+  * Import to debian-science repository at git.debian.org
-+  * control:
-+    - Update to standards-version 3.7.3
-+    - Add Vcs-* fields pointing to git.debian.org
-+    - Improve descriptions
-+  * Convert copyright to (pseudo) machine readable format, audit source
-+  * Fix categories in .desktop file
-+  * Change Section to Science/Engineering in .doc-base and menu files
-+  * rules: do not ignore errors on clean target, add dh_desktop call
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 05 Aug 2008 18:58:07 +0200
-+
-+freecad (0.7.1344-1ubuntu2) UNRELEASED; urgency=low
-+
-+  * New package with fixed self-dependency problem
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 15:34:34 +0200
-+
-+freecad (0.7.1344-1ubuntu1) UNRELEASED; urgency=low
-+
-+  * New debian package for Feisty
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 11:04:06 +0200
-+
-+freecad (0.7.1344-1) UNRELEASED; urgency=low
-+
-+  * Write patch file to make builds with OpenCASCADE libs inside but with no
-+    dependency to libopencascade6.2
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 21 May 2008 10:06:07 +0200
-+
-+freecad (0.7.1343-1) UNRELEASED; urgency=low
-+
-+  * Embed required OpenCASCADE libs into this package as long as no official
-+    Debian package is available
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 20 May 2008 00:40:39 +0200
-+
-+freecad (0.7.1342-1) UNRELEASED; urgency=low
-+
-+  * Switch to new versioning scheme of OpenCASCADE packages
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 19 May 2008 23:55:31 +0200
-+
-+freecad (0.7.1316-1) UNRELEASED; urgency=low
-+
-+  * Support of pivy (Python binding for Coin/SoQt)
-+  * Support of PyQt4
-+  * General support of SWIG modules
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 26 Apr 2008 13:51:25 +0200
-+
-+freecad (0.7.1031-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port finished
-+  * Support of Python binding for Qt4
-+  * Support of Python binding for Coin
-+  * Support of entirely in Python written modules
-+  * Added support of model driven architecture for Python binding
-+  * Use boost's signal/slot mechanism to update data
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 04 Jan 2008 13:50:37 +0200
-+
-+freecad (0.7.645-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port started
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 24 Jul 2007 13:04:37 +0200
-+
-+freecad (0.6.472-1) UNRELEASED; urgency=low
-+
-+  * Initial Release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 26 Sep 2006 16:55:15 +0200
-+
--- freecad-0.12.4484.orig/debian/freecad.links
-+++ freecad-0.12.4484/debian/freecad.links
-@@ -0,0 +1,3 @@
-+usr/lib/freecad/bin/FreeCAD usr/bin/freecad
-+usr/lib/freecad/bin/FreeCADCmd usr/bin/freecadcmd
-+usr/share/man/man1/freecad.1.gz usr/share/man/man1/freecadcmd.1.gz
--- freecad-0.12.4484.orig/debian/freecad.sharedmimeinfo
-+++ freecad-0.12.4484/debian/freecad.sharedmimeinfo
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+	<mime-type type="application/x-extension-fcstd">
-+		<sub-class-of type="application/zip"/>
-+		<comment>FreeCAD document files</comment>
-+		<glob pattern="*.fcstd"/>
-+	</mime-type>
-+</mime-info>
--- freecad-0.12.4484.orig/debian/watch
-+++ freecad-0.12.4484/debian/watch
-@@ -0,0 +1,2 @@
-+version=3
-+http://sf.net/free-cad/freecad_(.+)\.orig\.tar\.gz
--- freecad-0.12.4484.orig/debian/shlibs.local
-+++ freecad-0.12.4484/debian/shlibs.local
-@@ -0,0 +1,2 @@
-+libGL 1 libgl1-mesa-glx (>= 7.7.1-1)
-+libSoQt4 20 libsoqt4-20 (>= 1.4.2~svn20090224)
--- freecad-0.12.4484.orig/debian/freecad.1
-+++ freecad-0.12.4484/debian/freecad.1
-@@ -0,0 +1,73 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH FREECAD 1 "July  25, 2007" freecad "Linux User's Manual"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+freecad \- An extensible Open Source CAx program for Unix/X11
-+.SH SYNOPSIS
-+.B freecad
-+.RI [ options ] " files"
-+.br
-+.B freecadcmd
-+.RI [ options ] " files"
-+.SH DESCRIPTION
-+.B FreeCAD
-+is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features 
-+some key concepts like macro recording, workbenches, ability to run as a 
-+server and dynamically loadable application extensions and it is designed 
-+to be platform independent.
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-+.\" respectively.
-+.SH USAGE
-+\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
-+.SH OPTIONS
-+These programs follow the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of the options supported by \fBfreecad\fR is included below.
-+.SS "Generic options"
-+.TP
-+\fB\-h, \-\-help\fR
-+Show summary of options.
-+.TP
-+\fB\-v, \-\-version\fR
-+Show version of program.
-+.TP
-+\fB\-c, \-\-console\fR
-+Start in console mode.
-+.TP
-+\fB\-\-response\-file\fR \fIarg\fR
-+Can be specified with '@name', too.
-+
-+.SS "Configuration"
-+.TP
-+\fB\-l, \-\-write\-log\fR
-+Write a log file.
-+.TP
-+\fB\-t, \-\-run\-test\fR \fIarg\fR
-+Test level.
-+.TP
-+\fB\-M, \-\-module\-path\fR \fIarg\fR
-+Additional module path.
-+.TP
-+\fB\-P, \-\-python\-path\fR \fIarg\fR
-+Additional Python path.
-+.SH SEE ALSO
-+To get more information about \fBFreeCAD\fR, please visit \fIhttps://freecadweb.org/wiki\fR
-+.SH BUGS
-+To report a bug, please visit \fIhttps://freecadweb.org/tracker/\fR
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
--- freecad-0.12.4484.orig/debian/rules
-+++ freecad-0.12.4484/debian/rules
-@@ -0,0 +1,113 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete Fem Robot Import Inspection Arch
-+
-+# 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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+configure: autogen.sh
-+	dh_testdir
-+	chmod u+x autogen.sh
-+	./autogen.sh
-+
-+config.status: configure
-+	dh_testdir
-+	./configure --with-occ-include=/usr/include/opencascade \
-+--with-occ-lib=/usr/lib \
-+--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+--prefix=/usr/lib/freecad --mandir=/usr/share/man \
-+--infodir=/usr/share/info --datadir=/usr/share/freecad \
-+--includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \
-+CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-+
-+build: build-stamp
-+
-+build-stamp: config.status
-+	dh_testdir
-+	$(MAKE)
-+	touch $@
-+
-+clean:
-+	dh clean
-+	rm -f build-stamp
-+	find -name '*.pyc' | xargs rm -f
-+	find -name 'moc_*.cpp' | xargs rm -f
-+	find -name '*.lo' | xargs rm -f
-+	find -name '*.deps' | xargs rm -rf
-+	find -name '*.libs' | xargs rm -rf
-+	rm -f stamp-h1 config.log libtool
-+
-+install: build install-stamp
-+install-stamp:
-+	dh_testdir
-+	dh_testroot
-+	dh_prep
-+	dh_installdirs
-+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad
-+	# Remove testing modules we don't want to have in the deb
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/_TEMPLATE_
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/TemplatePyMod
-+	# install the core system
-+	dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/* usr/share/freecad/
-+	#dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
-+	dh_install debian/freecad.desktop usr/share/applications
-+	dh_installman debian/freecad.1
-+	dh_installchangelogs ChangeLog.txt
-+	# install the modules
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so.* usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/*.py usr/lib/freecad/Mod/$(MODULE);)
-+	# special treating of PartDesign module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/PartDesign/Scripts/*.py usr/lib/freecad/Mod/PartDesign/Scripts;)
-+	# special treating of Draft module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.py usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/draftlibs/*.py usr/lib/freecad/Mod/Draft/draftlibs
-+	# special treating of Test module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test
-+
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
-+
-+	# special treating of Arch module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Arch/*.py usr/lib/freecad/Mod/Arch
-+
-+	# install the help system
-+	dh_install -pfreecad-doc debian/tmp/freecad/usr/share/doc/* usr/share/doc/
-+	touch install-stamp
-+
-+override_dh_compress:
-+	dh_compress -X.qch -X.qhc
-+
-+override_dh_makeshlibs:
-+
-+
-+binary-indep: build install
-+	dh binary-indep
-+
-+binary-arch: build install
-+	dh binary-arch
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
--- freecad-0.12.4484.orig/debian/freecad.desktop
-+++ freecad-0.12.4484/debian/freecad.desktop
-@@ -0,0 +1,18 @@
-+[Desktop Entry]
-+Version=1.0
-+Name=FreeCAD
-+Name[de]=FreeCAD
-+Comment=Feature based Parametric Modeler
-+Comment[de]=Feature-basierter parametrischer Modellierer
-+GenericName=CAD Application
-+GenericName[de]=CAD-Anwendung
-+Exec=/usr/bin/freecad %F
-+Path=/usr/lib/freecad
-+Terminal=false
-+Type=Application
-+Icon=/usr/share/freecad/freecad.xpm
-+Categories=Graphics;Science;Engineering
-+StartupNotify=true
-+GenericName[de_DE]=Feature-basierter parametrischer Modellierer
-+Comment[de_DE]=Feature-basierter parametrischer Modellierer
-+MimeType=application/x-extension-fcstd
--- freecad-0.12.4484.orig/debian/menu
-+++ freecad-0.12.4484/debian/menu
-@@ -0,0 +1,6 @@
-+?package(freecad):needs="X11"\
-+  section="Applications/Science/Engineering"\
-+  title="FreeCAD"\
-+  command="/usr/bin/freecad"\
-+  icon="/usr/share/freecad/freecad.xpm"
-+
--- freecad-0.12.4484.orig/debian/copyright
-+++ freecad-0.12.4484/debian/copyright
-@@ -0,0 +1,275 @@
-+Format-Specification: http://dep.debian.net/deps/dep5/
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+X-Packaged-By: Werner Mayer <wmayer@users.sourceforge.net>
-+X-Packaged-Date: 2006-09-26_16:55:15+02:00
-+Source: http://sourceforge.net/projects/free-cad
-+
-+Files: *
-+Copyright: 2001-2009 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: LGPL-2+
-+ This package is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+ .
-+ This package is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ Lesser General Public License for more details.
-+ .
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this package; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
-+ .
-+ On Debian systems, the complete text of the GNU Lesser General Public
-+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-+
-+Files: src/3rdParty/boost/numeric/bindings/*
-+Copyright: 2002-2008 Kresimir Fresl, Karl Meerbergen, Toon Knapen,
-+ Andreas Kloeckner, Jeremy Conlin, Thomas Klimpel, Fabien Dekeyser,
-+ Quoc-Cuong Pham, Si-Lab b.v.b.a., Joerg Walter
-+License: other-boost-1.0
-+ Boost Software License - Version 1.0 - August 17th, 2003
-+ .
-+ Permission is hereby granted, free of charge, to any person or organization
-+ obtaining a copy of the software and accompanying documentation covered by
-+ this license (the "Software") to use, reproduce, display, distribute,
-+ execute, and transmit the Software, and to prepare derivative works of the
-+ Software, and to permit third-parties to whom the Software is furnished to
-+ do so, all subject to the following:
-+ .
-+ The copyright notices in the Software and this entire statement, including
-+ the above license grant, this restriction and the following disclaimer,
-+ must be included in all copies of the Software, in whole or in part, and
-+ all derivative works of the Software, unless such copies or derivative
-+ works are solely in the form of machine-executable object code generated by
-+ a source language processor.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/boost/numeric/bindings/lapack/lapack.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/std_valarray.hpp
-+Copyright: 2003 Toon Knapen, Kresimir Fresl, Karl Meerbergen
-+License: other
-+ * Permission to copy, modify, use and distribute this software
-+ * for any non-commercial or commercial purpose is granted provided
-+ * that this license appear on all copies of the software source code.
-+ *
-+ * Authors assume no responsibility whatsoever for its use and makes
-+ * no guarantees about its quality, correctness or reliability.
-+ *
-+ * KF acknowledges the support of the Faculty of Civil Engineering,
-+ * University of Zagreb, Croatia.
-+
-+Files: src/Base/Base64.*
-+Copyright: 2004-2008 Rene Nyffenegger <rene.nyffenegger@adp-gmbh.ch>
-+License: other
-+ This source code is provided 'as-is', without any express or implied
-+ warranty. In no event will the author be held liable for any damages
-+ arising from the use of this software.
-+ .
-+ Permission is granted to anyone to use this software for any purpose,
-+ including commercial applications, and to alter it and redistribute it
-+ freely, subject to the following restrictions:
-+ .
-+ 1. The origin of this source code must not be misrepresented; you must not
-+    claim that you wrote the original source code. If you use this source code
-+    in a product, an acknowledgment in the product documentation would be
-+    appreciated but is not required.
-+ .
-+ 2. Altered source versions must be plainly marked as such, and must not be
-+    misrepresented as being the original source code.
-+ .
-+ 3. This notice may not be removed or altered from any source distribution.
-+
-+Files: src/Base/fdstream.hpp
-+Copyright: 2001 Nicolai M. Josuttis
-+License: other
-+ Permission to copy, use, modify, sell and distribute this software
-+ is granted provided this copyright notice appears in all copies.
-+ This software is provided "as is" without express or implied
-+ warranty, and with no claim as to its suitability for any purpose.
-+
-+Files: src/Base/gzstream.*
-+Copyright: 2001 Deepak Bandyopadhyay, Lutz Kettner
-+License: LGPL-2.1+
-+
-+Files: src/Base/PyTools.*
-+Copyright: 1996-2000 Mark Lutz, and O'Reilly and Associates.
-+License: other
-+ Permission to use, copy, modify, and distribute this software
-+ for any purpose and without fee is hereby granted.  This software
-+ is provided on an as is basis, without warranties of any kind.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2004-2009 UnaMesa Association
-+License: BSD
-+ Copyright (c) UnaMesa Association 2004-2009
-+ .
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions are
-+ met:
-+ .
-+ Redistributions of source code must retain the above copyright notice,
-+ this list of conditions and the following disclaimer.
-+ .
-+ Redistributions in binary form must reproduce the above copyright notice,
-+ this list of conditions and the following disclaimer in the documentation
-+ and/or other materials provided with the distribution.
-+ .
-+ Neither the name of the UnaMesa Association nor the names of its
-+ contributors may be used to endorse or promote products derived from this
-+ software without specific prior written permission.
-+ .
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS
-+ IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2009 John Resig
-+License: GPL-2 or MIT
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 2 can be found in '/usr/share/common-licenses/GPL-2'.
-+
-+License: MIT
-+ Permission is hereby granted, free of charge, to any person obtaining
-+ a copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, sublicense, and/or sell copies of the Software, and to
-+ permit persons to whom the Software is furnished to do so, subject to
-+ the following conditions:
-+ .
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Files: src/Doc/Start_Page.html
-+Copyright: 2009 The Dojo Foundation, http://sizzlejs.com/
-+License: GPL-2 or MIT or BSD
-+
-+Files: src/Gui/iisTaskPanel/src/*
-+Copyright: http://www.ii-system.com
-+License: LGPL
-+
-+Files: src/Mod/Draft/*
-+Copyright: Yorik van Havre, Werner Mayer, Martin Burbaum
-+License: GPL-2+
-+
-+Files: src/Mod/Draft/draftlibs/dxf*
-+Copyright: 2005-2008 Ed Blake, Remigiusz Fiedler, Stani Michiels
-+License: GPL-2+
-+
-+Files: src/Mod/Draft/WorkingPlane.py
-+Copyright: 2009-2010 Ken Cline <cline@frii.com>
-+License: GPL-2+
-+
-+Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*,
-+ src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*,
-+ src/Mod/Mesh/App/Core/*
-+Copyright: 2005 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
-+ src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
-+Copyright: 2005 Werner Mayer <werner.wm.mayer@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*
-+Copyright: 2005 Berthold Grupp
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/BuildRegularGeoms.py
-+Copyright: 2005 Berthold Grupp
-+License: LGPL
-+
-+Files: src/Mod/Image/App/ImageBase.*, src/Mod/Image/Gui/GLImageBox.*,
-+ src/Mod/Image/Gui/ImageView.*, src/Mod/Image/Gui/XpmImages.h
-+Copyright: 2004 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/tritritest.h
-+Copyright: 1997 Tomas Moller <tam@cs.lth.se>
-+License: other
-+ tritritest.h has no licensing information, but Tomas Moller replied
-+ the following, when asked about it:
-+ .
-+ The code is free to use for anyone and any projects, but I give no
-+ warranties.
-+
-+Files: src/Mod/Mesh/App/WildMagic4/*
-+Copyright: 1998-2007 David Eberly http://www.geometrictools.com
-+License: LGPL-2.1+
-+
-+Files: src/Mod/Part/App/edgecluster.*
-+Copyright: 2010 Joachim Zettler <Joachim.Zettler@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Raytracing/App/resources/*
-+Copyright: 2005 Georg Wiora <georg.wiora@quarkbox.de>,
-+ Juergen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Sketcher/App/sketchflat/*
-+Copyright: 2008 Jonathan Westhues
-+License: GPL-3+
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 3 can be found in '/usr/share/common-licenses/GPL-3'.
-+
-+Files: src/Mod/Sketcher/App/sketchsolve_cp/*
-+Copyright: 2009 Jonathan George
-+License: BSD
-+
-+Files: src/Mod/Test/unittestgui.py
-+Copyright: 1999-2001 Steve Purcell
-+License: PSF
-+ This module is free software, and you may redistribute it and/or modify
-+ it under the same terms as Python itself, so long as this copyright message
-+ and disclaimer are retained in their original form.
-+ .
-+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
-+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ DAMAGE.
-+ .
-+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
-+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+
-+Files: src/Mod/Part/MakeBottle.py, src/Tools/*
-+Copyright: 2002-2008 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: GPL-2+
-+
-+Files: src/Tools/generateBase/generateDS.py
-+Copyright: 2003 Dave Kuhlman
-+License: MIT
-+
-+Files: debian/*
-+Copyright: 2007-2009 Werner Mayer <wmayer@users.sourceforge.net>,
-+ Teemu Ikonen <tpikonen@gmail.com>
-+License: LGPL-2+
--- freecad-0.12.4484.orig/debian/compat
-+++ freecad-0.12.4484/debian/compat
-@@ -0,0 +1 @@
-+7
--- freecad-0.12.4484.orig/debian/control
-+++ freecad-0.12.4484/debian/control
-@@ -0,0 +1,67 @@
-+Source: freecad
-+Section: science
-+Priority: extra
-+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-+Uploaders: Teemu Ikonen <tpikonen@gmail.com>, "Adam C. Powell, IV" <hazelsct@debian.org>, Anton Gladky <gladky.anton@gmail.com>
-+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git
-+Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git
-+Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page
-+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libtool, automake, 
-+ autoconf, libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
-+ libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
-+ libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
-+ libboost-python-dev, python-dev, python-support,
-+ libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev,
-+ libcoin60-dev, libsoqt4-dev (>= 1.4.2~svn20090224), libeigen2-dev, libeigen3-dev, libgl1-mesa-dev,
-+ zlib1g-dev, libxerces-c2-dev, libopencascade-foundation-dev,
-+ libopencascade-modeling-dev, libopencascade-ocaf-dev, 
-+ libopencascade-visualization-dev, python-cxx-dev, libswscale-dev, 
-+ libzipios++-dev, swig, gfortran, libqtwebkit-dev
-+Standards-Version: 3.9.1
-+
-+Package: freecad
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+Recommends: python-pivy
-+Suggests: freecad-doc
-+Description: Extensible Open Source CAx program (alpha)
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ .
-+ Currently, FreeCAD can import and display CAD models in IGES, STEP, and
-+ BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats.
-+ Editing and modeling features are currently somewhat limited.
-+
-+Package: freecad-dev
-+Architecture: any
-+Section: libdevel
-+Depends: ${shlibs:Depends}, ${misc:Depends}, freecad (= ${binary:Version})
-+Description: FreeCAD development files
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains headers and symlinks necessary to
-+ develop modules for FreeCAD.
-+
-+Package: freecad-doc
-+Architecture: all
-+Section: doc
-+Depends: ${misc:Depends}, qt4-dev-tools
-+Description: FreeCAD documentation
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the FreeCAD documentation.
-+ .
-+ The documentation is provided in Qt's new help format;
-+ the new help format version can be viewed in conjunction with the Qt Assistant
-+ found in the qt4-dev-tools package.
-+
--- freecad-0.12.4484.orig/debian/source/lintian-overrides
-+++ freecad-0.12.4484/debian/source/lintian-overrides
-@@ -0,0 +1,3 @@
-+# Lintian thinks uploader Adam Powell's name violates policy
-+freecad source: uploader-address-missing "Adam C. Powell
-+freecad source: uploader-not-full-name IV"
--- freecad-0.12.4484.orig/debian/source/format
-+++ freecad-0.12.4484/debian/source/format
-@@ -0,0 +1 @@
-+1.0
@@ -1,682 +0,0 @@
--- freecad-0.9.2646.orig/debian/compat
-+++ freecad-0.9.2646/debian/compat
-@@ -0,0 +1 @@
-+7
--- freecad-0.9.2646.orig/debian/control
-+++ freecad-0.9.2646/debian/control
-@@ -0,0 +1,67 @@
-+Source: freecad
-+Section: science
-+Priority: extra
-+Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.debian.org>
-+Uploaders: Teemu Ikonen <tpikonen@gmail.com>, "Adam C. Powell, IV" <hazelsct@debian.org>
-+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/freecad.git
-+Vcs-Git: git://git.debian.org/git/debian-science/packages/freecad.git
-+Homepage: http://juergen-riegel.net/FreeCAD/Docu/index.php?title=Main_Page
-+Build-Depends: debhelper (>= 7.0.50~), autotools-dev,
-+ libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
-+ libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
-+ libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
-+ libboost-python-dev, python-dev, python-opencv, python-support,
-+ libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev,
-+ libcoin60-dev, libsoqt4-dev (>= 1.4.2~svn20090224), libgl1-mesa-dev,
-+ libgts-bin, libgts-dev, libcv-dev, zlib1g-dev, libxerces-c2-dev,
-+ libopencascade-foundation-dev, libopencascade-modeling-dev, python-cxx-dev,
-+ libswscale-dev, libblas-dev, libatlas-headers, libzipios++-dev
-+Standards-Version: 3.8.3
-+
-+Package: freecad
-+Architecture: any
-+Section: science
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+Recommends: python-pivy
-+Suggests: freecad-doc, python-opencv
-+Description: An extensible Open Source CAx program (alpha)
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ .
-+ Currently, FreeCAD can import and display CAD models in IGES, STEP, and
-+ BRep formats and meshes in STL, BMS, AST and Wavefront OBJ formats.
-+ Editing and modeling features are currently somewhat limited.
-+
-+Package: freecad-dev
-+Architecture: any
-+Section: libdevel
-+Depends: ${shlibs:Depends}, ${misc:Depends}, freecad (= ${binary:Version})
-+Description: FreeCAD development files
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the libtool .la files, headers and symlinks necessary to
-+ develop modules for FreeCAD.
-+
-+Package: freecad-doc
-+Architecture: all
-+Section: doc
-+Depends: ${misc:Depends}, qt4-dev-tools
-+Description: FreeCAD documentation
-+ FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
-+ It features some key concepts like macro recording, workbenches, ability
-+ to run as a server and dynamically loadable application extensions and
-+ it is designed to be platform independent.
-+ For more details see http://sourceforge.net/projects/free-cad
-+ .
-+ This package contains the FreeCAD documentation.
-+ .
-+ The documentation is provided in Qt's new help format;
-+ the new help format version can be viewed in conjunction with the Qt Assistant
-+ found in the qt4-dev-tools package.
-+
--- freecad-0.9.2646.orig/debian/rules
-+++ freecad-0.9.2646/debian/rules
-@@ -0,0 +1,109 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete
-+
-+# 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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+configure: autogen.sh
-+	dh_testdir
-+	chmod u+x autogen.sh
-+	./autogen.sh
-+
-+config.status: configure
-+	dh_testdir
-+	./configure --with-occ-include=/usr/include/opencascade \
-+--with-occ-lib=/usr/lib \
-+--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+--prefix=/usr/lib/freecad --mandir=/usr/share/man \
-+--infodir=/usr/share/info --datadir=/usr/share/freecad \
-+--includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad \
-+CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-+
-+build: build-stamp
-+
-+build-stamp: config.status
-+	dh_testdir
-+	$(MAKE)
-+	touch $@
-+
-+clean:
-+	dh clean
-+	rm -f build-stamp
-+	find -name '*.pyc' | xargs rm -f
-+	find -name 'moc_*.cpp' | xargs rm -f
-+	find -name '*.lo' | xargs rm -f
-+	find -name '*.deps' | xargs rm -rf
-+	find -name '*.libs' | xargs rm -rf
-+	rm -f stamp-h1 config.log libtool
-+
-+install: build install-stamp
-+install-stamp:
-+	dh_testdir
-+	dh_testroot
-+	dh_prep
-+	dh_installdirs
-+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad
-+	# Remove testing modules we don't want to have in the deb
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/_TEMPLATE_
-+	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/TemplatePyMod
-+	# install the core system
-+	dh_install -pfreecad debian/tmp/freecad/usr/share/freecad/* usr/share/freecad/
-+	#dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/share usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/bin usr/lib/freecad
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
-+	dh_install debian/freecad.desktop usr/share/applications
-+	dh_installman debian/freecad.1
-+	dh_installchangelogs ChangeLog.txt
-+	# install the modules
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so.* usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/*.py usr/lib/freecad/Mod/$(MODULE);)
-+	# special treating of Draft module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.py usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.svg usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/*.ui usr/lib/freecad/Mod/Draft
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Draft/draftlibs/*.py usr/lib/freecad/Mod/Draft/draftlibs
-+	# special treating of Test module
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test
-+	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test
-+
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.la usr/lib/freecad/lib
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib
-+	$(foreach MODULE,$(MODULES), \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \
-+	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
-+
-+	# install the help system
-+	dh_install -pfreecad-doc debian/tmp/freecad/usr/share/doc/* usr/share/doc/
-+	touch install-stamp
-+
-+override_dh_compress:
-+	dh_compress -X.qch -X.qhc
-+
-+binary-indep: build install
-+	dh binary-indep
-+
-+binary-arch: build install
-+	dh binary-arch
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
--- freecad-0.9.2646.orig/debian/copyright
-+++ freecad-0.9.2646/debian/copyright
-@@ -0,0 +1,221 @@
-+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-+Upstream-Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+Packaged-By: Werner Mayer <wmayer@users.sourceforge.net>
-+Packaged-Date: 2006-09-26_16:55:15+02:00
-+Original-Source-Location: http://sourceforge.net/projects/free-cad
-+
-+Files: *
-+Copyright: 2001-2009 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: LGPL-2+
-+ This package is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+ .
-+ This package is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ Lesser General Public License for more details.
-+ .
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with this package; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
-+ .
-+ On Debian systems, the complete text of the GNU Lesser General Public 
-+ License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-+
-+Files: src/3rdParty/boost/numeric/bindings/*
-+Copyright: 2002-2008 Kresimir Fresl, Karl Meerbergen, Toon Knapen,
-+ Andreas Kloeckner, Jeremy Conlin, Thomas Klimpel, Fabien Dekeyser,
-+ Quoc-Cuong Pham, Si-Lab b.v.b.a., Joerg Walter
-+License: other-boost-1.0
-+ Boost Software License - Version 1.0 - August 17th, 2003
-+ .
-+ Permission is hereby granted, free of charge, to any person or organization
-+ obtaining a copy of the software and accompanying documentation covered by
-+ this license (the "Software") to use, reproduce, display, distribute,
-+ execute, and transmit the Software, and to prepare derivative works of the
-+ Software, and to permit third-parties to whom the Software is furnished to
-+ do so, all subject to the following:
-+ .
-+ The copyright notices in the Software and this entire statement, including
-+ the above license grant, this restriction and the following disclaimer,
-+ must be included in all copies of the Software, in whole or in part, and
-+ all derivative works of the Software, unless such copies or derivative
-+ works are solely in the form of machine-executable object code generated by
-+ a source language processor.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ DEALINGS IN THE SOFTWARE.
-+
-+Files: src/3rdParty/boost/numeric/bindings/lapack/lapack.hpp,
-+ src/3rdParty/boost/numeric/bindings/traits/std_valarray.hpp
-+Copyright: 2003 Toon Knapen, Kresimir Fresl, Karl Meerbergen
-+License: other
-+ * Permission to copy, modify, use and distribute this software
-+ * for any non-commercial or commercial purpose is granted provided
-+ * that this license appear on all copies of the software source code.
-+ *
-+ * Authors assume no responsibility whatsoever for its use and makes
-+ * no guarantees about its quality, correctness or reliability.
-+ *
-+ * KF acknowledges the support of the Faculty of Civil Engineering,
-+ * University of Zagreb, Croatia.
-+
-+Files: src/Base/Base64.*
-+Copyright: 2004-2008 Rene Nyffenegger <rene.nyffenegger@adp-gmbh.ch>
-+License: other
-+ This source code is provided 'as-is', without any express or implied
-+ warranty. In no event will the author be held liable for any damages
-+ arising from the use of this software.
-+ .
-+ Permission is granted to anyone to use this software for any purpose,
-+ including commercial applications, and to alter it and redistribute it
-+ freely, subject to the following restrictions:
-+ .
-+ 1. The origin of this source code must not be misrepresented; you must not
-+    claim that you wrote the original source code. If you use this source code
-+    in a product, an acknowledgment in the product documentation would be
-+    appreciated but is not required.
-+ .
-+ 2. Altered source versions must be plainly marked as such, and must not be
-+    misrepresented as being the original source code.
-+ .
-+ 3. This notice may not be removed or altered from any source distribution.
-+
-+Files: src/Base/fdstream.hpp
-+Copyright: 2001 Nicolai M. Josuttis
-+License: other
-+ Permission to copy, use, modify, sell and distribute this software
-+ is granted provided this copyright notice appears in all copies.
-+ This software is provided "as is" without express or implied
-+ warranty, and with no claim as to its suitability for any purpose.
-+
-+Files: src/Base/gzstream.*
-+Copyright: 2001 Deepak Bandyopadhyay, Lutz Kettner
-+License: LGPL-2.1+
-+
-+Files: src/Base/PyTools.*
-+Copyright: 1996-2000 Mark Lutz, and O'Reilly and Associates.
-+License: other
-+ Permission to use, copy, modify, and distribute this software
-+ for any purpose and without fee is hereby granted.  This software
-+ is provided on an as is basis, without warranties of any kind.
-+
-+Files: src/Gui/iisTaskPanel/src/*
-+Copyright: http://www.ii-system.com
-+License: LGPL
-+
-+Files: src/Mod/Draft/*
-+Copyright: Yorik van Havre, Werner Mayer, Martin Burbaum
-+License: GPL-2+
-+
-+Files: src/Mod/Draft/draftlibs/dxf*
-+Copyright: 2005-2008 Ed Blake, Remigiusz Fiedler, Stani Michiels
-+License: GPL-2+
-+
-+Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*,
-+ src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*,
-+ src/Mod/Mesh/App/Core/*
-+Copyright: 2005 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
-+ src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
-+Copyright: 2005 Werner Mayer <werner.wm.mayer@gmx.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*
-+Copyright: 2005 Berthold Grupp
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/BuildRegularGeoms.py
-+Copyright: 2005 Berthold Grupp
-+License: LGPL
-+
-+Files: src/Mod/Image/App/ImageBase.*, src/Mod/Image/Gui/GLImageBox.*,
-+ src/Mod/Image/Gui/ImageView.*, src/Mod/Image/Gui/XpmImages.h
-+Copyright: 2004 Imetric 3D GmbH
-+License: LGPL-2+
-+
-+Files: src/Mod/Mesh/App/Core/tritritest.h
-+Copyright: 1997 Tomas Moller <tam@cs.lth.se>
-+License: other
-+ tritritest.h has no licensing information, but Tomas Moller replied
-+ the following, when asked about it:
-+ .
-+ The code is free to use for anyone and any projects, but I give no
-+ warranties.
-+
-+Files: src/Mod/Mesh/App/WildMagic4/*
-+Copyright: 1998-2007 David Eberly http://www.geometrictools.com
-+License: LGPL-2.1+
-+
-+Files: src/Mod/Raytracing/App/resources/*
-+Copyright: 2005 Georg Wiora <georg.wiora@quarkbox.de>,
-+ Juergen Riegel <juergen.riegel@web.de>
-+License: LGPL-2+
-+
-+Files: src/Mod/Sketcher/App/sketchflat/*
-+Copyright: 2008 Jonathan Westhues
-+License: GPL-3+
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 3 can be found in '/usr/share/common-licenses/GPL-3'.
-+
-+Files: src/Mod/Test/unittestgui.py
-+Copyright: 1999-2001 Steve Purcell
-+License: PSF
-+ This module is free software, and you may redistribute it and/or modify
-+ it under the same terms as Python itself, so long as this copyright message
-+ and disclaimer are retained in their original form.
-+ .
-+ IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
-+ SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
-+ THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-+ DAMAGE.
-+ .
-+ THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-+ PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
-+ AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
-+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-+
-+Files: src/Mod/Part/MakeBottle.py, src/Tools/*
-+Copyright: 2002-2008 Jürgen Riegel <juergen.riegel@web.de>,
-+ Werner Mayer <wmayer@users.sourceforge.net>
-+License: GPL-2+
-+ On Debian systems, the complete text of the GNU General Public License
-+ version 2 can be found in '/usr/share/common-licenses/GPL-2'.
-+
-+Files: src/Tools/generateBase/generateDS.py
-+Copyright: 2003 Dave Kuhlman
-+License: MIT
-+ Permission is hereby granted, free of charge, to any person obtaining
-+ a copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, sublicense, and/or sell copies of the Software, and to
-+ permit persons to whom the Software is furnished to do so, subject to
-+ the following conditions:
-+ .
-+ The above copyright notice and this permission notice shall be
-+ included in all copies or substantial portions of the Software.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Files: debian/*
-+Copyright: 2007-2009 Werner Mayer <wmayer@users.sourceforge.net>,
-+ Teemu Ikonen <tpikonen@gmail.com>
-+License: LGPL-2+
--- freecad-0.9.2646.orig/debian/freecad.sharedmimeinfo
-+++ freecad-0.9.2646/debian/freecad.sharedmimeinfo
-@@ -0,0 +1,8 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-+	<mime-type type="application/x-extension-fcstd">
-+		<sub-class-of type="application/zip"/>
-+		<comment>FreeCAD document files</comment>
-+		<glob pattern="*.fcstd"/>
-+	</mime-type>
-+</mime-info>
--- freecad-0.9.2646.orig/debian/freecad.desktop
-+++ freecad-0.9.2646/debian/freecad.desktop
-@@ -0,0 +1,19 @@
-+[Desktop Entry]
-+Version=1.0
-+Encoding=UTF-8
-+Name=FreeCAD
-+Name[de]=FreeCAD
-+Comment=Feature based Parametric Modeler
-+Comment[de]=Feature-basierter parametrischer Modellierer
-+GenericName=CAD Application
-+GenericName[de]=CAD-Anwendung
-+Exec=/usr/bin/freecad %F
-+Path=/usr/lib/freecad
-+Terminal=false
-+Type=Application
-+Icon=/usr/share/freecad/FCIcon.xpm
-+Categories=Graphics;Science;Engineering
-+StartupNotify=true
-+GenericName[de_DE]=Feature-basierter parametrischer Modellierer
-+Comment[de_DE]=Feature-basierter parametrischer Modellierer
-+MimeType=application/x-extension-fcstd
--- freecad-0.9.2646.orig/debian/freecad.1
-+++ freecad-0.9.2646/debian/freecad.1
-@@ -0,0 +1,73 @@
-+.\"                                      Hey, EMACS: -*- nroff -*-
-+.\" First parameter, NAME, should be all caps
-+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-+.\" other parameters are allowed: see man(7), man(1)
-+.TH FREECAD 1 "July  25, 2007" freecad "Linux User's Manual"
-+.\" Please adjust this date whenever revising the manpage.
-+.\"
-+.\" Some roff macros, for reference:
-+.\" .nh        disable hyphenation
-+.\" .hy        enable hyphenation
-+.\" .ad l      left justify
-+.\" .ad b      justify to both left and right margins
-+.\" .nf        disable filling
-+.\" .fi        enable filling
-+.\" .br        insert line break
-+.\" .sp <n>    insert n+1 empty lines
-+.\" for manpage-specific macros, see man(7)
-+.SH NAME
-+freecad \- An extensible Open Source CAx program for Unix/X11
-+.SH SYNOPSIS
-+.B freecad
-+.RI [ options ] " files"
-+.br
-+.B freecadcmd
-+.RI [ options ] " files"
-+.SH DESCRIPTION
-+.B FreeCAD
-+is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features 
-+some key concepts like macro recording, workbenches, ability to run as a 
-+server and dynamically loadable application extensions and it is designed 
-+to be platform independent.
-+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-+.\" respectively.
-+.SH USAGE
-+\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
-+.SH OPTIONS
-+These programs follow the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of the options supported by \fBfreecad\fR is included below.
-+.SS "Generic options"
-+.TP
-+\fB\-h, \-\-help\fR
-+Show summary of options.
-+.TP
-+\fB\-v, \-\-version\fR
-+Show version of program.
-+.TP
-+\fB\-c, \-\-console\fR
-+Start in console mode.
-+.TP
-+\fB\-\-response\-file\fR \fIarg\fR
-+Can be specified with '@name', too.
-+
-+.SS "Configuration"
-+.TP
-+\fB\-l, \-\-write\-log\fR
-+Write a log file.
-+.TP
-+\fB\-t, \-\-run\-test\fR \fIarg\fR
-+Test level.
-+.TP
-+\fB\-M, \-\-module\-path\fR \fIarg\fR
-+Additional module path.
-+.TP
-+\fB\-P, \-\-python\-path\fR \fIarg\fR
-+Additional Python path.
-+.SH SEE ALSO
-+To get more information about \fBFreeCAD\fR, please visit \fIhttps://freecadweb.org/wiki\fR
-+.SH BUGS
-+To report a bug, please visit \fIhttps://freecadweb.org/tracker/\fR
-+.SH AUTHOR
-+This manual page was written by Werner Mayer.
--- freecad-0.9.2646.orig/debian/watch
-+++ freecad-0.9.2646/debian/watch
-@@ -0,0 +1,2 @@
-+version=3
-+http://sf.net/free-cad/freecad_(.+)\.orig\.tar\.gz
--- freecad-0.9.2646.orig/debian/menu
-+++ freecad-0.9.2646/debian/menu
-@@ -0,0 +1,6 @@
-+?package(freecad):needs="X11"\
-+  section="Applications/Science/Engineering"\
-+  title="FreeCAD"\
-+  command="/usr/bin/freecad"\
-+  icon="/usr/share/freecad/FCIcon.xpm"
-+
--- freecad-0.9.2646.orig/debian/freecad.links
-+++ freecad-0.9.2646/debian/freecad.links
-@@ -0,0 +1,3 @@
-+usr/lib/freecad/bin/FreeCAD usr/bin/freecad
-+usr/lib/freecad/bin/FreeCADCmd usr/bin/freecadcmd
-+usr/share/man/man1/freecad.1.gz usr/share/man/man1/freecadcmd.1.gz
--- freecad-0.9.2646.orig/debian/changelog
-+++ freecad-0.9.2646/debian/changelog
-@@ -0,0 +1,140 @@
-+freecad (0.9.2646-1) unstable; urgency=low
-+
-+  [ Werner Mayer ]
-+  * New upstream release
-+  * In-source copy of PyCXX has been dropped (closes: #547936)
-+  * In-source copy of zipios++ has been dropped (closes: #547941)
-+  * Change build-dependency on python2.5-dev to python-dev
-+  * Add freecad-doc binary package
-+  * Remove Suggestion of a chm viewer, suggest freecad-doc instead
-+
-+  [ Teemu Ikonen ]
-+  * Add override to dh_compress
-+  * Add versioned build-deb to debhelper (>= 7.0.50)
-+  * Add build-deps to libzipios++-dev and python-cxx-dev.
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 17 Nov 2009 14:22:00 +0100
-+
-+freecad (0.8.2237-2) unstable; urgency=low
-+
-+  * Added libboost-python-dev to Build-Depends (closes: #549738).
-+  * Added myself to uploaders list.
-+  * Bumped Standards-Version.
-+
-+ -- Adam C. Powell, IV <hazelsct@debian.org>  Thu, 12 Nov 2009 12:02:42 -0500
-+
-+freecad (0.8.2237-1) unstable; urgency=low
-+
-+  * New Upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 16 Jul 2009 18:37:41 +0200
-+
-+freecad (0.7.1658-1) UNRELEASED; urgency=low
-+
-+  * New upstream release
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Mon, 20 Oct 2008 15:35:58 +0200
-+
-+freecad (0.7.1514-1) UNRELEASED; urgency=low
-+
-+  * New upstream version
-+  * Add more stuff to the copyright file
-+  * control: add build-dep to python-central
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Wed, 06 Aug 2008 18:25:02 +0200
-+
-+freecad (0.7.1350-1hardy1) UNRELEASED; urgency=low
-+
-+  * Package for Ubuntu 8.04 (Hardy Heron)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 29 May 2008 11:11:20 +0200
-+
-+freecad (0.7.1350-1gutsy1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.10 (Gutsy Gibbon)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 01:54:39 +0200
-+
-+freecad (0.7.1350-1feisty1) UNRELEASED; urgency=low
-+
-+  * Backport to Ubuntu 7.04 (Feisty Fawn)
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 24 May 2008 00:09:08 +0200
-+
-+freecad (0.7.1350-1) UNRELEASED; urgency=low
-+
-+  * New upstream release from sf.net
-+  * Import to debian-science repository at git.debian.org
-+  * control:
-+    - Update to standards-version 3.7.3
-+    - Add Vcs-* fields pointing to git.debian.org
-+    - Improve descriptions
-+  * Convert copyright to (pseudo) machine readable format, audit source
-+  * Fix categories in .desktop file
-+  * Change Section to Science/Engineering in .doc-base and menu files
-+  * rules: do not ignore errors on clean target, add dh_desktop call
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Tue, 05 Aug 2008 18:58:07 +0200
-+
-+freecad (0.7.1344-1ubuntu2) UNRELEASED; urgency=low
-+
-+  * New package with fixed self-dependency problem
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 15:34:34 +0200
-+
-+freecad (0.7.1344-1ubuntu1) UNRELEASED; urgency=low
-+
-+  * New debian package for Feisty
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Thu, 22 May 2008 11:04:06 +0200
-+
-+freecad (0.7.1344-1) UNRELEASED; urgency=low
-+
-+  * Write patch file to make builds with OpenCASCADE libs inside but with no
-+    dependency to libopencascade6.2
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Wed, 21 May 2008 10:06:07 +0200
-+
-+freecad (0.7.1343-1) UNRELEASED; urgency=low
-+
-+  * Embed required OpenCASCADE libs into this package as long as no official
-+    Debian package is available
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 20 May 2008 00:40:39 +0200
-+
-+freecad (0.7.1342-1) UNRELEASED; urgency=low
-+
-+  * Switch to new versioning scheme of OpenCASCADE packages
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 19 May 2008 23:55:31 +0200
-+
-+freecad (0.7.1316-1) UNRELEASED; urgency=low
-+
-+  * Support of pivy (Python binding for Coin/SoQt)
-+  * Support of PyQt4
-+  * General support of SWIG modules
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sat, 26 Apr 2008 13:51:25 +0200
-+
-+freecad (0.7.1031-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port finished
-+  * Support of Python binding for Qt4
-+  * Support of Python binding for Coin
-+  * Support of entirely in Python written modules
-+  * Added support of model driven architecture for Python binding
-+  * Use boost's signal/slot mechanism to update data
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 04 Jan 2008 13:50:37 +0200
-+
-+freecad (0.7.645-1) UNRELEASED; urgency=low
-+
-+  * Qt4 port started
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 24 Jul 2007 13:04:37 +0200
-+
-+freecad (0.6.472-1) UNRELEASED; urgency=low
-+
-+  * Initial Release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 26 Sep 2006 16:55:15 +0200
-+
@@ -1,207 +0,0 @@
--- pivy-0.3.0.orig/interfaces/soqt.i
-+++ pivy-0.3.0/interfaces/soqt.i
-@@ -78,7 +78,7 @@
- %include pivy_common_typemaps.i
- 
- /* import the pivy main interface file */
-%import coin.i
-+%import(module="pivy") coin.i
- 
- /* typemaps to bridge against PyQt */
- %typemap(out) QEvent * {
--- pivy-0.3.0.orig/debian/changelog
-+++ pivy-0.3.0/debian/changelog
-@@ -0,0 +1,5 @@
-+pivy (0.3.0-1) unstable; urgency=low
-+
-+  * Initial release (Closes: #504617)
-+
-+ -- Teemu Ikonen <tpikonen@gmail.com>  Thu, 13 Nov 2008 15:31:51 +0100
--- pivy-0.3.0.orig/debian/rules
-+++ pivy-0.3.0/debian/rules
-@@ -0,0 +1,62 @@
-+#!/usr/bin/make -f
-+
-+CFLAGS = -Wall -g
-+
-+build: build-stamp
-+build-stamp:
-+	dh_testdir
-+	python setup.py build
-+	touch $@
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp install-stamp
-+	python setup.py clean
-+	dh_clean
-+
-+install: build install-stamp
-+install-stamp:
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+	python setup.py install --no-compile --root debian/python-pivy
-+	#dh install --after dh_installdirs
-+	touch install-stamp
-+
-+binary-indep: build install
-+	#dh binary-indep
-+
-+binary-arch: build install
-+	#dh binary-arch
-+	dh_testdir
-+	dh_testroot
-+	dh_installchangelogs 
-+	dh_installdocs
-+	dh_installexamples
-+#	dh_install
-+#	dh_installmenu
-+#	dh_installdebconf	
-+#	dh_installlogrotate
-+#	dh_installemacsen
-+#	dh_installpam
-+#	dh_installmime
-+#	dh_desktop
-+#	dh_installinit
-+#	dh_installcron
-+#	dh_installinfo
-+	dh_installman
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_pycentral
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+	
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
--- pivy-0.3.0.orig/debian/control
-+++ pivy-0.3.0/debian/control
-@@ -0,0 +1,25 @@
-+Source: pivy
-+Section: python
-+Priority: extra
-+Maintainer: Teemu Ikonen <tpikonen@gmail.com>
-+Build-Depends: debhelper (>= 6), python-support, python-all-dev, 
-+ libsoqt4-dev, libcoin40-dev, libsimage-dev, swig
-+Standards-Version: 3.8.0
-+Homepage: http://pivy.coin3d.org/
-+
-+Package: python-pivy
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+Provides: ${python:Provides}
-+Description: Coin binding for Python
-+ Pivy is a Coin binding for Python. Coin is a high-level 3D graphics library
-+ with a C++ Application Programming Interface. Coin uses scene-graph data
-+ structures to render real-time graphics suitable for mostly all kinds of
-+ scientific and engineering visualization applications.
-+ Pivy allows:
-+ .
-+    * Development of Coin applications and extensions in Python
-+    * Interactive modification of Coin programs from within the
-+      Python interpreter at runtime
-+    * Incorporation of Scripting Nodes into the scene graph which
-+      are capable of executing Python code and callbacks
--- pivy-0.3.0.orig/debian/compat
-+++ pivy-0.3.0/debian/compat
-@@ -0,0 +1 @@
-+6
--- pivy-0.3.0.orig/debian/pyversions
-+++ pivy-0.3.0/debian/pyversions
-@@ -0,0 +1 @@
-+2.4-
--- pivy-0.3.0.orig/debian/pycompat
-+++ pivy-0.3.0/debian/pycompat
-@@ -0,0 +1 @@
-+2
--- pivy-0.3.0.orig/debian/docs
-+++ pivy-0.3.0/debian/docs
-@@ -0,0 +1,6 @@
-+NEWS
-+README
-+HACKING
-+THANKS
-+docs/ruby-inventor.txt
-+
--- pivy-0.3.0.orig/debian/watch
-+++ pivy-0.3.0/debian/watch
-@@ -0,0 +1,10 @@
-+# See uscan(1) for format
-+
-+# Compulsory line, this is a version 3 file
-+version=3
-+
-+# <Webpage URL> <string match>
-+http://pivy.coin3d.org/download/pivy Pivy-(.*)\.tar\.gz
-+
-+# Uncomment to examine a Webserver directory
-+#http://www.example.com/pub/pivy-(.*)\.tar\.gz
--- pivy-0.3.0.orig/debian/copyright
-+++ pivy-0.3.0/debian/copyright
-@@ -0,0 +1,58 @@
-+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-+Upstream-Author: Tamer Fahmy <tamer@tammura.at>
-+Packaged-By: Teemu Ikonen <tpikonen@gmail.com>
-+Original-Source-Location: http://pivy.coin3d.org/download/pivy/releases/0.3.0/Pivy-0.3.0.tar.gz
-+
-+Files: *
-+Copyright: 2002-2005 Tamer Fahmy <tamer@tammura.at>
-+License: BSD-3
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions are
-+ met:
-+  * Redistributions of source code must retain the above copyright
-+    notice, this list of conditions and the following disclaimer.
-+  * Redistributions in binary form must reproduce the above copyright
-+    notice, this list of conditions and the following disclaimer in
-+    the documentation and/or other materials provided with the
-+    distribution.
-+  * Neither the name of the copyright holder nor the names of its
-+    contributors may be used to endorse or promote products derived
-+    from this software without specific prior written permission.
-+ .
-+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+Files: scons/*
-+Copyright: 2001, 2002, 2003, 2004 The SCons Foundation
-+License: other
-+ Permission is hereby granted, free of charge, to any person obtaining
-+ a copy of this software and associated documentation files (the
-+ "Software"), to deal in the Software without restriction, including
-+ without limitation the rights to use, copy, modify, merge, publish,
-+ distribute, sublicense, and/or sell copies of the Software, and to
-+ permit persons to whom the Software is furnished to do so, subject to
-+ the following conditions:
-+ .
-+ The above copyright notice and this permission notice shall be included
-+ in all copies or substantial portions of the Software.
-+ .
-+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Files: debian/*
-+Copyright: 2008 Teemu Ikonen <tpikonen@gmail.com>
-+License: BSD-3
@@ -1,181 +0,0 @@
--- pythonocc-0.2.0.orig/src/environment.py
-+++ pythonocc-0.2.0/src/environment.py
-@@ -68,8 +68,8 @@
-     SWIG_FILES_PATH_MODULAR = os.path.join(os.getcwd(),'SWIG_src_modular_linux_darwin')
-     os.environ['CC'] = 'g++'
-     os.environ['CPP'] = 'g++'
-    OCC_INC = '/usr/local/inc' # Ubuntu 8.04 Hardy default installation path for headers
-    OCC_LIB = '/usr/local/lib' # Ubuntu 8.04 Hardy default installation path for libraries
-+    OCC_INC = '/usr/include/opencascade' # Ubuntu 8.04 Hardy default installation path for headers
-+    OCC_LIB = '/usr/lib' # Ubuntu 8.04 Hardy default installation path for libraries
-     SALOME_GEOM_INC = os.path.join(os.getcwd(),'..','ThirdPart','SalomeGeometry','inc')
-     SALOME_GEOM_LIB = os.path.join(os.getcwd(),'..','ThirdPart','SalomeGeometry','win32','lib')
-     GCC_XML_PATH = '/usr/bin' # Ubuntu 8.04 Hardy installation path for gccxml
--- pythonocc-0.2.0.orig/src/setup.py
-+++ pythonocc-0.2.0/src/setup.py
-@@ -167,19 +167,19 @@
- #
- # OpenCascade libs
- #
-libraries = ['BinLPlugin', 'BinPlugin', 'BinXCAFPlugin', 'FWOSPlugin', 'mscmd', 'PTKernel',\
-+libraries = ['BinLPlugin', 'BinPlugin', 'BinXCAFPlugin', 'FWOSPlugin', 'PTKernel',\
-              'StdLPlugin', 'StdPlugin', 'TKAdvTools', 'TKBin', 'TKBinL', 'TKBinTObj', 'TKBinXCAF',\
-             'TKBO', 'TKBool', 'TKBRep', 'TKCAF', 'TKCDF', 'TKCDLFront', 'TKCPPClient', 'TKCPPExt',\
-             'TKCPPIntExt', 'TKCPPJini', 'TKCSFDBSchema', 'TKDCAF', 'TKDraw', 'TKernel',\
-             'TKFeat', 'TKFillet', 'TKG2d', 'TKG3d', 'TKGeomAlgo', 'TKGeomBase', 'TKHLR', 'TKIDLFront',\
-+             'TKBO', 'TKBool', 'TKBRep', 'TKCAF', 'TKCDF', \
-+             'TKernel',\
-+             'TKFeat', 'TKFillet', 'TKG2d', 'TKG3d', 'TKGeomAlgo', 'TKGeomBase', 'TKHLR',\
-              'TKIGES', 'TKjcas','TKLCAF', 'TKMath', 'TKMesh', 'TKMeshVS', 'TKNIS', 'TKOffset',\
-              'TKOpenGl', 'TKPCAF', 'TKPLCAF', 'TKPrim', 'TKPShape', 'TKService', 'TKShapeSchema',\
-              'TKShHealing', 'TKStdLSchema', 'TKStdSchema', 'TKSTEP', 'TKSTEP209', 'TKSTEPAttr',\
-             'TKSTEPBase', 'TKSTL', 'TKTCPPExt', 'TKTObj', 'TKTObjDRAW', 'TKTopAlgo', 'TKTopTest',\
-             'TKV2d', 'TKV3d', 'TKViewerTest', 'TKVRML', 'TKWOK', 'TKWOKTcl', 'TKXCAF', 'TKXCAFSchema',\
-             'TKXDEDRAW', 'TKXDEIGES', 'TKXDESTEP', 'TKXMesh', 'TKXml', 'TKXmlL', 'TKXmlTObj',\
-             'TKXmlXCAF', 'TKXSBase', 'TKXSDRAW', 'wokcmd', 'wokdeliverysteps', 'wokdfltsteps',\
-             'wokobjssteps', 'wokorbixsteps', 'woksteps', 'woktoolscmd', 'wokutilscmd', 'XCAFPlugin',\
-+             'TKSTEPBase', 'TKSTL', 'TKTObj', 'TKTObjDRAW', 'TKTopAlgo',\
-+             'TKV2d', 'TKV3d', 'TKVRML', 'TKXCAF', 'TKXCAFSchema',\
-+             'TKXDEIGES', 'TKXDESTEP', 'TKXMesh', 'TKXml', 'TKXmlL', 'TKXmlTObj',\
-+             'TKXmlXCAF', 'TKXSBase',\
-+             'XCAFPlugin',\
-              'XmlLPlugin', 'XmlPlugin', 'XmlXCAFPlugin']
- # Find the lib in OCC_LIB path and add it to the LIBS list
- LIBS = []
-@@ -298,4 +298,4 @@
- if GENERATE_SWIG:
-     print "%i exported classes"%SWIG_generator.nb_exported_classes
- final_time = time.time()
-print final_time-init_time
-\ No newline at end of file
-+print final_time-init_time
--- pythonocc-0.2.0.orig/debian/changelog
-+++ pythonocc-0.2.0/debian/changelog
-@@ -0,0 +1,6 @@
-+pythonocc (0.2.0-1) unstable; urgency=low
-+
-+  * Initial release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Tue, 12 Apr 2009 14:20:27 +0100
-+
--- pythonocc-0.2.0.orig/debian/rules
-+++ pythonocc-0.2.0/debian/rules
-@@ -0,0 +1,76 @@
-+#!/usr/bin/make -f
-+
-+CFLAGS = -Wall -g
-+
-+configure:
-+	chmod 755 src/Display/OCCViewer.py
-+	chmod 755 src/Display/wxDisplay.py
-+	chmod 755 src/Display/wxSamplesGui.py
-+	chmod 755 Utils/Image.py
-+	chmod 644 gpl.txt
-+	chmod 644 src/AUTHORS
-+
-+build: build-stamp
-+build-stamp: configure
-+	dh_testdir
-+	cd src && python setup.py build
-+	touch $@
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp install-stamp
-+	cd src && python setup.py clean
-+	dh_clean
-+	rm -rf src/build
-+	rm -rf src/OCC
-+	find -name '*.pyc' | xargs rm -rf
-+	cd src/SWIG_src_modular_linux_darwin && find -name '*_wrap.cpp' | xargs rm -rf
-+	cd src/Misc && find -name '*_wrap.cpp' | xargs rm -rf
-+	cd src/Visualization && find -name '*_wrap.cpp' | xargs rm -rf
-+
-+install: build install-stamp
-+install-stamp:
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+	cd src && python setup.py install --no-compile --root ../debian/python-occ
-+	#dh install --after dh_installdirs
-+	touch install-stamp
-+
-+binary-indep: build install
-+	#dh binary-indep
-+
-+binary-arch: build install
-+	#dh binary-arch
-+	dh_testdir
-+	dh_testroot
-+	dh_installchangelogs 
-+	dh_installdocs
-+	dh_installexamples
-+#	dh_install
-+#	dh_installmenu
-+#	dh_installdebconf	
-+#	dh_installlogrotate
-+#	dh_installemacsen
-+#	dh_installpam
-+#	dh_installmime
-+#	dh_desktop
-+#	dh_installinit
-+#	dh_installcron
-+#	dh_installinfo
-+	dh_installman
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_pycentral
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
--- pythonocc-0.2.0.orig/debian/control
-+++ pythonocc-0.2.0/debian/control
-@@ -0,0 +1,17 @@
-+Source: pythonocc
-+Section: python
-+Priority: extra
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+Build-Depends: debhelper (>= 6), python, python-central, python-support, swig, libopencascade-dev
-+Standards-Version: 3.7.3
-+XS-Python-Version: current
-+Homepage: http://pythonocc.org/
-+
-+Package: python-occ
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+XB-Python-Version: ${python:Versions}
-+Provides: ${python:Provides}
-+Description: Python binding for OpenCASCADE
-+ pythonOCC is Python binding for OpenCASCADE.
-+
--- pythonocc-0.2.0.orig/debian/compat
-+++ pythonocc-0.2.0/debian/compat
-@@ -0,0 +1 @@
-+6
--- pythonocc-0.2.0.orig/debian/pyversions
-+++ pythonocc-0.2.0/debian/pyversions
-@@ -0,0 +1 @@
-+2.4-
--- pythonocc-0.2.0.orig/debian/pycompat
-+++ pythonocc-0.2.0/debian/pycompat
-@@ -0,0 +1 @@
-+2
--- pythonocc-0.2.0.orig/debian/copyright
-+++ pythonocc-0.2.0/debian/copyright
-@@ -0,0 +1,7 @@
-+Files: *
-+Copyright: 2008 Thomas Paviot <thomas.paviot@free.fr> 
-+License: GPL-3
-+ .
-+ On Debian systems, the complete text of the GNU General Public 
-+ License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-+
@@ -1,179 +0,0 @@
--- pythonocc-0.3.0.orig/src/wrapper/environment.py
-+++ pythonocc-0.3.0/src/wrapper/environment.py
-@@ -126,8 +126,8 @@
-         OCC_INC = os.path.join(OCC_ROOT,'inc')
-         OCC_LIB = os.path.join(OCC_ROOT,'lib')
-     else:
-        OCC_INC = '/usr/local/inc' # Ubuntu 8.04 Hardy default installation path for headers
-        OCC_LIB = '/usr/local/lib' # Ubuntu 8.04 Hardy default installation path for libraries
-+        OCC_INC = '/usr/include/opencascade' # Ubuntu 8.04 Hardy default installation path for headers
-+        OCC_LIB = '/usr/lib' # Ubuntu 8.04 Hardy default installation path for libraries
-     SALOME_GEOM_LIB = '/opt/SalomeGeometry/lib'
-     GCC_XML_PATH = '/usr/bin' # Ubuntu 8.04 Hardy installation path for gccxml
-     PYGCCXML_DEFINES = ['HAVE_CONFIG_H','HAVE_LIMITS_H','CSFDB','OCC_CONVERT_SIGNALS','LIN','LININTEL','_GNU_SOURCE=1']
--- pythonocc-0.3.0.orig/src/setup.py
-+++ pythonocc-0.3.0/src/setup.py
-@@ -172,18 +172,18 @@
- #
- # OpenCascade libs
- #
-libraries = ['BinLPlugin', 'BinPlugin', 'BinXCAFPlugin', 'FWOSPlugin', 'mscmd', 'PTKernel',\
-+libraries = ['BinLPlugin', 'BinPlugin', 'BinXCAFPlugin', 'FWOSPlugin', 'PTKernel',\
-              'StdLPlugin', 'StdPlugin', 'TKAdvTools', 'TKBin', 'TKBinL', 'TKBinTObj', 'TKBinXCAF',\
-             'TKBO', 'TKBool', 'TKBRep', 'TKCAF', 'TKCDF', 'TKCDLFront', 'TKCPPClient', 'TKCPPExt',\
-             'TKCPPIntExt', 'TKCPPJini', 'TKCSFDBSchema', 'TKDCAF', 'TKDraw', 'TKernel',\
-             'TKFeat', 'TKFillet', 'TKG2d', 'TKG3d', 'TKGeomAlgo', 'TKGeomBase', 'TKHLR', 'TKIDLFront',\
-+             'TKBO', 'TKBool', 'TKBRep', 'TKCAF', 'TKCDF',\
-+             'TKernel',\
-+             'TKFeat', 'TKFillet', 'TKG2d', 'TKG3d', 'TKGeomAlgo', 'TKGeomBase', 'TKHLR',\
-              'TKIGES', 'TKjcas','TKLCAF', 'TKMath', 'TKMesh', 'TKMeshVS', 'TKNIS', 'TKOffset',\
-              'TKOpenGl', 'TKPCAF', 'TKPLCAF', 'TKPrim', 'TKPShape', 'TKService', 'TKShapeSchema',\
-              'TKShHealing', 'TKStdLSchema', 'TKStdSchema', 'TKSTEP', 'TKSTEP209', 'TKSTEPAttr',\
-             'TKSTEPBase', 'TKSTL', 'TKTCPPExt', 'TKTObj', 'TKTObjDRAW', 'TKTopAlgo', 'TKTopTest',\
-             'TKV2d', 'TKV3d', 'TKViewerTest', 'TKVRML', 'TKWOK', 'TKWOKTcl', 'TKXCAF', 'TKXCAFSchema',\
-             'TKXDEDRAW', 'TKXDEIGES', 'TKXDESTEP', 'TKXMesh', 'TKXml', 'TKXmlL', 'TKXmlTObj',\
-             'TKXmlXCAF', 'TKXSBase', 'TKXSDRAW', 'XCAFPlugin',\
-+             'TKSTEPBase', 'TKSTL', 'TKTObj', 'TKTObjDRAW', 'TKTopAlgo',\
-+             'TKV2d', 'TKV3d', 'TKVRML', 'TKXCAF', 'TKXCAFSchema',\
-+             'TKXDEIGES', 'TKXDESTEP', 'TKXMesh', 'TKXml', 'TKXmlL', 'TKXmlTObj',\
-+             'TKXmlXCAF', 'TKXSBase',\
-              'XmlLPlugin', 'XmlPlugin', 'XmlXCAFPlugin']
- # Find the lib in OCC_LIB path and add it to the LIBS list
- LIBS = []
--- pythonocc-0.3.0.orig/debian/changelog
-+++ pythonocc-0.3.0/debian/changelog
-@@ -0,0 +1,6 @@
-+pythonocc (0.3.0-1) unstable; urgency=low
-+
-+  * Initial release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Mon, 24 Aug 2009 12:41:48 +0200
-+
--- pythonocc-0.3.0.orig/debian/rules
-+++ pythonocc-0.3.0/debian/rules
-@@ -0,0 +1,80 @@
-+#!/usr/bin/make -f
-+
-+CFLAGS = -Wall -g
-+
-+configure:
-+	chmod 755 src/addons/Display/OCCViewer.py
-+	chmod 755 src/addons/Display/wxDisplay.py
-+	chmod 755 src/addons/Display/wxSamplesGui.py
-+	chmod 755 src/addons/Display/wxSamplesGui2d.py
-+	chmod 755 src/addons/Utils/DataExchange/STL.py
-+	chmod 755 src/addons/Utils/DataExchange/STEP.py
-+	chmod 755 src/addons/Utils/Common.py
-+	chmod 755 src/addons/Utils/Image.py
-+	#chmod 644 src/AUTHORS
-+
-+build: build-stamp
-+build-stamp: configure
-+	dh_testdir
-+	cd src && python setup.py build
-+	touch $@
-+
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	rm -f build-stamp install-stamp
-+	cd src && python setup.py clean
-+	dh_clean
-+	rm -rf src/build
-+	rm -rf src/OCC
-+	find -name '*.pyc' | xargs rm -rf
-+	cd src/wrapper && find -name '*.pyc' | xargs rm -rf
-+	cd src/wrapper/Misc && find -name '*_wrap.cpp' | xargs rm -rf
-+	cd src/wrapper/SWIG/linux_darwin && find -name '*_wrap.cpp' | xargs rm -rf
-+	cd src/wrapper/Visualization && find -name '*_wrap.cpp' | xargs rm -rf
-+
-+install: build install-stamp
-+install-stamp:
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k
-+	dh_installdirs
-+	cd src && python setup.py install --no-compile --root ../debian/python-occ
-+	#dh install --after dh_installdirs
-+	touch install-stamp
-+
-+binary-indep: build install
-+	#dh binary-indep
-+
-+binary-arch: build install
-+	#dh binary-arch
-+	dh_testdir
-+	dh_testroot
-+	dh_installchangelogs 
-+	dh_installdocs
-+	dh_installexamples
-+#	dh_install
-+#	dh_installmenu
-+#	dh_installdebconf	
-+#	dh_installlogrotate
-+#	dh_installemacsen
-+#	dh_installpam
-+#	dh_installmime
-+#	dh_desktop
-+#	dh_installinit
-+#	dh_installcron
-+#	dh_installinfo
-+	dh_installman
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_pycentral
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install
--- pythonocc-0.3.0.orig/debian/control
-+++ pythonocc-0.3.0/debian/control
-@@ -0,0 +1,20 @@
-+Source: pythonocc
-+Section: python
-+Priority: extra
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+Build-Depends: debhelper (>= 6), python, python-central, python-support, swig, libopencascade-dev, salomegeom-dev
-+Standards-Version: 3.7.3
-+XS-Python-Version: current
-+Homepage: http://pythonocc.org/
-+
-+Package: python-occ
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
-+XB-Python-Version: ${python:Versions}
-+Provides: ${python:Provides}
-+Description: A framework for agile CAD development
-+ PythonOCC is a Python wrapper module for the
-+ OpenCascade library. It contains python functions and classes
-+ that will allow you to fully utilitize the OpenCascade library.
-+ This version is built against OpenCascade 6.3.0.
-+
--- pythonocc-0.3.0.orig/debian/compat
-+++ pythonocc-0.3.0/debian/compat
-@@ -0,0 +1 @@
-+6
--- pythonocc-0.3.0.orig/debian/pyversions
-+++ pythonocc-0.3.0/debian/pyversions
-@@ -0,0 +1 @@
-+2.4-
--- pythonocc-0.3.0.orig/debian/pycompat
-+++ pythonocc-0.3.0/debian/pycompat
-@@ -0,0 +1 @@
-+2
--- pythonocc-0.3.0.orig/debian/copyright
-+++ pythonocc-0.3.0/debian/copyright
-@@ -0,0 +1,7 @@
-+Files: *
-+Copyright: 2008 Thomas Paviot <thomas.paviot@free.fr> 
-+License: GPL-3
-+ .
-+ On Debian systems, the complete text of the GNU General Public 
-+ License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
-+
@@ -1,299 +0,0 @@
--- salomegeom-4.1.4.orig/adm/lin/Makefile.am
-+++ salomegeom-4.1.4/adm/lin/Makefile.am
-@@ -2,10 +2,10 @@
- # geomdir = ./
- 
- # copy some files
-targetdir = $(prefix)
-dist_target_DATA = LICENCE.lgpl
-+#targetdir = $(datadir)
-+#dist_target_DATA = LICENCE.lgpl
- 
-resourcedir = $(prefix)/resources
-+resourcedir = $(datadir)/resources
- dist_resource_DATA = $(srcdir)/resources/GUID.txt $(srcdir)/resources/ImportExport $(srcdir)/resources/Resources $(srcdir)/resources/ShHealing
- 
- 
-@@ -16,7 +16,7 @@
- AM_CPPFLAGS = -I$(CASROOT)/inc -I$(srcdir)/$(geomdir)inc/ -I$(srcdir)/$(geomdir)src/GEOMAlgo -I$(srcdir)/$(geomdir)src/BlockFix -I$(srcdir)/$(geomdir)src/GEOM -I$(srcdir)/$(geomdir)src/NMTTools -I$(srcdir)/$(geomdir)src/NMTDS
- 
- # set library names
-lib_LTLIBRARIES = libExchangeCSFDB.la libArchimede.la libNMTDS.la libNMTTools.la libGEOMAlgo.la libGEOMImpl.la libGEOM.la libExchangeBREP.la libExchangeIGES.la libExchangeSTEP.la libExchangeSTL.la libExchangeVRML.la libPartition.la libShHealOper.la libSketcher.la
-+lib_LTLIBRARIES = libExchangeCSFDB.la libArchimede.la libNMTDS.la libNMTTools.la libGEOMAlgo.la libGEOM.la libShHealOper.la libExchangeBREP.la libExchangeIGES.la libExchangeSTEP.la libExchangeSTL.la libExchangeVRML.la libPartition.la libSketcher.la libGEOMImpl.la
- 
- # set global linker flags
- AM_LDFLAGS = -version-info 1:0:0
-@@ -24,24 +24,24 @@
- uninstall-local:
- 	-rm -rf $(DESTDIR)$(libdir)
- 	-rm -rf $(DESTDIR)$(includedir)
-	-rm -rf $(DESTDIR)$(prefix)/resources
-	-rm $(DESTDIR)$(prefix)/env_geom.sh
-+	-rm -rf $(DESTDIR)$(datadir)/resources
-+	-rm $(DESTDIR)$(datadir)/env_geom.sh
- 
- install-exec-local:
-	test -z "$(DESTDIR)$(prefix)" || $(mkdir_p) "$(DESTDIR)$(prefix)"
-	@echo "#!/bin/bash" 											> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "export GEOMROOT="$(prefix) 								>> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "export CSF_ResourcesDefaults="$(prefix)/resources 		>> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "if [ -z "LD_LIBRARY_PATH" ];" 							>> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "then LD_LIBRARY_PATH="$(libdir)";" 						>> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "else LD_LIBRARY_PATH="$(libdir)":\$$LD_LIBRARY_PATH;" 	>> $(DESTDIR)$(prefix)/env_geom.sh 
-	@echo "fi" 														>> $(DESTDIR)$(prefix)/env_geom.sh 
-	chmod a+x $(DESTDIR)$(prefix)/env_geom.sh
-	test -z "$(DESTDIR)$(prefix)/resources" || $(mkdir_p) "$(DESTDIR)$(prefix)/resources"
-	cp $(srcdir)/resources/GUID.txt "$(DESTDIR)$(prefix)/resources"
-	cp $(srcdir)/resources/ImportExport "$(DESTDIR)$(prefix)/resources"
-	cp $(srcdir)/resources/Resources "$(DESTDIR)$(prefix)/resources"
-	cp $(srcdir)/resources/ShHealing "$(DESTDIR)$(prefix)/resources"
-+	test -z "$(DESTDIR)$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
-+	@echo "#!/bin/bash" 											> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "export GEOMROOT="$(prefix) 								>> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "export CSF_ResourcesDefaults="$(datadir)/resources 		>> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "if [ -z "LD_LIBRARY_PATH" ];" 							>> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "then LD_LIBRARY_PATH="$(libdir)";" 						>> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "else LD_LIBRARY_PATH="$(libdir)":\$$LD_LIBRARY_PATH;" 	>> $(DESTDIR)$(datadir)/env_geom.sh 
-+	@echo "fi" 														>> $(DESTDIR)$(datadir)/env_geom.sh 
-+	chmod a+x $(DESTDIR)$(datadir)/env_geom.sh
-+	test -z "$(DESTDIR)$(datadir)/resources" || $(mkdir_p) "$(DESTDIR)$(datadir)/resources"
-+	cp $(srcdir)/resources/GUID.txt "$(DESTDIR)$(datadir)/resources"
-+	cp $(srcdir)/resources/ImportExport "$(DESTDIR)$(datadir)/resources"
-+	cp $(srcdir)/resources/Resources "$(DESTDIR)$(datadir)/resources"
-+	cp $(srcdir)/resources/ShHealing "$(DESTDIR)$(datadir)/resources"
- 
- # set ARCHIMDE sources
- libArchimede_la_SOURCES =  $(srcdir)/$(geomdir)src/Archimede/Archimede_VolumeSection.cpp
-@@ -581,6 +581,26 @@
- # libShHealOper_la_LDFLAGS        = -version-info 0:0:0
- # libSketcher_la_LDFLAGS          = -version-info 0:0:0
- 
-+libArchimede_la_LIBADD        = -lTKMath -lTKernel -lTKBRep -lTKGeomAlgo -lTKGeomBase -lTKG3d -lTKMesh
-+libExchangeBREP_la_LIBADD     = -lTKMath -lTKernel -lTKBRep
-+libExchangeCSFDB_la_LIBADD    = -lTKMath -lTKernel -lTKBRep -lTKPShape -lTKShapeSchema -lPTKernel
-+libExchangeIGES_la_LIBADD     = -lTKMath -lTKernel -lTKXSBase -lTKBRep -lTKIGES
-+libExchangeSTEP_la_LIBADD     = -lTKMath -lTKernel -lTKXSBase -lTKBRep -lTKSTEP
-+libExchangeSTL_la_LIBADD      = -lTKernel -lTKSTL
-+libExchangeVRML_la_LIBADD     = -lTKernel -lTKVRML
-+libNMTDS_la_LIBADD            = -lTKMath -lTKernel -lTKBRep -lTKBO
-+libNMTTools_la_LIBADD         = -lTKMath -lTKernel -lTKBRep -lTKBO -lTKG2d -lTKG3d -lTKGeomAlgo -lTKGeomBase -lTKTopAlgo -lNMTDS
-+libGEOMAlgo_la_LIBADD         = -lTKMath -lTKernel -lTKBRep -lTKBool -lTKBO -lTKG2d -lTKG3d -lTKGeomAlgo \
-+								-lTKGeomBase -lTKTopAlgo -lTKMesh -lTKShHealing -lNMTDS -lNMTTools
-+libGEOM_la_LIBADD             = -lTKMath -lTKernel -lTKXSBase -lTKBRep -lTKCAF -lTKCDF -lTKLCAF -lTKXSBase \
-+								-lTKAdvTools -lTKG2d
-+libGEOMImpl_la_LIBADD         = -lTKMath -lTKernel -lTKBRep -lTKTopAlgo -lTKCAF -lTKOffset -lTKPrim -lTKShHealing \
-+								-lTKBool -lTKBO -lTKMesh -lTKG2d -lTKG3d -lTKFillet -lTKGeomAlgo -lTKGeomBase -lTKLCAF \
-+								-lGEOMAlgo -lGEOM -lArchimede -lShHealOper -lSketcher -ldl
-+libPartition_la_LIBADD        = -lTKMath -lTKernel -lTKBRep -lTKBool -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomAlgo -lTKGeomBase -lTKOffset
-+libShHealOper_la_LIBADD       = -lTKMath -lTKernel -lTKBRep -lTKBool -lTKShHealing -lTKTopAlgo -lTKG2d -lTKG3d -lTKGeomAlgo -lTKGeomBase -lTKLCAF
-+libSketcher_la_LIBADD         = -lTKMath -lTKernel -lTKBRep -lTKTopAlgo -lTKG2d -lTKGeomAlgo
-+
- # include files to be copied to installdir/inc
- include_HEADERS =  $(srcdir)/$(geomdir)inc/Archimede_VolumeSection.hxx \
- $(srcdir)/$(geomdir)inc/BlockFix_BlockFixAPI.hxx \
--- salomegeom-4.1.4.orig/debian/changelog
-+++ salomegeom-4.1.4/debian/changelog
-@@ -0,0 +1,6 @@
-+salomegeom (4.1.4-5) unstable; urgency=low
-+
-+  * Initial release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 23 Aug 2009 17:12:19 +0200
-+
--- salomegeom-4.1.4.orig/debian/rules
-+++ salomegeom-4.1.4/debian/rules
-@@ -0,0 +1,129 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+# Sample debian/rules that uses debhelper.
-+# This file was originally written by Joey Hess and Craig Small.
-+# As a special exception, when this file is copied by dh-make into a
-+# dh-make output file, you may use that output file without restriction.
-+# This special exception was added by Craig Small in version 0.37 of dh-make.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# 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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+BUILD_DIR = adm/lin
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+configure:
-+	chmod u-x resources/GUID.txt
-+	chmod u-x resources/ImportExport
-+	chmod u-x resources/Resources
-+	chmod u-x resources/ShHealing
-+	chmod u-x resources/ShHealingFullSet
-+	cd $(BUILD_DIR) && \
-+	autoreconf --install
-+
-+config.status: configure
-+	dh_testdir
-+# Add here commands to configure the package.
-+	cd $(BUILD_DIR) && \
-+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+	--prefix=/usr --includedir=/usr/include/salomegeom \
-+	--libdir=/usr/lib --datadir=/usr/share/salomegeom \
-+	LDFLAGS="-Wl,-z,defs -L/usr/lib" \
-+	CXXFLAGS="$(CXXFLAGS) -I/usr/include/opencascade" 
-+
-+build: build-links build-stamp
-+
-+build-links:
-+	dh_testdir
-+	cd $(BUILD_DIR) && \
-+	ln -s ../../inc inc && \
-+	ln -s ../../resources resources && \
-+	ln -s ../../src src
-+
-+build-stamp:  config.status
-+	dh_testdir
-+
-+# Add here commands to compile the package.
-+	cd $(BUILD_DIR) && $(MAKE)
-+	touch $@
-+
-+# Add here commands to clean up after the build process.
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	dh_clean
-+# We always get some strange symlinks in these directories which we must remove first
-+	rm -f inc/inc
-+	rm -f src/src
-+	rm -f resources/resources
-+	rm -f build-stamp
-+	cd $(BUILD_DIR) && \
-+	rm -f configure && \
-+	rm -f inc resources src && \
-+	find -name 'Makefile.in' | xargs rm -f && \
-+	find -name 'Makefile' | xargs rm -f && \
-+	find -name '*.o' | xargs rm -f && \
-+	find -name '*.la' | xargs rm -f && \
-+	find -name '*.lo' | xargs rm -f && \
-+	find -name '*.deps' | xargs rm -rf && \
-+	find -name '*.libs' | xargs rm -rf	 && \
-+	rm -f stamp-h1 aclocal.m4 config.guess config.sub depcomp install-sh && \
-+	rm -f ltmain.sh missing config.log libtool && \
-+	rm -f config.h config.h.in config.status && \
-+	rm -rf build-aux autom4te.cache
-+	
-+install: build-stamp
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k 
-+	dh_installdirs
-+
-+# Add here commands to install the package into debian/salomegeom.
-+	cd $(BUILD_DIR) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/salomegeom
-+
-+# install the core system
-+	dh_install -psalomegeom debian/tmp/salomegeom/usr/share/* usr/share/
-+	dh_install -psalomegeom debian/tmp/salomegeom/usr/lib/lib*.so.* usr/lib
-+	dh_install -psalomegeom-dev debian/tmp/salomegeom/usr/lib/lib*.so usr/lib
-+	dh_install -psalomegeom-dev debian/tmp/salomegeom/usr/lib/lib*.la usr/lib
-+	dh_install -psalomegeom-dev debian/tmp/salomegeom/usr/lib/lib*.a  usr/lib
-+	dh_install -psalomegeom-dev debian/tmp/salomegeom/usr/include/* usr/include
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+	dh_testdir
-+	dh_testroot
-+	dh_installchangelogs
-+	dh_installdocs
-+	dh_installexamples
-+	dh_desktop
-+#	dh_installinfo
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_makeshlibs
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install 
-+
--- salomegeom-4.1.4.orig/debian/control
-+++ salomegeom-4.1.4/debian/control
-@@ -0,0 +1,26 @@
-+Source: salomegeom
-+Section: libs
-+Priority: extra
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+Build-Depends: cdbs, debhelper (>= 5), libopencascade-dev
-+Standards-Version: 3.7.3
-+
-+Package: salomegeom
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}
-+Description: SALOME Geometry Module
-+ A complete OpenCascade - OCAF based CAD framework.Note that this is not
-+ the original SALOME GEOM project but an effort to create a standalone
-+ framework based on the existing one from SALOME project, with the
-+ addition of extra functionality.
-+
-+Package: salomegeom-dev
-+Architecture: any
-+Section: libdevel
-+Depends: salomegeom (>= ${source:Version})
-+Description: SALOME Geometry Module development files
-+ A complete OpenCascade - OCAF based CAD framework.Note that this is not
-+ the original SALOME GEOM project but an effort to create a standalone
-+ framework based on the existing one from SALOME project, with the
-+ addition of extra functionality.
-+
--- salomegeom-4.1.4.orig/debian/compat
-+++ salomegeom-4.1.4/debian/compat
-@@ -0,0 +1 @@
-+5
--- salomegeom-4.1.4.orig/debian/README.Debian
-+++ salomegeom-4.1.4/debian/README.Debian
-@@ -0,0 +1,6 @@
-+salomegeom for Debian
-+---------------------
-+
-+- First Debian package for SalomeGeom.
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 23 Aug 2009 17:12:19 +0200
--- salomegeom-4.1.4.orig/debian/docs
-+++ salomegeom-4.1.4/debian/docs
-@@ -0,0 +1 @@
-+README.LINUX
--- salomegeom-4.1.4.orig/debian/copyright
-+++ salomegeom-4.1.4/debian/copyright
-@@ -0,0 +1,16 @@
-+This package was debianized by Werner Mayer <wmayer@users.sourceforge.net> on
-+Sun, 23 Aug 2009 17:12:19 +0200.
-+
-+It was downloaded from http://surfnet.dl.sourceforge.net/project/salomegeometry/salomegeometry/4.1.4_v5/geom-4.1.4.5.tar.gz
-+
-+Upstream Author: 
-+    Fotis Sioutis <sfotis@users.sourceforge.net>
-+
-+Copyright: 
-+    Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-+    CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-+
-+License: LGPL-2.1
-+ On Debian systems, the complete text of the GNU Lesser General Public 
-+ License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-+
@@ -1,307 +0,0 @@
--- salomegeom-5.1.1.orig/adm/lin/Makefile.am
-+++ salomegeom-5.1.1/adm/lin/Makefile.am
-@@ -2,10 +2,10 @@
- # geomdir = ./
- 
- # copy some files
-targetdir = $(prefix)
-dist_target_DATA = LICENCE.lgpl
-+#targetdir = $(datadir)
-+#dist_target_DATA = LICENCE.lgpl
- 
-resourcedir = $(prefix)/resources
-+resourcedir = $(datadir)/resources
- dist_resource_DATA = $(srcdir)/resources/GUID.txt $(srcdir)/resources/ImportExport $(srcdir)/resources/Resources $(srcdir)/resources/ShHealing
- 
- 
-@@ -16,7 +16,7 @@
- AM_CPPFLAGS = -I$(CASROOT)/inc -I$(srcdir)/$(geomdir)inc/ -I$(srcdir)/$(geomdir)src/GEOMAlgo -I$(srcdir)/$(geomdir)src/BlockFix -I$(srcdir)/$(geomdir)src/GEOM -I$(srcdir)/$(geomdir)src/NMTTools -I$(srcdir)/$(geomdir)src/NMTDS
- 
- # set library names
-lib_LTLIBRARIES = libExchangeCSFDB.la libArchimede.la libNMTDS.la libNMTTools.la libGEOMAlgo.la libGEOMImpl.la libGEOM.la libExchangeBREP.la libExchangeIGES.la libExchangeSTEP.la libExchangeSTL.la libExchangeVRML.la libPartition.la libShHealOper.la libSketcher.la
-+lib_LTLIBRARIES = libExchangeCSFDB.la libArchimede.la libNMTDS.la libNMTTools.la libGEOMAlgo.la libGEOM.la libShHealOper.la libExchangeBREP.la libExchangeIGES.la libExchangeSTEP.la libExchangeSTL.la libExchangeVRML.la libPartition.la libSketcher.la libGEOMImpl.la
- 
- # set global linker flags
- AM_LDFLAGS = -version-info 1:0:0
-@@ -24,24 +24,24 @@
- uninstall-local:
- 	-rm -rf $(DESTDIR)$(libdir)
- 	-rm -rf $(DESTDIR)$(includedir)
-	-rm -rf $(DESTDIR)$(prefix)/resources
-	-rm $(DESTDIR)$(prefix)/env_geom.sh
-+	-rm -rf $(DESTDIR)$(datadir)/resources
-+	-rm $(DESTDIR)$(datadir)/env_geom.sh
- 
- install-exec-local:
-	test -z "$(DESTDIR)$(prefix)" || $(mkdir_p) "$(DESTDIR)$(prefix)"
-	@echo "#!/bin/bash" 											> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "export GEOMROOT="$(prefix) 								>> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "export CSF_ResourcesDefaults="$(prefix)/resources 		>> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "if [ -z "LD_LIBRARY_PATH" ];" 							>> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "then LD_LIBRARY_PATH="$(libdir)";" 						>> $(DESTDIR)$(prefix)/env_geom.sh
-	@echo "else LD_LIBRARY_PATH="$(libdir)":\$$LD_LIBRARY_PATH;" 	>> $(DESTDIR)$(prefix)/env_geom.sh 
-	@echo "fi" 														>> $(DESTDIR)$(prefix)/env_geom.sh 
-	chmod a+x $(DESTDIR)$(prefix)/env_geom.sh
-	test -z "$(DESTDIR)$(prefix)/resources" || $(mkdir_p) "$(DESTDIR)$(prefix)/resources"
-	cp $(srcdir)/resources/GUID.txt "$(DESTDIR)$(prefix)/resources"
-	cp $(srcdir)/resources/ImportExport "$(DESTDIR)$(prefix)/resources"
-	cp $(srcdir)/resources/Resources "$(DESTDIR)$(prefix)/resources"
-	cp $(srcdir)/resources/ShHealing "$(DESTDIR)$(prefix)/resources"
-+	test -z "$(DESTDIR)$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
-+	@echo "#!/bin/bash" 											> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "export GEOMROOT="$(prefix) 								>> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "export CSF_ResourcesDefaults="$(datadir)/resources 		>> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "if [ -z "LD_LIBRARY_PATH" ];" 							>> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "then LD_LIBRARY_PATH="$(libdir)";" 						>> $(DESTDIR)$(datadir)/env_geom.sh
-+	@echo "else LD_LIBRARY_PATH="$(libdir)":\$$LD_LIBRARY_PATH;" 	>> $(DESTDIR)$(datadir)/env_geom.sh 
-+	@echo "fi" 														>> $(DESTDIR)$(datadir)/env_geom.sh 
-+	chmod a+x $(DESTDIR)$(datadir)/env_geom.sh
-+	test -z "$(DESTDIR)$(datadir)/resources" || $(mkdir_p) "$(DESTDIR)$(datadir)/resources"
-+	cp $(srcdir)/resources/GUID.txt "$(DESTDIR)$(datadir)/resources"
-+	cp $(srcdir)/resources/ImportExport "$(DESTDIR)$(datadir)/resources"
-+	cp $(srcdir)/resources/Resources "$(DESTDIR)$(datadir)/resources"
-+	cp $(srcdir)/resources/ShHealing "$(DESTDIR)$(datadir)/resources"
- 
- # set ARCHIMDE sources
- libArchimede_la_SOURCES =  $(srcdir)/$(geomdir)src/Archimede/Archimede_VolumeSection.cpp
-@@ -582,6 +582,26 @@
- # libShHealOper_la_LDFLAGS        = -version-info 0:0:0
- # libSketcher_la_LDFLAGS          = -version-info 0:0:0
- 
-+libArchimede_la_LIBADD        = -lTKMath -lTKernel -lTKBRep -lTKGeomAlgo -lTKGeomBase -lTKG3d -lTKMesh
-+libExchangeBREP_la_LIBADD     = -lTKMath -lTKernel -lTKBRep
-+libExchangeCSFDB_la_LIBADD    = -lTKMath -lTKernel -lTKBRep -lTKPShape -lTKShapeSchema -lPTKernel
-+libExchangeIGES_la_LIBADD     = -lTKMath -lTKernel -lTKXSBase -lTKBRep -lTKIGES
-+libExchangeSTEP_la_LIBADD     = -lTKMath -lTKernel -lTKXSBase -lTKBRep -lTKSTEP
-+libExchangeSTL_la_LIBADD      = -lTKernel -lTKSTL
-+libExchangeVRML_la_LIBADD     = -lTKernel -lTKVRML
-+libNMTDS_la_LIBADD            = -lTKMath -lTKernel -lTKBRep -lTKBO
-+libNMTTools_la_LIBADD         = -lTKMath -lTKernel -lTKBRep -lTKBO -lTKG2d -lTKG3d -lTKGeomAlgo -lTKGeomBase -lTKTopAlgo -lNMTDS
-+libGEOMAlgo_la_LIBADD         = -lTKMath -lTKernel -lTKBRep -lTKBool -lTKBO -lTKG2d -lTKG3d -lTKGeomAlgo \
-+								-lTKGeomBase -lTKTopAlgo -lTKMesh -lTKShHealing -lNMTDS -lNMTTools
-+libGEOM_la_LIBADD             = -lTKMath -lTKernel -lTKXSBase -lTKBRep -lTKCAF -lTKCDF -lTKLCAF -lTKXSBase \
-+								-lTKAdvTools -lTKG2d
-+libGEOMImpl_la_LIBADD         = -lTKMath -lTKernel -lTKBRep -lTKTopAlgo -lTKCAF -lTKOffset -lTKPrim -lTKShHealing \
-+								-lTKBool -lTKBO -lTKMesh -lTKG2d -lTKG3d -lTKFillet -lTKGeomAlgo -lTKGeomBase -lTKLCAF \
-+								-lGEOMAlgo -lGEOM -lArchimede -lShHealOper -lSketcher -ldl
-+libPartition_la_LIBADD        = -lTKMath -lTKernel -lTKBRep -lTKBool -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomAlgo -lTKGeomBase -lTKOffset
-+libShHealOper_la_LIBADD       = -lTKMath -lTKernel -lTKBRep -lTKBool -lTKShHealing -lTKTopAlgo -lTKG2d -lTKG3d -lTKGeomAlgo -lTKGeomBase -lTKLCAF
-+libSketcher_la_LIBADD         = -lTKMath -lTKernel -lTKBRep -lTKTopAlgo -lTKG2d -lTKGeomAlgo
-+
- # include files to be copied to installdir/inc
- include_HEADERS =  $(srcdir)/$(geomdir)inc/Archimede_VolumeSection.hxx \
- $(srcdir)/$(geomdir)inc/BlockFix_BlockFixAPI.hxx \
-@@ -921,7 +941,6 @@
- $(srcdir)/$(geomdir)inc/ShHealOper_RemoveInternalWires.hxx \
- $(srcdir)/$(geomdir)inc/ShHealOper_Sewing.hxx \
- $(srcdir)/$(geomdir)inc/ShHealOper_ShapeProcess.hxx \
-$(srcdir)/$(geomdir)inc/ShHealOper_SpiltCurve2d.hxx \
- $(srcdir)/$(geomdir)inc/ShHealOper_SplitCurve2d.hxx \
- $(srcdir)/$(geomdir)inc/ShHealOper_SplitCurve3d.hxx \
- $(srcdir)/$(geomdir)inc/ShHealOper_Tool.hxx \
--- salomegeom-5.1.1.orig/debian/changelog
-+++ salomegeom-5.1.1/debian/changelog
-@@ -0,0 +1,6 @@
-+salomegeom (5.1.1-6) unstable; urgency=low
-+
-+  * Initial release
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 23 Aug 2009 17:12:19 +0200
-+
--- salomegeom-5.1.1.orig/debian/rules
-+++ salomegeom-5.1.1/debian/rules
-@@ -0,0 +1,129 @@
-+#!/usr/bin/make -f
-+# -*- makefile -*-
-+# Sample debian/rules that uses debhelper.
-+# This file was originally written by Joey Hess and Craig Small.
-+# As a special exception, when this file is copied by dh-make into a
-+# dh-make output file, you may use that output file without restriction.
-+# This special exception was added by Craig Small in version 0.37 of dh-make.
-+
-+# Uncomment this to turn on verbose mode.
-+#export DH_VERBOSE=1
-+
-+# 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)
-+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-+BUILD_DIR = adm/lin
-+
-+CFLAGS = -Wall -g
-+
-+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-+	CFLAGS += -O0
-+else
-+	CFLAGS += -O2
-+endif
-+
-+configure:
-+	chmod u-x resources/GUID.txt
-+	chmod u-x resources/ImportExport
-+	chmod u-x resources/Resources
-+	chmod u-x resources/ShHealing
-+	chmod u-x resources/ShHealingFullSet
-+	cd $(BUILD_DIR) && \
-+	autoreconf --install
-+
-+config.status: configure
-+	dh_testdir
-+# Add here commands to configure the package.
-+	cd $(BUILD_DIR) && \
-+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-+	--prefix=/usr --includedir=/usr/include/salomegeom \
-+	--libdir=/usr/lib --datadir=/usr/share/salomegeom \
-+	LDFLAGS="-Wl,-z,defs -L/usr/lib" \
-+	CXXFLAGS="$(CXXFLAGS) -I/usr/include/opencascade" 
-+
-+build: build-links build-stamp
-+
-+build-links:
-+	dh_testdir
-+	cd $(BUILD_DIR) && \
-+	ln -s ../../inc inc && \
-+	ln -s ../../resources resources && \
-+	ln -s ../../src src
-+
-+build-stamp:  config.status
-+	dh_testdir
-+
-+# Add here commands to compile the package.
-+	cd $(BUILD_DIR) && $(MAKE)
-+	touch $@
-+
-+# Add here commands to clean up after the build process.
-+clean:
-+	dh_testdir
-+	dh_testroot
-+	dh_clean
-+# We always get some strange symlinks in these directories which we must remove first
-+	rm -f inc/inc
-+	rm -f src/src
-+	rm -f resources/resources
-+	rm -f build-stamp
-+	cd $(BUILD_DIR) && \
-+	rm -f configure && \
-+	rm -f inc resources src && \
-+	find -name 'Makefile.in' | xargs rm -f && \
-+	find -name 'Makefile' | xargs rm -f && \
-+	find -name '*.o' | xargs rm -f && \
-+	find -name '*.la' | xargs rm -f && \
-+	find -name '*.lo' | xargs rm -f && \
-+	find -name '*.deps' | xargs rm -rf && \
-+	find -name '*.libs' | xargs rm -rf	 && \
-+	rm -f stamp-h1 aclocal.m4 config.guess config.sub depcomp install-sh && \
-+	rm -f ltmain.sh missing config.log libtool && \
-+	rm -f config.h config.h.in config.status && \
-+	rm -rf build-aux autom4te.cache
-+	
-+install: build-stamp
-+	dh_testdir
-+	dh_testroot
-+	dh_clean -k 
-+	dh_installdirs
-+
-+# Add here commands to install the package into debian/salomegeom.
-+	cd $(BUILD_DIR) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/salomegeom
-+
-+# install the core system
-+	dh_install -psalomegeom debian/tmp/salomegeom/usr/share/* usr/share/
-+	dh_install -psalomegeom debian/tmp/salomegeom/usr/lib/lib*.so.* usr/lib
-+	dh_install -psalomegeom-dev debian/tmp/salomegeom/usr/lib/lib*.so usr/lib
-+	dh_install -psalomegeom-dev debian/tmp/salomegeom/usr/lib/lib*.la usr/lib
-+	dh_install -psalomegeom-dev debian/tmp/salomegeom/usr/lib/lib*.a  usr/lib
-+	dh_install -psalomegeom-dev debian/tmp/salomegeom/usr/include/* usr/include
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+	dh_testdir
-+	dh_testroot
-+	dh_installchangelogs
-+	dh_installdocs
-+	dh_installexamples
-+	dh_desktop
-+#	dh_installinfo
-+	dh_link
-+	dh_strip
-+	dh_compress
-+	dh_fixperms
-+	dh_makeshlibs
-+	dh_installdeb
-+	dh_shlibdeps
-+	dh_gencontrol
-+	dh_md5sums
-+	dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean binary-indep binary-arch binary install 
-+
--- salomegeom-5.1.1.orig/debian/control
-+++ salomegeom-5.1.1/debian/control
-@@ -0,0 +1,26 @@
-+Source: salomegeom
-+Section: libs
-+Priority: extra
-+Maintainer: Werner Mayer <wmayer@users.sourceforge.net>
-+Build-Depends: cdbs, debhelper (>= 5), libopencascade-dev
-+Standards-Version: 3.7.3
-+
-+Package: salomegeom
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}
-+Description: SALOME Geometry Module
-+ A complete OpenCascade - OCAF based CAD framework.Note that this is not
-+ the original SALOME GEOM project but an effort to create a standalone
-+ framework based on the existing one from SALOME project, with the
-+ addition of extra functionality.
-+
-+Package: salomegeom-dev
-+Architecture: any
-+Section: libdevel
-+Depends: salomegeom (>= ${source:Version})
-+Description: SALOME Geometry Module development files
-+ A complete OpenCascade - OCAF based CAD framework.Note that this is not
-+ the original SALOME GEOM project but an effort to create a standalone
-+ framework based on the existing one from SALOME project, with the
-+ addition of extra functionality.
-+
--- salomegeom-5.1.1.orig/debian/compat
-+++ salomegeom-5.1.1/debian/compat
-@@ -0,0 +1 @@
-+5
--- salomegeom-5.1.1.orig/debian/README.Debian
-+++ salomegeom-5.1.1/debian/README.Debian
-@@ -0,0 +1,6 @@
-+salomegeom for Debian
-+---------------------
-+
-+- First Debian package for SalomeGeom.
-+
-+ -- Werner Mayer <wmayer@users.sourceforge.net>  Sun, 23 Aug 2009 17:12:19 +0200
--- salomegeom-5.1.1.orig/debian/docs
-+++ salomegeom-5.1.1/debian/docs
-@@ -0,0 +1 @@
-+README.LINUX
--- salomegeom-5.1.1.orig/debian/copyright
-+++ salomegeom-5.1.1/debian/copyright
-@@ -0,0 +1,16 @@
-+This package was debianized by Werner Mayer <wmayer@users.sourceforge.net> on
-+Sun, 23 Aug 2009 17:12:19 +0200.
-+
-+It was downloaded from https://salomegeometry.svn.sourceforge.net/svnroot/salomegeometry/tags/5.1.1_v6
-+
-+Upstream Author: 
-+    Fotis Sioutis <sfotis@users.sourceforge.net>
-+
-+Copyright: 
-+    Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-+    CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-+
-+License: LGPL-2.1
-+ On Debian systems, the complete text of the GNU Lesser General Public 
-+ License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-+
@@ -1,7 +0,0 @@
-usr/share/icons/hicolor/16x16/apps
-usr/share/icons/hicolor/32x32/apps
-usr/share/icons/hicolor/48x48/apps
-usr/share/icons/hicolor/64x64/apps
-usr/share/icons/hicolor/scalable/apps
-usr/share/icons/hicolor/64x64/mimetypes
-
@@ -1,15 +0,0 @@
-Document: freecad-development-documentation
-Title: FreeCAD development documentation
-Author: FreeCAD developers
-Abstract: FreeCAD is a general purpose Open Source 3D 
- CAD/MCAD/CAx/CAE/PLM modeler, aimed directly at mechanical engineering 
- and product design but also fits in a wider range of uses around 
- engineering, such as architecture or other engineering specialties. 
- It is a feature-based parametric modeler with a modular software 
- architecture which makes it easy to provide additional functionality 
- without modifying the core system.
-Section: Science/Engineering
-
-Format: HTML
-Index: /usr/share/doc/freecad-doc/Start_Page.html
-Files: /usr/share/doc/freecad-doc/*.q*
@@ -1 +0,0 @@
-debian/tmp/usr/lib/freecad/doc/*
@@ -1,73 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH FREECAD 1 "July  25, 2007" freecad "Linux User's Manual"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-freecad \- An extensible Open Source CAx program for Unix/X11
-.SH SYNOPSIS
-.B freecad
-.RI [ options ] " files"
-.br
-.B freecadcmd
-.RI [ options ] " files"
-.SH DESCRIPTION
-.B FreeCAD
-is an Open Source CAx RAD based on OpenCasCade, Qt and Python. It features 
-some key concepts like macro recording, workbenches, ability to run as a 
-server and dynamically loadable application extensions and it is designed 
-to be platform independent.
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-.SH USAGE
-\fBfreecad\fR starts with a GUI while \fBfreecadcmd\fR is only a pure command line version that starts a Python interpreter.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of the options supported by \fBfreecad\fR is included below.
-.SS "Generic options"
-.TP
-\fB\-h, \-\-help\fR
-Show summary of options.
-.TP
-\fB\-v, \-\-version\fR
-Show version of program.
-.TP
-\fB\-c, \-\-console\fR
-Start in console mode.
-.TP
-\fB\-\-response\-file\fR \fIarg\fR
-Can be specified with '@name', too.
-
-.SS "Configuration"
-.TP
-\fB\-l, \-\-write\-log\fR
-Write a log file.
-.TP
-\fB\-t, \-\-run\-test\fR \fIarg\fR
-Test level.
-.TP
-\fB\-M, \-\-module\-path\fR \fIarg\fR
-Additional module path.
-.TP
-\fB\-P, \-\-python\-path\fR \fIarg\fR
-Additional Python path.
-.SH SEE ALSO
-To get more information about \fBFreeCAD\fR, please visit \fIhttp://www.freecadweb.org\fR
-.SH BUGS
-To report a bug, please visit \fIhttp://www.freecadweb.org/tracker/my_view_page.php\fR
-.SH AUTHOR
-This manual page was written by Werner Mayer.
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="desktop">freecad.desktop</id>
- <metadata_licence>CC-BY-3.0</metadata_licence>
- <project_license>LGPL-2.1+</project_license>
- <name>FreeCAD</name>
- <summary>An open source parametric 3D CAD modeler</summary>
- <description>
-  <p>FreeCAD is a parametric 3D modeler. Parametric modeling 
-  allows you to easily modify your design by going back into 
-  your model history and changing its parameters. FreeCAD is 
-  open source (LGPL license) and completely modular, allowing 
-  for very advanced extension and customization.</p>
-  <p>FreeCAD is multiplatform, and reads and writes many open 
-  file formats such as STEP, IGES, STL and others.</p>
- </description>
- <screenshots>
-  <screenshot type="default" width="800" height="600">http://www.freecadweb.org/wiki/images/5/56/Freecad_jeep.png</screenshot>
- </screenshots>
- <url type="homepage">http://www.freecadweb.org</url>
- <updatecontact>yorik@uncreated.net</updatecontact>
-</application>
@@ -1,6 +0,0 @@
-debian/freecad.desktop usr/share/applications
-debian/menu usr/share/menu/freecad
-usr/share/freecad
-usr/lib/freecad/bin
-usr/lib/freecad/Mod
-usr/lib/freecad/lib
@@ -1,3 +0,0 @@
-usr/lib/freecad/bin/FreeCAD usr/bin/freecad
-usr/lib/freecad/bin/FreeCADCmd usr/bin/freecadcmd
-usr/share/man/man1/freecad.1.gz usr/share/man/man1/freecadcmd.1.gz
@@ -1 +0,0 @@
-freecad: binary-or-shlib-defines-rpath
@@ -1,2 +0,0 @@
-debian/freecad.1
-debian/mime/freecad-thumbnailer.1
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-	<mime-type type="application/x-extension-fcstd">
-		<!-- <sub-class-of type="application/zip"/> -->
-		<comment>FreeCAD document files</comment>
-		<glob pattern="*.fcstd"/>
-	</mime-type>
-</mime-info>
@@ -1,6 +0,0 @@
-?package(freecad):needs="X11"\
-  section="Applications/Science/Engineering"\
-  title="FreeCAD"\
-  command="/usr/bin/freecad"\
-  icon="/usr/share/freecad/freecad.xpm"
-
@@ -1,20 +0,0 @@
-.TH FREECAD 1 "August  04, 2008" freecad "Linux User's Manual"
-.SH NAME
-freecad-thumbnailer \- A thumbnailer for FreeCAD project files
-.SH SYNOPSIS
-\fBfreecad-thumbnailer\fP [ -s \fIsize\fP ] \fIinput file\fP \fIoutput file\fP
-.SH DESCRIPTION
-\fBfreecad-thumbnailer\fP
-is a Python script that extracts an embedded thumbnail from a FreeCAD project file.
-If no thumbnail is embedded then nothing happens. According to the specification of
-freedesktop.org the thumbnail image is a PNG file. The required \fBinput file\fP argument
-specifies the project file where the thumbnail should be extracted from and the 
-\fBoutput file\fP specifies the file where the thumbnail should be written to.
-.SH OPTIONS
-.TP
-\fB-s \fIsize\fR
-Specify the size of the image in pixel. 
-.SH "SEE ALSO"
-freecad(1), freecadcmd(1)
-.SH AUTHOR
-This manual page was written by Werner Mayer.
@@ -1,30 +0,0 @@
-<gconfschemafile>
-    <schemalist>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-extension-fcstd/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-extension-fcstd/enable</applyto>
-            <owner>freecad</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short>Enable thumbnailing of FreeCAD documents.</short>
-                <long>Enable thumbnailing of FreeCAD documents.</long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-extension-fcstd/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-extension-fcstd/command</applyto>
-            <owner>freecad</owner>
-            <type>string</type>
-            <default>/usr/bin/freecad-thumbnailer -s %s %u %o</default>
-            <locale name="C">
-                <short>Thumbnail command for documents from FreeCAD.</short>
-                <long>Valid command plus arguments for freecad-thumbnailer.</long>
-            </locale>
-        </schema>
-
-    </schemalist>
-</gconfschemafile>
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=/usr/bin/freecad-thumbnailer
-Exec=/usr/bin/freecad-thumbnailer -s %s %u %o
-MimeType=application/x-extension-fcstd;
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    configure)
-    if [ -d /usr/share/freecad/Mod/Robot/Lib/Kuka ]; then
-        echo "resource files installed..."
-    else
-        echo "getting  resource files ..."
-        wgetoptions="--tries=2 --timeout=60"
-        downloadurl="http://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk"
-        downloaddir="--directory-prefix=/usr/share/freecad/Mod/Robot/Lib/Kuka"
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/kr16.wrl
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/kr125_3.wrl
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/kr210.WRL
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/kr500_1.csv
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/kr500_1.wrl
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/kr_16.csv
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/kr_125.csv
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/kr_210_2.csv
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/testprog.dat
-        wget $wgetoptions  $downloaddir $downloadurl/src/Mod/Robot/Lib/Kuka/testprog.src
-    fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    downloaddir="/usr/share/freecad/Mod/Robot/Lib/Kuka"
-    rm -f $downloaddir/kr16.wrl
-    rm -f $downloaddir/kr125_3.wrl
-    rm -f $downloaddir/kr210.WRL
-    rm -f $downloaddir/kr500_1.csv
-    rm -f $downloaddir/kr500_1.wrl
-    rm -f $downloaddir/kr_16.csv
-    rm -f $downloaddir/kr_125.csv
-    rm -f $downloaddir/kr_210_2.csv
-    rm -f $downloaddir/testprog.dat
-    rm -f $downloaddir/testprog.src
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
@@ -1,41 +0,0 @@
-#!/usr/bin/make -f
-%:
-	dh $@ --buildsystem=cmake --parallel --with python2
-
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-extra_flags += \
-DFREECAD_BUILD_DEBIAN=ON \
-DBUILD_FEM_NETGEN=ON \
-DCMAKE_CXX_FLAGS="-Wall -DHAVE_SWIG=1 -fpermissive $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
-DCMAKE_C_FLAGS="-Wall -fpermissive $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" \
-DCMAKE_SHARED_LINKER_FLAGS="$(shell dpkg-buildflags --get LDFLAGS)" \
-DLIB_SUFFIX="" \
-DOCC_INCLUDE_DIR="/usr/include/oce" \
-DCMAKE_INSTALL_PREFIX="/usr/lib/freecad" \
-DCMAKE_INSTALL_DATADIR="/usr/share/freecad"
-
-override_dh_auto_configure:
-	dh_auto_configure -- $(extra_flags)
-	cp -f src/Build/Version.h obj-$(DEB_BUILD_GNU_TYPE)/src/Build/Version.h
-
-override_dh_compress:
-	dh_compress -X.qch -X.qhc
-
-override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog.txt
-	
-override_dh_installmime:
-	dh_installmime
-	dh_install debian/mime/freecad-thumbnailer usr/bin
-	dh_install debian/mime/freecad.thumbnailer usr/share/thumbnailers
-	dh_install debian/mime/freecad.schemas etc/gconf/schemas
-
-override_dh_icons:
-	install -m 644 debian/freecad/usr/share/freecad/freecad-icon-16.png debian/freecad/usr/share/icons/hicolor/16x16/apps/freecad.png
-	install -m 644 debian/freecad/usr/share/freecad/freecad-icon-32.png debian/freecad/usr/share/icons/hicolor/32x32/apps/freecad.png
-	install -m 644 debian/freecad/usr/share/freecad/freecad-icon-32.png debian/freecad/usr/share/icons/hicolor/48x48/apps/freecad.png
-	install -m 644 debian/freecad/usr/share/freecad/freecad-icon-64.png debian/freecad/usr/share/icons/hicolor/64x64/apps/freecad.png
-	install -m 644 debian/freecad/usr/share/freecad/freecad.svg debian/freecad/usr/share/icons/hicolor/scalable/apps/freecad.svg
-	install -m 644 debian/freecad/usr/share/freecad/freecad-doc.png debian/freecad/usr/share/icons/hicolor/64x64/mimetypes/application-x-extension-fcstd.png
-
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-# The script creates a tar.xz tarball from git-repository of freecad-project
-# ./get_orig_src.sh commitID   -   creates a tarball of specified commit
-# ./get_orig_src.sh   - creates a tarball of the latest version
-# Packages, that needs to be installed to use the script:
-# atool, git-core
-
-set -e
-
-git clone git://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad git_temp_packaging
-
-cd git_temp_packaging
-
-if [ $1 ]
-then
-    echo 'Checking out the revision ' $1
-    git checkout -b newvers $1
-else
-    echo 'Using the latest revision'
-fi 
-
-GIT_CMT_COUNT=$(git rev-list HEAD | wc -l)
-
-DEB_VER=0.13.$GIT_CMT_COUNT-dfsg
-FOLDER_NAME=freecad-$DEB_VER
-TARBALL_NAME=freecad_$DEB_VER.orig.tar.xz
-
-echo $DEB_VER
-echo $FOLDER_NAME
-echo $TARBALL_NAME
-
-python src/Tools/SubWCRev.py
-
-cd ..
-
-rm -fr $FOLDER_NAME
-
-mv git_temp_packaging $FOLDER_NAME
-rm -rf $FOLDER_NAME/.git 
-rm -rf $FOLDER_NAME/src/3rdParty/CxImage
-rm -rf $FOLDER_NAME/src/3rdParty/Pivy
-rm -rf $FOLDER_NAME/src/3rdParty/Pivy-0.5
-
-tar Jcvf $TARBALL_NAME $FOLDER_NAME
-
-rm -fr $FOLDER_NAME
@@ -1 +0,0 @@
-1.0
@@ -1,3 +0,0 @@
-# Lintian thinks uploader Adam Powell's name violates policy
-freecad source: uploader-address-missing "Adam C. Powell
-freecad source: uploader-not-full-name IV"
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/free-cad/freecad_(.+)\.orig\.tar\.gz
@@ -0,0 +1,257 @@
+
+# Maintainers:  keep this list of plugins up to date
+# List plugins in %%{_libdir}/%{name}/lib, less '.so' and 'Gui.so', here
+%global plugins Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Path PathGui Spreadsheet SpreadsheetGui area DraftUtils DraftUtils libDriver libDriverDAT libDriverSTL libDriverUNV libMEFISTO2 libSMDS libSMESH libSMESHDS libStdMeshers Measure TechDraw TechDrawGui libarea-native Surface SurfaceGui PathSimulator
+
+# Some plugins go in the Mod folder instead of lib. Deal with those here:
+%global mod_plugins Mod/PartDesign
+%define name freecad
+%define github_name FreeCAD
+%define branch master
+
+Name:           %{name}
+Epoch:          1
+Version:    	0.18_pre
+Release:        {{{ git_commits_no }}}
+Summary:        A general purpose 3D CAD modeler
+Group:          Applications/Engineering
+
+License:        GPLv2+
+URL:            http://sourceforge.net/apps/mediawiki/free-cad/
+Source0:        https://github.com/%{github_name}/FreeCAD/archive/%{branch}.tar.gz
+
+BuildRequires:  Coin3
+BuildRequires:  Coin3-devel
+BuildRequires:  Inventor-devel
+BuildRequires:  OCE-devel
+BuildRequires:  OCE-draw
+BuildRequires:  boost-devel
+BuildRequires:  cmake
+BuildRequires:  desktop-file-utils
+BuildRequires:  dos2unix
+BuildRequires:  doxygen
+BuildRequires:  eigen3
+BuildRequires:  eigen3-devel
+BuildRequires:  freeimage-devel
+BuildRequires:  gettext
+BuildRequires:  git
+BuildRequires:  graphviz
+BuildRequires:  libicu-devel
+BuildRequires:  libspnav
+BuildRequires:  libspnav-devel
+BuildRequires:  med
+BuildRequires:  med-devel
+BuildRequires:  mesa-libGLU-devel
+BuildRequires:  netgen-mesher-devel
+BuildRequires:  netgen-mesher-devel-private
+BuildRequires:  pyside-tools
+BuildRequires:  python
+BuildRequires:  python-matplotlib
+BuildRequires:  python-pivy
+BuildRequires:  python-pyside
+BuildRequires:  python-pyside-devel
+BuildRequires:  python2-devel
+BuildRequires:  qt-devel
+BuildRequires:  qt-webkit-devel
+BuildRequires:  shiboken
+BuildRequires:  shiboken-devel
+BuildRequires:  smesh
+BuildRequires:  smesh-devel
+BuildRequires:  swig
+BuildRequires:  tbb-devel
+BuildRequires:  vtk-devel
+BuildRequires:  xerces-c
+BuildRequires:  xerces-c-devel
+BuildRequires:  zlib-devel
+%if 0%{?fedora} > 28
+BuildRequires:  boost-python2
+BuildRequires:  boost-python2-devel
+BuildRequires:  boost-python3
+BuildRequires:  boost-python3-devel
+BuildRequires:  mesa-libEGL-devel
+BuildRequires:  python3-matplotlib
+%endif
+
+# For appdata
+%if 0%{?fedora}
+BuildRequires:  libappstream-glib
+%endif
+
+# Packages separated because they are noarch, but not optional so require them
+# here.
+Requires:       %{name}-data = %{epoch}:%{version}-%{release}
+# Obsolete old doc package since it's required for functionality.
+Obsoletes:      %{name}-doc < 0.13-5
+
+# Needed for plugin support and is not a soname dependency.
+%if ! 0%{?rhel} <= 6 && "%{_arch}" != "ppc64"
+# python-pivy does not build on EPEL 6 ppc64.
+Requires:       python-pivy
+%endif
+Requires:       hicolor-icon-theme
+Requires:       python-matplotlib
+Requires:       python-collada
+Requires:       python-pyside
+
+# plugins and private shared libs in %%{_libdir}/freecad/lib are private;
+# prevent private capabilities being advertised in Provides/Requires
+%define plugin_regexp /^\\\(libFreeCAD.*%(for i in %{plugins}; do echo -n "\\\|$i\\\|$iGui"; done)\\\)\\\(\\\|Gui\\\)\\.so/d
+%{?filter_setup:
+%filter_provides_in %{_libdir}/%{name}/lib
+%filter_from_requires %{plugin_regexp}
+%filter_from_provides %{plugin_regexp}
+%filter_provides_in %{_libdir}/%{name}/Mod
+%filter_requires_in %{_libdir}/%{name}/Mod
+%filter_setup
+}
+
+
+%description
+FreeCAD is a general purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler, aimed
+directly at mechanical engineering and product design but also fits a wider
+range of uses in engineering, such as architecture or other engineering
+specialties. It is a feature-based parametric modeler with a modular software
+architecture which makes it easy to provide additional functionality without
+modifying the core system.
+
+
+%package data
+Summary:        Data files for FreeCAD
+BuildArch:      noarch
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description data
+Data files for FreeCAD
+
+
+%prep
+%autosetup -n FreeCAD-%{branch}
+
+# Fix encodings
+dos2unix -k src/Mod/Test/unittestgui.py \
+            ChangeLog.txt \
+            data/License.txt
+
+# Removed bundled libraries
+
+%build
+rm -rf build && mkdir build && cd build
+
+# Deal with cmake projects that tend to link excessively.
+#LDFLAGS='-Wl,--as-needed'; export LDFLAGS
+
+%if 0%{?fedora} > 27
+%define MEDFILE_INCLUDE_DIRS %{_includedir}/med/
+%else
+%define MEDFILE_INCLUDE_DIRS %{_includedir}/
+%endif
+
+%cmake -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
+       -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
+       -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
+       -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
+       -DRESOURCEDIR=%{_datadir}/%{name} \
+       -DFREECAD_USE_EXTERNAL_PIVY=TRUE \
+       -DMEDFILE_INCLUDE_DIRS=%{MEDFILE_INCLUDE_DIRS} \
+       ../
+
+sed -i 's,FCRevision      \"Unknown\",FCRevision      \"%{release} (Git)\",' src/Build/Version.h
+sed -i 's,FCRepositoryURL \"Unknown\",FCRepositoryURL \"git://github.com/FreeCAD/FreeCAD.git master\",' src/Build/Version.h
+
+make %{?_smp_mflags}
+
+%install
+cd build
+%make_install
+
+# Symlink binaries to /usr/bin
+mkdir -p %{buildroot}%{_bindir}
+pushd %{buildroot}%{_bindir}
+ln -s ../%{_lib}/%{name}/bin/FreeCAD .
+ln -s ../%{_lib}/%{name}/bin/FreeCADCmd .
+popd
+
+mkdir %{buildroot}%{_datadir}/appdata/
+mv %{buildroot}%{_libdir}/%{name}/share/metainfo/* %{buildroot}%{_datadir}/appdata/
+
+mkdir %{buildroot}%{_datadir}/applications/
+mv %{buildroot}%{_libdir}/%{name}/share/applications/* %{buildroot}%{_datadir}/applications/
+
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+mv %{buildroot}%{_libdir}/%{name}/share/icons/hicolor/scalable/apps/* %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
+
+mkdir -p %{buildroot}%{_datadir}/mime/packages/
+mv %{buildroot}%{_libdir}/%{name}/share/mime/packages/* %{buildroot}%{_datadir}/mime/packages/
+
+pushd %{buildroot}%{_libdir}/%{name}/share/
+rmdir metainfo/
+rmdir applications/
+rmdir -p mime/packages/
+rmdir -p icons/hicolor/scalable/apps/
+popd
+
+# Bug maintainers to keep %%{plugins} macro up to date.
+#
+# Make sure there are no plugins that need to be added to plugins macro
+new_plugins=`ls %{buildroot}%{_libdir}/%{name}/lib | sed -e  '%{plugin_regexp}'`
+if [ -n "$new_plugins" ]; then
+    echo -e "\n\n\n**** ERROR:\n" \
+        "\nPlugins not caught by regexp:  " $new_plugins \
+        "\n\nPlugins in %{_libdir}/%{name}/lib do not exist in" \
+         "\nspecfile %%{plugins} macro.  Please add these to" \
+         "\n%%{plugins} macro at top of specfile and rebuild.\n****\n" 1>&2
+    exit 1
+fi
+# Make sure there are no entries in the plugins macro that don't match plugins
+for p in %{plugins}; do
+    if [ -z "`ls %{buildroot}%{_libdir}/%{name}/lib/$p*.so`" ]; then
+        set +x
+        echo -e "\n\n\n**** ERROR:\n" \
+             "\nExtra entry in %%{plugins} macro with no matching plugin:" \
+             "'$p'.\n\nPlease remove from %%{plugins} macro at top of" \
+             "\nspecfile and rebuild.\n****\n" 1>&2
+        exit 1
+    fi
+done
+
+%check
+%{?fedora:appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/appdata/*.appdata.xml}
+
+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor/scalable/apps &>/dev/null || :
+
+
+%files
+%license data/License.txt
+%doc ChangeLog.txt
+%exclude %{_docdir}/%{name}/%{name}.*
+%exclude %{_docdir}/%{name}/ThirdPartyLibraries.html
+%{_bindir}/*
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/bin/
+%{_libdir}/%{name}/lib/
+%{_libdir}/%{name}/Mod/
+%{_libdir}/%{name}/Ext/
+%{_datadir}/applications/*
+%{_datadir}/icons/hicolor/scalable/apps/*
+%{_datadir}/appdata/*
+%{_datadir}/mime/packages/*
+
+%files data
+%{_datadir}/%{name}/
+%{_docdir}/%{name}/%{name}.q*
@@ -0,0 +1,2 @@
+[rpkg]
+auto_pack = False
@@ -0,0 +1,4 @@
+function git_commits_no {
+	commits=$(curl -s 'https://api.github.com/repos/FreeCAD/FreeCAD/compare/120ca87015...master' | grep "ahead_by" | sed -s 's/ //g' | sed -s 's/"ahead_by"://' | sed -s 's/,//')
+	echo $((commits + 1))
+}
@@ -1,66 +0,0 @@
-#!/bin/sh
-# (c) 2009 Werner Mayer  GPL
-
-# This script creates a new source tarball and extracts it in the build
-# directory. The source directory and tarball are renamed to  Debian-
-# conform names.
-# Then the debian directory is created from a diff file and prepared for
-# the new build. For this the following steps are executed:
-#
-# 1. cd freecad-X.Y.xyz
-# 2. patch -p1 < .../debian/diff/freecad_hardy.diff
-# 3. dch -v X.Y.xyz-1hardy1 "New release for Ubuntu 8.04 (Hardy Heron)"
-# 4. debuild
-#
-# Example how to work with sed can be found here: 
-# http://www.grymoire.com/Unix/Sed.html
-
-# global settings
-TMP_PATH=/tmp
-MAJ=0
-MIN=13
-
-# go to root directory
-CUR_DIR=$PWD
-verz=`dirname $(readlink -f ${0})`
-cd $verz && cd ..
-
-# http://blog.marcingil.com/2011/11/creating-build-numbers-using-git-commits/
-if git log -1 >/dev/null 2>&1; then
-	REV=`git rev-list HEAD | wc -l | sed -e 's/ *//g' | xargs -n1 printf %04d`
-else
-	REV=0
-fi
-
-SRC_DIR=$PWD
-
-# Prepare source tarball and unpack it in build directory
-cd $CUR_DIR
-make dist-git
-cd $verz && cd ..
-rm -rf $TMP_PATH/freecad-$REV
-mkdir $TMP_PATH/freecad-$REV
-mv freecad-$MAJ.$MIN.$REV.tar.gz $TMP_PATH/freecad-$REV/freecad_$MAJ.$MIN.$REV.orig.tar.gz
-cd $TMP_PATH/freecad-$REV
-tar -xzf freecad_$MAJ.$MIN.$REV.orig.tar.gz
-cd freecad-$MAJ.$MIN.$REV
-#rm -rf src/CXX
-#rm -rf src/zipios++
-
-# Prepare debian folder and set the revision number in debian/changelog
-# for package versioning
-LSB_RELS=`lsb_release -r | cut -f2`
-LSB_DESC=`lsb_release -d | cut -f2`
-LSB_CODE=`lsb_release -c | cut -f2`
-patch -p1 < $SRC_DIR/package/debian/diff/freecad_$LSB_CODE.diff
-DEBEMAIL="wmayer@users.sourceforge.net"
-export DEBEMAIL
-dch -v $MAJ.$MIN.$REV-1"$LSB_CODE"1 "New release for $LSB_DESC ($LSB_CODE)"
-debuild
-cd ..
-gunzip freecad_$MAJ.$MIN.$REV-1"$LSB_CODE"1.diff.gz
-mv freecad_$MAJ.$MIN.$REV-1"$LSB_CODE"1.diff $SRC_DIR/package/debian/freecad_$LSB_CODE.diff
-
-
-exit 0
-
@@ -0,0 +1,6 @@
+matplotlib==2.2.3; python_version < '3.0'
+matplotlib==3.0.2; python_version >= '3.0'
+PySide==1.2.4
+# PySide2==5.12.0
+Shiboken==1.2.2
+six==1.12.0 
@@ -6,6 +6,11 @@ import unittest

 from kdtree import KDTree_2Int, KDTree_4Int, KDTree_3Float, KDTree_4Float, KDTree_6Float

+try:
+    long
+except NameError:
+    long = int
+

 class KDTree_2IntTestCase(unittest.TestCase):
    def test_empty(self):
@@ -1,10 +1,10 @@
 # SGEOM cmake build file
 #PROJECT(SMESH Fortran CXX)

-SET(SMESH_VERSION_MAJOR 5)
-SET(SMESH_VERSION_MINOR 1)
-SET(SMESH_VERSION_PATCH 2)
-SET(SMESH_VERSION_TWEAK 2)
+SET(SMESH_VERSION_MAJOR 7)  # see main CMakeLists.txt of FreeCAD
+SET(SMESH_VERSION_MINOR 7)
+SET(SMESH_VERSION_PATCH 1)
+SET(SMESH_VERSION_TWEAK 0)

 if(CMAKE_COMPILER_IS_GNUCXX)
    set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -Wno-sign-compare -Wno-reorder -Wno-switch -Wno-unused-variable -Wno-unused-but-set-variable -Wno-comment -Wno-unused-parameter")
@@ -382,10 +382,14 @@ TARGET_LINK_LIBRARIES(NETGENPlugin SMDS SMESHDS SMESH StdMeshers ${SMESH_LIBS} )

 SET_BIN_DIR(NETGENPlugin NETGENPlugin)
 if(WIN32)
-    set_target_properties(NETGENPlugin PROPERTIES COMPILE_FLAGS "-DNETGENPLUGIN_EXPORTS -DNO_PARALLEL_THREADS -DOCCGEOMETRY -DNETGEN_VERSION=${NETGEN_VERSION}")
+    set_target_properties(NETGENPlugin PROPERTIES COMPILE_FLAGS "-DNETGENPLUGIN_EXPORTS -DNO_PARALLEL_THREADS -DOCCGEOMETRY -DNETGEN_VERSION=${NETGEN_VERSION_C}")
 else()
    set_target_properties(NETGENPlugin PROPERTIES COMPILE_FLAGS "${NETGEN_CXX_FLAGS}")
 endif(WIN32)
+IF(NOT NETGEN_VERSION_C LESS NETGEN_VERSION_62) # Version >= 6.2
+    set_target_properties(NETGENPlugin PROPERTIES CXX_STANDARD_REQUIRED ON)
+    set_target_properties(NETGENPlugin PROPERTIES CXX_STANDARD 14) # Standard std=c++1y could work aswell
+ENDIF()

 endif (BUILD_FEM_NETGEN)

@@ -27,12 +27,10 @@
 #ifndef _SMDSAbs_ElementType_HeaderFile
 #define _SMDSAbs_ElementType_HeaderFile

-#include <cstddef>
-
 ///////////////////////////////////////////////////////////////////////////////
 /// Type (node, edge, face or volume) of elements
 ///////////////////////////////////////////////////////////////////////////////
-enum SMDSAbs_ElementType : size_t
+enum SMDSAbs_ElementType
  {
    SMDSAbs_All,
    SMDSAbs_Node,
@@ -45,7 +43,7 @@ enum SMDSAbs_ElementType : size_t
  };

 /*! enumeration for element geometry type */
-enum SMDSAbs_GeometryType : size_t
+enum SMDSAbs_GeometryType
  {
    // 0D element
    SMDSGeom_POINT,
@@ -69,7 +67,7 @@ enum SMDSAbs_GeometryType : size_t
  };


-enum SMDSAbs_ElementOrder : size_t
+enum SMDSAbs_ElementOrder
 {
  ORDER_ANY,          /*! entities of any order */
  ORDER_LINEAR,       /*! entities of 1st order */
@@ -79,7 +77,7 @@ enum SMDSAbs_ElementOrder : size_t
 /*!
 * Enumeration of entity type used in mesh info array
 */
-enum SMDSAbs_EntityType : size_t
+enum SMDSAbs_EntityType
 {
  SMDSEntity_Node,
  SMDSEntity_0D,
@@ -30,6 +30,7 @@

 #include "SMESH_SMESH.hxx"

+#include "SMDS_MeshNode.hxx"
 #include "SMDSAbs_ElementType.hxx"
 #include "SMESH_Comment.hxx"
 #include "SMESH_ComputeError.hxx"
@@ -45,7 +46,6 @@
 #include <map>
 #include <set>

-class SMDS_MeshNode;
 class SMESHDS_Mesh;
 class SMESHDS_SubMesh;
 class SMESH_Gen;
@@ -60,8 +60,8 @@ typedef std::set<int> TSetOfInt;
 class SMESH_EXPORT  SMESH_Gen
 {
 public:
- 
-  static SMESH_Gen* get();
+  SMESH_Gen();
+  ~SMESH_Gen();

  SMESH_Mesh* CreateMesh(int theStudyId, bool theIsEmbeddedMode);

@@ -158,12 +158,6 @@ public:
  // std::map < int, SMESH_2D_Algo * >_map2D_Algo;
  // std::map < int, SMESH_3D_Algo * >_map3D_Algo;

-protected:
-  //Generator is designed to be a singleton, hence constructor and destructor are not allowed to be used
-  SMESH_Gen();
-  ~SMESH_Gen();
-  static SMESH_Gen* generator;
-  
 private:

  int _localId;                         // unique Id of created objects, within SMESH_Gen entity
@@ -30,7 +30,7 @@

 #include "SMESH_StdMeshers.hxx"

-#include "SMDS_MeshElement.hxx"
+#include "SMDS_MeshNode.hxx"

 #include <TopTools_DataMapOfShapeShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
@@ -291,7 +291,7 @@ namespace
    try {
      axes = gp_Ax2( p0, normal, v01 );
    }
-    catch ( Standard_Failure ) {
+    catch ( Standard_Failure &) {
      return false;
    }
    for ( size_t i = 0; i < nbNodes; ++i )
@@ -79,8 +79,8 @@ bool SMESH_File::open()
  if ( !_map && length > 0 )
  {
 #ifdef WIN32
-    _file = CreateFile(_name.data(), GENERIC_READ, FILE_SHARE_READ,
-                       NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    _file = CreateFileA(_name.data(), GENERIC_READ, FILE_SHARE_READ,
+                        NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
    bool ok = ( _file != INVALID_HANDLE_VALUE );
 #else
    _file = ::open(_name.data(), O_RDONLY );
@@ -292,7 +292,7 @@ bool SMESH_File::openForWriting()
 {
 #ifdef WIN32

-  _file = CreateFile( _name.c_str(),          // name of the write
+  _file = CreateFileA(_name.c_str(),          // name of the write
                      GENERIC_WRITE,          // open for writing
                      0,                      // do not share
                      NULL,                   // default security
@@ -64,7 +64,7 @@ namespace nglib {

 #include <occgeom.hpp>
 #include <meshing.hpp>
-//#include <meshtype.hpp>
+//#include <meshing/meshtype.hpp>
 namespace netgen {
 #if NETGEN_VERSION >= NETGEN_VERSION_STRING(6,2)
  DLL_HEADER extern int OCCGenerateMesh (OCCGeometry&, shared_ptr<Mesh>&, MeshingParameters&);
@@ -263,6 +263,7 @@ int SMDS_MeshNode::NbNodes() const

 double* SMDS_MeshNode::getCoord() const
 {
+#if 0
  double coord[3];
  double *coord2;
  vtkUnstructuredGrid *grid;
@@ -288,6 +289,9 @@ double* SMDS_MeshNode::getCoord() const
     return coord2;
  }
  return 0;
+#else
+  return SMDS_Mesh::_meshList[myMeshId]->getGrid()->GetPoint(myVtkID);
+#endif
 }

 double SMDS_MeshNode::X() const
@@ -68,8 +68,10 @@ SMDS_VtkCellIteratorToUNV::SMDS_VtkCellIteratorToUNV(SMDS_Mesh* mesh, int vtkCel

  _vtkIdList = vtkIdList::New();
  vtkIdType* pts;
+  vtkIdType npts;
  vtkUnstructuredGrid* grid = _mesh->getGrid();
-  grid->GetCellPoints((vtkIdType)_cellId, (vtkIdType&)_nbNodes, pts);
+  grid->GetCellPoints((vtkIdType)_cellId, npts, pts);
+  _nbNodes = static_cast<int>(npts);
  _vtkIdList->SetNumberOfIds(_nbNodes);
  const int *ids = 0;
  switch (_type)
@@ -522,7 +522,7 @@ GeomAbs_Shape SMESH_Algo::Continuity(TopoDS_Edge E1,
    OCC_CATCH_SIGNALS;
    return BRepLProp::Continuity(C1, C2, u1, u2, tol, angTol);
  }
-  catch (Standard_Failure) {
+  catch (Standard_Failure&) {
  }
  return GeomAbs_C0;
 }
@@ -55,7 +55,6 @@ using namespace std;

 //#include <vtkDebugLeaks.h>

-SMESH_Gen* SMESH_Gen::generator = nullptr;

 //=============================================================================
 /*!
@@ -75,15 +74,6 @@ SMESH_Gen::SMESH_Gen()
  //vtkDebugLeaks::SetExitError(0);
 }

-SMESH_Gen* SMESH_Gen::get() {
-
-    if(!generator)
-        generator = new SMESH_Gen();
-    
-    return generator;
-}
-
-
 //=============================================================================
 /*!
 * Destructor
@@ -1037,7 +1027,7 @@ std::vector< std::string > SMESH_Gen::GetPluginXMLPaths()
      xmlPath += sep + plugin + ".xml";
      bool fileOK;
 #ifdef WIN32
-      fileOK = (GetFileAttributes(xmlPath.c_str()) != INVALID_FILE_ATTRIBUTES);
+      fileOK = (GetFileAttributesA(xmlPath.c_str()) != INVALID_FILE_ATTRIBUTES);
 #else
      fileOK = (access(xmlPath.c_str(), F_OK) == 0);
 #endif
@@ -1371,7 +1371,7 @@ double SMESH_MeshAlgos::GetDistance( const SMDS_MeshFace* face,
  try {
    tgtCS = gp_Ax3( xyz[0], OZ, OX );
  }
-  catch ( Standard_Failure ) {
+  catch ( Standard_Failure &) {
    return badDistance;
  }
  trsf.SetTransformation( tgtCS );
@@ -11178,7 +11178,7 @@ double SMESH_MeshEditor::OrientedAngle(const gp_Pnt& p0, const gp_Pnt& p1, const
  try {
    return n2.AngleWithRef(n1, vref);
  }
-  catch ( Standard_Failure ) {
+  catch ( Standard_Failure &) {
  }
  return Max( v1.Magnitude(), v2.Magnitude() );
 }
@@ -4445,7 +4445,7 @@ namespace { // Structures used by FixQuadraticElements()
            if ( curvNorm * D2 > 0 )
              continue; // convex edge
          }
-          catch ( Standard_Failure )
+          catch ( Standard_Failure &)
          {
            continue;
          }
@@ -4558,7 +4558,7 @@ namespace { // Structures used by FixQuadraticElements()
            if ( concaveU || concaveV )
              concaveFaces.push_back( face );
          }
-          catch ( Standard_Failure )
+          catch ( Standard_Failure &)
          {
            concaveFaces.push_back( face );
          }
@@ -5081,7 +5081,7 @@ void SMESH_MesherHelper::FixQuadraticElements(SMESH_ComputeErrorPtr& compError,
              try {
                gp_Vec x = x01.Normalized() + x12.Normalized();
                trsf.SetTransformation( gp_Ax3( gp::Origin(), link1->Normal(), x), gp_Ax3() );
-              } catch ( Standard_Failure ) {
+              } catch ( Standard_Failure &) {
                trsf.Invert();
              }
              move.Transform(trsf);
@@ -1377,7 +1377,7 @@ const TopoDS_Shape& SMESHDS_Mesh::IndexToShape(int ShapeIndex) const
    if ( ShapeIndex > 0 )
      return myIndexToShape.FindKey(ShapeIndex);
  }
-  catch ( Standard_OutOfRange )
+  catch ( Standard_OutOfRange &)
  {
  }
  static TopoDS_Shape nullShape;
@@ -1466,7 +1466,7 @@ bool _QuadFaceGrid::GetNormal( const TopoDS_Vertex& v, gp_Vec& n ) const
        n = d1u.Crossed( d1v );
        return true;
      }
-      catch (Standard_Failure) {
+      catch (Standard_Failure&) {
        return false;
      }
    }
@@ -64,7 +64,7 @@ bool Function::value( const double, double& f ) const
      OCC_CATCH_SIGNALS;
 #endif
      f = pow( 10., f );
-    } catch(Standard_Failure) {
+    } catch(Standard_Failure&) {
      f = 0.0;
      ok = false;
    }
@@ -196,7 +196,7 @@ FunctionExpr::FunctionExpr( const char* str, const int conv )
 #endif
    myExpr = ExprIntrp_GenExp::Create();
    myExpr->Process( ( Standard_CString )str );
-  } catch(Standard_Failure) {
+  } catch(Standard_Failure&) {
    ok = false;
  }

@@ -230,7 +230,7 @@ bool FunctionExpr::value( const double t, double& f ) const
    OCC_CATCH_SIGNALS;
 #endif
    f = myExpr->Expression()->Evaluate( myVars, myValues );
-  } catch(Standard_Failure) {
+  } catch(Standard_Failure&) {
    f = 0.0;
    ok = false;
  }
@@ -250,7 +250,7 @@ double FunctionExpr::integral( const double a, const double b ) const
      ( *static_cast<math_Function*>( const_cast<FunctionExpr*> (this) ), a, b, 20 );
    if( _int.IsDone() )
      res = _int.Value();
-  } catch(Standard_Failure) {
+  } catch(Standard_Failure&) {
    res = 0.0;
    MESSAGE( "Exception in integral calculating" );
  }
@@ -232,7 +232,7 @@ void StdMeshers_NumberOfSegments::SetTableFunction(const vector<double>& table)
        OCC_CATCH_SIGNALS;
 #endif
        val = pow( 10.0, val );
-      } catch(Standard_Failure) {
+      } catch(Standard_Failure&) {
        throw SALOME_Exception( LOCALIZED( "invalid value"));
        return;
      }
@@ -327,7 +327,7 @@ bool process( const TCollection_AsciiString& str, int convMode,
 #endif
    myExpr = ExprIntrp_GenExp::Create();
    myExpr->Process( str.ToCString() );
-  } catch(Standard_Failure) {
+  } catch(Standard_Failure&) {
    parsed_ok = false;
  }

@@ -77,6 +77,7 @@
 #include <Base/RotationPy.h>
 #include <Base/Sequencer.h>
 #include <Base/Tools.h>
+#include <Base/Translate.h>
 #include <Base/UnitsApi.h>
 #include <Base/QuantityPy.h>
 #include <Base/UnitPy.h>
@@ -120,7 +121,6 @@

 #include <boost/tokenizer.hpp>
 #include <boost/token_functions.hpp>
-#include <boost/signals.hpp>
 #include <boost/bind.hpp>
 #include <boost/version.hpp>
 #include <QDir>
@@ -138,6 +138,10 @@ using namespace boost::program_options;
 #include <App/CMakeScript.h>

 #ifdef _MSC_VER // New handler for Microsoft Visual C++ compiler
+# if !defined(_DEBUG) && defined(HAVE_SEH)
+# define FC_SE_TRANSLATOR
+# endif
+
 # include <new.h>
 # include <eh.h> // VC exception handling
 #else // Ansi C/C++ new handler
@@ -206,12 +210,43 @@ PyDoc_STRVAR(FreeCAD_doc,
 PyDoc_STRVAR(Console_doc,
     "FreeCAD Console\n"
    );
-    
+
 PyDoc_STRVAR(Base_doc,
    "The Base module contains the classes for the geometric basics\n"
    "like vector, matrix, bounding box, placement, rotation, axis, ...\n"
    );

+#if PY_MAJOR_VERSION >= 3
+// This is called via the PyImport_AppendInittab mechanism called
+// during initialization, to make the built-in __FreeCADBase__
+// module known to Python.
+PyMODINIT_FUNC
+init_freecad_base_module(void)
+{
+    static struct PyModuleDef BaseModuleDef = {
+        PyModuleDef_HEAD_INIT,
+        "__FreeCADBase__", Base_doc, -1,
+        NULL, NULL, NULL, NULL, NULL
+    };
+    return PyModule_Create(&BaseModuleDef);
+}
+
+// Set in inside Application
+static PyMethodDef* __AppMethods = nullptr;
+
+PyMODINIT_FUNC
+init_freecad_module(void)
+{
+    static struct PyModuleDef FreeCADModuleDef = {
+        PyModuleDef_HEAD_INIT,
+        "FreeCAD", FreeCAD_doc, -1,
+        __AppMethods,
+        NULL, NULL, NULL, NULL
+    };
+    return PyModule_Create(&FreeCADModuleDef);
+}
+#endif
+
 Application::Application(std::map<std::string,std::string> &mConfig)
  : _mConfig(mConfig), _pActiveDoc(0)
 {
@@ -223,14 +258,15 @@ Application::Application(std::map<std::string,std::string> &mConfig)
    // setting up Python binding
    Base::PyGILStateLocker lock;
 #if PY_MAJOR_VERSION >= 3
-    static struct PyModuleDef FreeCADModuleDef = {
-        PyModuleDef_HEAD_INIT,
-        "FreeCAD", FreeCAD_doc, -1,
-        Application::Methods,
-        NULL, NULL, NULL, NULL
-    };
-    PyObject* pAppModule = PyModule_Create(&FreeCADModuleDef);
-    _PyImport_FixupBuiltin(pAppModule, "FreeCAD");
+    PyObject* modules = PyImport_GetModuleDict();
+
+    __AppMethods = Application::Methods;
+    PyObject* pAppModule = PyImport_ImportModule ("FreeCAD");
+    if (!pAppModule) {
+        PyErr_Clear();
+        pAppModule = init_freecad_module();
+        PyDict_SetItemString(modules, "FreeCAD", pAppModule);
+    }
 #else
    PyObject* pAppModule = Py_InitModule3("FreeCAD", Application::Methods, FreeCAD_doc);
 #endif
@@ -265,13 +301,12 @@ Application::Application(std::map<std::string,std::string> &mConfig)
    // remove these types from the FreeCAD module.

 #if PY_MAJOR_VERSION >= 3
-    static struct PyModuleDef BaseModuleDef = {
-        PyModuleDef_HEAD_INIT,
-        "__FreeCADBase__", Base_doc, -1,
-        NULL, NULL, NULL, NULL, NULL
-    };
-    PyObject* pBaseModule = PyModule_Create(&BaseModuleDef);
-    _PyImport_FixupBuiltin(pBaseModule, "__FreeCADBase__");
+    PyObject* pBaseModule = PyImport_ImportModule ("__FreeCADBase__");
+    if (!pBaseModule) {
+        PyErr_Clear();
+        pBaseModule = init_freecad_base_module();
+        PyDict_SetItemString(modules, "__FreeCADBase__", pBaseModule);
+    }
 #else
    PyObject* pBaseModule = Py_InitModule3("__FreeCADBase__", NULL, Base_doc);
 #endif
@@ -296,6 +331,11 @@ Application::Application(std::map<std::string,std::string> &mConfig)
    Py_INCREF(pConsoleModule);
    PyModule_AddObject(pAppModule, "Console", pConsoleModule);

+    // Translate module
+    PyObject* pTranslateModule = (new Base::Translate)->module().ptr();
+    Py_INCREF(pTranslateModule);
+    PyModule_AddObject(pAppModule, "Qt", pTranslateModule);
+
    //insert Units module
 #if PY_MAJOR_VERSION >= 3
    static struct PyModuleDef UnitsModuleDef = {
@@ -385,13 +425,23 @@ Document* Application::newDocument(const char * Name, const char * UserName)


    // connect the signals to the application for the new document
+    _pActiveDoc->signalBeforeChange.connect(boost::bind(&App::Application::slotBeforeChangeDocument, this, _1, _2));
+    _pActiveDoc->signalChanged.connect(boost::bind(&App::Application::slotChangedDocument, this, _1, _2));
    _pActiveDoc->signalNewObject.connect(boost::bind(&App::Application::slotNewObject, this, _1));
    _pActiveDoc->signalDeletedObject.connect(boost::bind(&App::Application::slotDeletedObject, this, _1));
+    _pActiveDoc->signalBeforeChangeObject.connect(boost::bind(&App::Application::slotBeforeChangeObject, this, _1, _2));
    _pActiveDoc->signalChangedObject.connect(boost::bind(&App::Application::slotChangedObject, this, _1, _2));
    _pActiveDoc->signalRelabelObject.connect(boost::bind(&App::Application::slotRelabelObject, this, _1));
    _pActiveDoc->signalActivatedObject.connect(boost::bind(&App::Application::slotActivatedObject, this, _1));
    _pActiveDoc->signalUndo.connect(boost::bind(&App::Application::slotUndoDocument, this, _1));
    _pActiveDoc->signalRedo.connect(boost::bind(&App::Application::slotRedoDocument, this, _1));
+    _pActiveDoc->signalRecomputedObject.connect(boost::bind(&App::Application::slotRecomputedObject, this, _1));
+    _pActiveDoc->signalRecomputed.connect(boost::bind(&App::Application::slotRecomputed, this, _1));
+    _pActiveDoc->signalOpenTransaction.connect(boost::bind(&App::Application::slotOpenTransaction, this, _1, _2));
+    _pActiveDoc->signalCommitTransaction.connect(boost::bind(&App::Application::slotCommitTransaction, this, _1));
+    _pActiveDoc->signalAbortTransaction.connect(boost::bind(&App::Application::slotAbortTransaction, this, _1));
+    _pActiveDoc->signalStartSave.connect(boost::bind(&App::Application::slotStartSaveDocument, this, _1, _2));
+    _pActiveDoc->signalFinishSave.connect(boost::bind(&App::Application::slotFinishSaveDocument, this, _1, _2));

    // make sure that the active document is set in case no GUI is up
    {
@@ -941,6 +991,16 @@ std::map<std::string, std::string> Application::getExportFilters(void) const

 //**************************************************************************
 // signaling
+void Application::slotBeforeChangeDocument(const App::Document& doc, const Property& prop)
+{
+    this->signalBeforeChangeDocument(doc, prop);
+}
+
+void Application::slotChangedDocument(const App::Document& doc, const Property& prop)
+{
+    this->signalChangedDocument(doc, prop);
+}
+
 void Application::slotNewObject(const App::DocumentObject&O)
 {
    this->signalNewObject(O);
@@ -951,6 +1011,11 @@ void Application::slotDeletedObject(const App::DocumentObject&O)
    this->signalDeletedObject(O);
 }

+void Application::slotBeforeChangeObject(const DocumentObject& O, const Property& Prop)
+{
+    this->signalBeforeChangeObject(O, Prop);
+}
+
 void Application::slotChangedObject(const App::DocumentObject&O, const App::Property& P)
 {
    this->signalChangedObject(O,P);
@@ -976,6 +1041,41 @@ void Application::slotRedoDocument(const App::Document& d)
    this->signalRedoDocument(d);
 }

+void Application::slotRecomputedObject(const DocumentObject& obj)
+{
+    this->signalObjectRecomputed(obj);
+}
+
+void Application::slotRecomputed(const Document& doc)
+{
+    this->signalRecomputed(doc);
+}
+
+void Application::slotOpenTransaction(const Document& d, string s)
+{
+    this->signalOpenTransaction(d, s);
+}
+
+void Application::slotCommitTransaction(const Document& d)
+{
+    this->signalCommitTransaction(d);
+}
+
+void Application::slotAbortTransaction(const Document& d)
+{
+    this->signalAbortTransaction(d);
+}
+
+void Application::slotStartSaveDocument(const App::Document& doc, const std::string& filename)
+{
+    this->signalStartSaveDocument(doc, filename);
+}
+
+void Application::slotFinishSaveDocument(const App::Document& doc, const std::string& filename)
+{
+    this->signalFinishSaveDocument(doc, filename);
+}
+
 //**************************************************************************
 // Init, Destruct and singleton

@@ -1015,7 +1115,7 @@ void Application::destruct(void)
    _pcSysParamMngr = 0;
    _pcUserParamMngr = 0;

-    // not initialized or doubel destruct!
+    // not initialized or double destruct!
    assert(_pcSingleton);
    delete _pcSingleton;

@@ -1111,11 +1211,11 @@ void printBacktrace(size_t skip=0)
 void segmentation_fault_handler(int sig)
 {
 #if defined(FC_OS_LINUX)
+    (void)sig;
    std::cerr << "Program received signal SIGSEGV, Segmentation fault.\n";
    printBacktrace(2);
    exit(1);
-#endif
-
+#else
    switch (sig) {
        case SIGSEGV:
            std::cerr << "Illegal storage access..." << std::endl;
@@ -1133,9 +1233,10 @@ void segmentation_fault_handler(int sig)
            std::cerr << "Unknown error occurred..." << std::endl;
            break;
    }
+#endif // FC_OS_LINUX
 }

-void my_terminate_handler()
+void unhandled_exception_handler()
 {
    std::cerr << "Terminating..." << std::endl;
 }
@@ -1151,23 +1252,28 @@ void unexpection_error_handler()
 #endif
 }

-#ifdef _MSC_VER // Microsoft compiler
-
-void my_trans_func( unsigned int code, EXCEPTION_POINTERS* pExp )
+#if defined(FC_SE_TRANSLATOR) // Microsoft compiler
+void my_se_translator_filter(unsigned int code, EXCEPTION_POINTERS* pExp)
 {
+    Q_UNUSED(pExp)
+    switch (code)
+    {
+    case EXCEPTION_ACCESS_VIOLATION:
+        throw Base::AccessViolation();
+        break;
+    case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+    case EXCEPTION_INT_DIVIDE_BY_ZERO:
+        throw Base::DivisionByZeroError("Division by zero!");
+        break;
+    }

-   //switch (code)
-   //{
-   //    case FLT_DIVIDE_BY_ZERO :
-   //       //throw CMyFunkyDivideByZeroException(code, pExp);
-   //       throw Base::DivisionByZeroError("Devision by zero!");
-   //    break;
-   //}
-
-   // general C++ SEH exception for things we don't need to handle separately....
-   throw Base::RuntimeError("my_trans_func()");
+    std::stringstream str;
+    str << "SEH exception of type: " << code;
+    // general C++ SEH exception for things we don't need to handle separately....
+    throw Base::RuntimeError(str.str());
 }
 #endif
+
 void Application::init(int argc, char ** argv)
 {
    try {
@@ -1183,13 +1289,14 @@ void Application::init(int argc, char ** argv)
 #if defined (_MSC_VER) // Microsoft compiler
        std::signal(SIGSEGV,segmentation_fault_handler);
        std::signal(SIGABRT,segmentation_fault_handler);
-        std::set_terminate(my_terminate_handler);
+        std::set_terminate(unhandled_exception_handler);
        std::set_unexpected(unexpection_error_handler);
-//        _set_se_translator(my_trans_func);
 #elif defined(FC_OS_LINUX)
        std::signal(SIGSEGV,segmentation_fault_handler);
 #endif
-
+#if defined(FC_SE_TRANSLATOR)
+        _set_se_translator(my_se_translator_filter);
+#endif
        initTypes();

 #if (BOOST_VERSION < 104600) || (BOOST_FILESYSTEM_VERSION == 2)
@@ -1342,11 +1449,11 @@ void Application::initTypes(void)
    new ExceptionProducer<Base::AbortException>;
    new ExceptionProducer<Base::XMLBaseException>;
    new ExceptionProducer<Base::XMLParseException>;
+    new ExceptionProducer<Base::XMLAttributeError>;
    new ExceptionProducer<Base::FileException>;
    new ExceptionProducer<Base::FileSystemError>;
    new ExceptionProducer<Base::BadFormatError>;
    new ExceptionProducer<Base::MemoryException>;
-    new ExceptionProducer<Base::MemoryException>;
    new ExceptionProducer<Base::AccessViolation>;
    new ExceptionProducer<Base::AbnormalProgramTermination>;
    new ExceptionProducer<Base::UnknownProgramOption>;
@@ -1356,6 +1463,7 @@ void Application::initTypes(void)
    new ExceptionProducer<Base::IndexError>;
    new ExceptionProducer<Base::AttributeError>;
    new ExceptionProducer<Base::RuntimeError>;
+    new ExceptionProducer<Base::BadGraphError>;
    new ExceptionProducer<Base::NotImplementedError>;
    new ExceptionProducer<Base::DivisionByZeroError>;
    new ExceptionProducer<Base::ReferencesError>;
@@ -1366,6 +1474,7 @@ void Application::initTypes(void)
    new ExceptionProducer<Base::UnderflowError>;
    new ExceptionProducer<Base::UnitsMismatchError>;
    new ExceptionProducer<Base::CADKernelError>;
+    new ExceptionProducer<Base::RestoreError>;
 }

 void Application::initConfig(int argc, char ** argv)
@@ -1416,6 +1525,10 @@ void Application::initConfig(int argc, char ** argv)
 #   endif

    // init python
+#if PY_MAJOR_VERSION >= 3
+    PyImport_AppendInittab ("FreeCAD", init_freecad_module);
+    PyImport_AppendInittab ("__FreeCADBase__", init_freecad_base_module);
+#endif
    mConfig["PythonSearchPath"] = Interpreter().init(argc,argv);

    // Parse the options that have impact on the init process
@@ -1426,7 +1539,7 @@ void Application::initConfig(int argc, char ** argv)
    _pConsoleObserverStd = new ConsoleObserverStd();
    Console().AttachObserver(_pConsoleObserverStd);
    if (mConfig["Verbose"] == "Strict")
-        Console().SetMode(ConsoleSingleton::Verbose);
+        Console().UnsetConsoleMode(ConsoleSingleton::Verbose);

    // file logging Init ===========================================================
    if (mConfig["LoggingFile"] == "1") {
@@ -1456,29 +1569,33 @@ void Application::initConfig(int argc, char ** argv)
    auto loglevelParam = _pcUserParamMngr->GetGroup("BaseApp/LogLevels");
    const auto &loglevels = loglevelParam->GetIntMap();
    bool hasDefault = false;
-    for(const auto &v : loglevels) {
-        if(v.first == "Default") {
+    for (const auto &v : loglevels) {
+        if (v.first == "Default") {
 #ifndef FC_DEBUG
-            if(v.second>=0) {
+            if (v.second>=0) {
                hasDefault = true;
                Base::Console().SetDefaultLogLevel(v.second);
            }
 #endif
-        }else if(v.first == "DebugDefault") {
+        }
+        else if (v.first == "DebugDefault") {
 #ifdef FC_DEBUG
-            if(v.second>=0) {
+            if (v.second>=0) {
                hasDefault = true;
                Base::Console().SetDefaultLogLevel(v.second);
            }
 #endif
-        }else
+        }
+        else {
            *Base::Console().GetLogLevel(v.first.c_str()) = v.second;
+        }
    }
-    if(!hasDefault) {
+
+    if (!hasDefault) {
 #ifdef FC_DEBUG
-        loglevelParam->SetInt("DebugDefault",Base::Console().LogLevel(-1));
+        loglevelParam->SetInt("DebugDefault", Base::Console().LogLevel(-1));
 #else
-        loglevelParam->SetInt("Default",Base::Console().LogLevel(-1));
+        loglevelParam->SetInt("Default", Base::Console().LogLevel(-1));
 #endif
    }

@@ -1539,6 +1656,12 @@ void Application::initApplication(void)
    ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
       ("User parameter:BaseApp/Preferences/Units");
    UnitsApi::setSchema((UnitSystem)hGrp->GetInt("UserSchema",0));
+    UnitsApi::setDecimals(hGrp->GetInt("Decimals", Base::UnitsApi::getDecimals()));
+
+    // In case we are using fractional inches, get user setting for min unit
+    int denom = hGrp->GetInt("FracInch", Base::QuantityFormat::getDefaultDenominator());
+    Base::QuantityFormat::setDefaultDenominator(denom);
+

 #if defined (_DEBUG)
    Console().Log("Application is built with debug information\n");
@@ -1552,7 +1675,7 @@ void Application::initApplication(void)
        ObjectLabelObserver::instance();
    }
    catch (const Base::Exception& e) {
-        Base::Console().Error("%s\n", e.what());
+        e.ReportException();
    }
 }

@@ -1619,7 +1742,7 @@ std::list<std::string> Application::processFiles(const std::list<std::string>& f
                    processed.push_back(*it);
                    Base::Console().Log("Command line open: %s.open(u\"%s\")\n",mods.front().c_str(),escapedstr.c_str());
                }
-                else {
+                else if (file.exists()) {
                    Console().Warning("File format not supported: %s \n", file.filePath().c_str());
                }
            }
@@ -1642,12 +1765,21 @@ void Application::processCmdLineFiles(void)
 {
    // process files passed to command line
    std::list<std::string> files = getCmdLineFiles();
-    processFiles(files);
+    std::list<std::string> processed = processFiles(files);

    if (files.empty()) {
        if (mConfig["RunMode"] == "Exit")
            mConfig["RunMode"] = "Cmd";
    }
+    else if (processed.empty() && files.size() == 1 && mConfig["RunMode"] == "Cmd") {
+        // In case we are in console mode and the argument is not a file but Python code
+        // then execute it. This is to behave like the standard Python executable.
+        Base::FileInfo file(files.front());
+        if (!file.exists()) {
+            Interpreter().runString(files.front().c_str());
+            mConfig["RunMode"] = "Exit";
+        }
+    }

    const std::map<std::string,std::string>& cfg = Application::Config();
    std::map<std::string,std::string>::const_iterator it = cfg.find("SaveFile");
@@ -2261,7 +2393,7 @@ void Application::ExtractUserPath()

 #elif defined(FC_OS_WIN32)
    WCHAR szPath[MAX_PATH];
-    TCHAR dest[MAX_PATH*3];
+    char dest[MAX_PATH*3];
    // Get the default path where we can save our documents. It seems that
    // 'CSIDL_MYDOCUMENTS' doesn't work on all machines, so we use 'CSIDL_PERSONAL'
    // which does the same.
@@ -2365,8 +2497,8 @@ std::string Application::FindHomePath(const char* sCall)
            absPath = path;
    }
    else {
-        // Find the path of the executable. Theoretically, there could  occur a
-        // race condition when using readlink, but we only use  this method to
+        // Find the path of the executable. Theoretically, there could occur a
+        // race condition when using readlink, but we only use this method to
        // get the absolute path of the executable to compute the actual home
        // path. In the worst case we simply get q wrong path and FreeCAD is not
        // able to load its modules.
@@ -2385,7 +2517,7 @@ std::string Application::FindHomePath(const char* sCall)
 #endif
        if (nchars < 0 || nchars >= PATH_MAX)
            throw Base::FileSystemError("Cannot determine the absolute path of the executable");
-        resolved[nchars] = '\0'; // enfore null termination
+        resolved[nchars] = '\0'; // enforce null termination
        absPath = resolved;
    }

@@ -2440,12 +2572,17 @@ std::string Application::FindHomePath(const char* call)
 #elif defined (FC_OS_WIN32)
 std::string Application::FindHomePath(const char* sCall)
 {
-    // We have three ways to start this application either use one of the two executables or
-    // import the FreeCAD.pyd module from a running Python session. In the latter case the
-    // Python interpreter is already initialized.
+    // We have several ways to start this application:
+    // * use one of the two executables
+    // * import the FreeCAD.pyd module from a running Python session. In this case the
+    //   Python interpreter is already initialized.
+    // * use a custom dll that links FreeCAD core dlls and that is loaded by its host application
+    //   In this case the calling name should be set to FreeCADBase.dll or FreeCADApp.dll in order
+    //   to locate the correct home directory
    wchar_t szFileName [MAX_PATH];
-    if (Py_IsInitialized()) {
-        GetModuleFileNameW(GetModuleHandle(sCall),szFileName, MAX_PATH-1);
+    QString dll(QString::fromUtf8(sCall));
+    if (Py_IsInitialized() || dll.endsWith(QLatin1String(".dll"))) {
+        GetModuleFileNameW(GetModuleHandleA(sCall),szFileName, MAX_PATH-1);
    }
    else {
        GetModuleFileNameW(0, szFileName, MAX_PATH-1);
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   (c) Jürgen Riegel (juergen.riegel@web.de) 2002                        *   
+ *   (c) Jürgen Riegel (juergen.riegel@web.de) 2002                        *
 *                                                                         *
 *   This file is part of the FreeCAD CAx development system.              *
 *                                                                         *
@@ -10,7 +10,7 @@
 *   for detail see the LICENCE text file.                                 *
 *                                                                         *
 *   FreeCAD is distributed in the hope that it will be useful,            *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        * 
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
 *   GNU Library General Public License for more details.                  *
 *                                                                         *
@@ -25,7 +25,7 @@
 #ifndef APP_APPLICATION_H
 #define APP_APPLICATION_H

-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>

 #include <vector>

@@ -34,9 +34,9 @@
 #include <Base/Observer.h>


-namespace Base 
+namespace Base
 {
-    class ConsoleObserverStd; 
+    class ConsoleObserverStd;
    class ConsoleObserverFile;
 }

@@ -71,7 +71,7 @@ public:
     * spaces and not starting with a number. This name gets also forced to be unique
     * in this Application. You can avoid the renaming by using getUniqueDocumentName()
     * to get a unique name before calling newDoucument().
-     * The second name is a UTF8 name of any kind. It's that name normally shown to 
+     * The second name is a UTF8 name of any kind. It's that name normally shown to
     * the user and stored in the App::Document::Name property.
     */
    App::Document* newDocument(const char * Name=0l, const char * UserName=0l);
@@ -99,46 +99,66 @@ public:
    /** @name Signals of the Application */
    //@{
    /// signal on new Document
-    boost::signal<void (const Document&)> signalNewDocument;
+    boost::signals2::signal<void (const Document&)> signalNewDocument;
    /// signal on document getting deleted
-    boost::signal<void (const Document&)> signalDeleteDocument;
+    boost::signals2::signal<void (const Document&)> signalDeleteDocument;
    /// signal on already deleted Document
-    boost::signal<void ()> signalDeletedDocument;
+    boost::signals2::signal<void ()> signalDeletedDocument;
    /// signal on relabeling Document (user name)
-    boost::signal<void (const Document&)> signalRelabelDocument;
+    boost::signals2::signal<void (const Document&)> signalRelabelDocument;
    /// signal on renaming Document (internal name)
-    boost::signal<void (const Document&)> signalRenameDocument;
+    boost::signals2::signal<void (const Document&)> signalRenameDocument;
    /// signal on activating Document
-    boost::signal<void (const Document&)> signalActiveDocument;
+    boost::signals2::signal<void (const Document&)> signalActiveDocument;
    /// signal on saving Document
-    boost::signal<void (const Document&)> signalSaveDocument;
+    boost::signals2::signal<void (const Document&)> signalSaveDocument;
    /// signal on starting to restore Document
-    boost::signal<void (const Document&)> signalStartRestoreDocument;
+    boost::signals2::signal<void (const Document&)> signalStartRestoreDocument;
    /// signal on restoring Document
-    boost::signal<void (const Document&)> signalFinishRestoreDocument;
+    boost::signals2::signal<void (const Document&)> signalFinishRestoreDocument;
+    /// signal on starting to save Document
+    boost::signals2::signal<void (const Document&, const std::string&)> signalStartSaveDocument;
+    /// signal on saved Document
+    boost::signals2::signal<void (const Document&, const std::string&)> signalFinishSaveDocument;
    /// signal on undo in document
-    boost::signal<void (const Document&)> signalUndoDocument;
+    boost::signals2::signal<void (const Document&)> signalUndoDocument;
    /// signal on redo in document
-    boost::signal<void (const Document&)> signalRedoDocument;
+    boost::signals2::signal<void (const Document&)> signalRedoDocument;
    //@}


    /** @name Signals of the document
-     * This signals are an aggregation of all document. If you only 
+     * This signals are an aggregation of all document. If you only
     * the signal of a special document connect to the document itself
     */
    //@{
+    /// signal before change of doc property
+    boost::signals2::signal<void (const App::Document&, const App::Property&)> signalBeforeChangeDocument;
+    /// signal on changed doc property
+    boost::signals2::signal<void (const App::Document&, const App::Property&)> signalChangedDocument;
    /// signal on new Object
-    boost::signal<void (const App::DocumentObject&)> signalNewObject;
-    //boost::signal<void (const App::DocumentObject&)>     m_sig;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalNewObject;
+    //boost::signals2::signal<void (const App::DocumentObject&)>     m_sig;
    /// signal on deleted Object
-    boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalDeletedObject;
    /// signal on changed Object
-    boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
+    boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalBeforeChangeObject;
+    /// signal on changed Object
+    boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
    /// signal on relabeled Object
-    boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalRelabelObject;
    /// signal on activated Object
-    boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalActivatedObject;
+    /// signal on recomputed document
+    boost::signals2::signal<void (const App::Document&)> signalRecomputed;
+    /// signal on recomputed document object
+    boost::signals2::signal<void (const App::DocumentObject&)> signalObjectRecomputed;
+    // signal on opened transaction
+    boost::signals2::signal<void (const App::Document&, std::string)> signalOpenTransaction;
+    // signal a committed transaction
+    boost::signals2::signal<void (const App::Document&)> signalCommitTransaction;
+    // signal an aborted transaction
+    boost::signals2::signal<void (const App::Document&)> signalAbortTransaction;
    //@}

    /** @name Signals of property changes
@@ -147,11 +167,11 @@ public:
     */
    //@{
    /// signal on adding a dynamic property
-    boost::signal<void (const App::Property&)> signalAppendDynamicProperty;
+    boost::signals2::signal<void (const App::Property&)> signalAppendDynamicProperty;
    /// signal on about removing a dynamic property
-    boost::signal<void (const App::Property&)> signalRemoveDynamicProperty;
+    boost::signals2::signal<void (const App::Property&)> signalRemoveDynamicProperty;
    /// signal on about changing the editor mode of a property
-    boost::signal<void (const App::Property&)> signalChangePropertyEditor;
+    boost::signals2::signal<void (const App::Property&)> signalChangePropertyEditor;
    //@}


@@ -178,12 +198,12 @@ public:
    void RemoveParameterSet(const char* sName);
    //@}

-    /** @name methods for the open handler 
-     *  With this facility a Application module can register 
-     *  a ending (filetype) which he can handle to open. 
+    /** @name methods for the open handler
+     *  With this facility a Application module can register
+     *  a ending (filetype) which he can handle to open.
     *  The ending and the module name are stored and if the file
     *  type is opened the module get loaded and need to register a
-     *  OpenHandler class in the OpenHandlerFactorySingleton. 
+     *  OpenHandler class in the OpenHandlerFactorySingleton.
     *  After the module is loaded a OpenHandler of this type is created
     *  and the file get loaded.
     *  @see OpenHandler
@@ -260,17 +280,27 @@ protected:
    /// get called by the document when the name is changing
    void renameDocument(const char *OldName, const char *NewName);

-    /** @name I/O of the document 
+    /** @name I/O of the document
     * This slot get connected to all App::Documents created
     */
    //@{
+    void slotBeforeChangeDocument(const App::Document&, const App::Property&);
+    void slotChangedDocument(const App::Document&, const App::Property&);
    void slotNewObject(const App::DocumentObject&);
    void slotDeletedObject(const App::DocumentObject&);
+    void slotBeforeChangeObject(const App::DocumentObject&, const App::Property& Prop);
    void slotChangedObject(const App::DocumentObject&, const App::Property& Prop);
    void slotRelabelObject(const App::DocumentObject&);
    void slotActivatedObject(const App::DocumentObject&);
    void slotUndoDocument(const App::Document&);
    void slotRedoDocument(const App::Document&);
+    void slotRecomputedObject(const App::DocumentObject&);
+    void slotRecomputed(const App::Document&);
+    void slotOpenTransaction(const App::Document&, std::string);
+    void slotCommitTransaction(const App::Document&);
+    void slotAbortTransaction(const App::Document&);
+    void slotStartSaveDocument(const App::Document&, const std::string&);
+    void slotFinishSaveDocument(const App::Document&, const std::string&);
    //@}

 private:
@@ -291,43 +321,39 @@ private:
    //---------------------------------------------------------------------

    // static python wrapper of the exported functions
-    static PyObject* sGetParam          (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sSaveParameter     (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetVersion        (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetConfig         (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sSetConfig         (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sDumpConfig        (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sTemplateAdd       (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sTemplateDelete    (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sTemplateGet       (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sAddImportType     (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetImportType     (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sAddExportType     (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetExportType     (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetResourceDir    (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetUserAppDataDir (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetUserMacroDir   (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetHelpDir        (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetHomePath       (PyObject *self,PyObject *args,PyObject *kwd);
+    static PyObject* sGetParam          (PyObject *self,PyObject *args);
+    static PyObject* sSaveParameter     (PyObject *self,PyObject *args);
+    static PyObject* sGetVersion        (PyObject *self,PyObject *args);
+    static PyObject* sGetConfig         (PyObject *self,PyObject *args);
+    static PyObject* sSetConfig         (PyObject *self,PyObject *args);
+    static PyObject* sDumpConfig        (PyObject *self,PyObject *args);
+    static PyObject* sAddImportType     (PyObject *self,PyObject *args);
+    static PyObject* sGetImportType     (PyObject *self,PyObject *args);
+    static PyObject* sAddExportType     (PyObject *self,PyObject *args);
+    static PyObject* sGetExportType     (PyObject *self,PyObject *args);
+    static PyObject* sGetResourceDir    (PyObject *self,PyObject *args);
+    static PyObject* sGetUserAppDataDir (PyObject *self,PyObject *args);
+    static PyObject* sGetUserMacroDir   (PyObject *self,PyObject *args);
+    static PyObject* sGetHelpDir        (PyObject *self,PyObject *args);
+    static PyObject* sGetHomePath       (PyObject *self,PyObject *args);

-    static PyObject* sLoadFile          (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sOpenDocument      (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sSaveDocument      (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sSaveDocumentAs    (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sNewDocument       (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sCloseDocument     (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sActiveDocument    (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sSetActiveDocument (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sGetDocument       (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sListDocuments     (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sAddDocObserver    (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sRemoveDocObserver (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject* sTranslateUnit     (PyObject *self,PyObject *args,PyObject *kwd);
+    static PyObject* sLoadFile          (PyObject *self,PyObject *args);
+    static PyObject* sOpenDocument      (PyObject *self,PyObject *args);
+    static PyObject* sSaveDocument      (PyObject *self,PyObject *args);
+    static PyObject* sSaveDocumentAs    (PyObject *self,PyObject *args);
+    static PyObject* sNewDocument       (PyObject *self,PyObject *args);
+    static PyObject* sCloseDocument     (PyObject *self,PyObject *args);
+    static PyObject* sActiveDocument    (PyObject *self,PyObject *args);
+    static PyObject* sSetActiveDocument (PyObject *self,PyObject *args);
+    static PyObject* sGetDocument       (PyObject *self,PyObject *args);
+    static PyObject* sListDocuments     (PyObject *self,PyObject *args);
+    static PyObject* sAddDocObserver    (PyObject *self,PyObject *args);
+    static PyObject* sRemoveDocObserver (PyObject *self,PyObject *args);

-    static PyObject *sSetLogLevel       (PyObject *self,PyObject *args,PyObject *kwd);
-    static PyObject *sGetLogLevel       (PyObject *self,PyObject *args,PyObject *kwd);
+    static PyObject *sSetLogLevel       (PyObject *self,PyObject *args);
+    static PyObject *sGetLogLevel       (PyObject *self,PyObject *args);

-    static PyMethodDef    Methods[]; 
+    static PyMethodDef    Methods[];

    friend class ApplicationObserver;

@@ -379,7 +405,7 @@ private:
    static Base::ConsoleObserverFile *_pConsoleObserverFile;
 };

-/// Singleton getter of the Applicaton
+/// Singleton getter of the Application
 inline App::Application &GetApplication(void){
    return *App::Application::_pcSingleton;
 }
@@ -388,4 +414,3 @@ inline App::Application &GetApplication(void){


 #endif // APP_APPLICATION_H
-
@@ -56,97 +56,100 @@ using namespace App;

 // Application Methods						// Methods structure
 PyMethodDef Application::Methods[] = {
-    {"ParamGet",       (PyCFunction) Application::sGetParam,       1,
+    {"ParamGet",       (PyCFunction) Application::sGetParam, METH_VARARGS,
     "Get parameters by path"},
-    {"saveParameter",  (PyCFunction) Application::sSaveParameter,  1,
+    {"saveParameter",  (PyCFunction) Application::sSaveParameter, METH_VARARGS,
     "saveParameter(config='User parameter') -> None\n"
     "Save parameter set to file. The default set is 'User parameter'"},
-    {"Version",        (PyCFunction) Application::sGetVersion,     1,
+    {"Version",        (PyCFunction) Application::sGetVersion, METH_VARARGS,
     "Print the version to the output."},
-    {"ConfigGet",      (PyCFunction) Application::sGetConfig,      1,
+    {"ConfigGet",      (PyCFunction) Application::sGetConfig, METH_VARARGS,
     "ConfigGet(string) -- Get the value for the given key."},
-    {"ConfigSet",      (PyCFunction) Application::sSetConfig,      1,
+    {"ConfigSet",      (PyCFunction) Application::sSetConfig, METH_VARARGS,
     "ConfigSet(string, string) -- Set the given key to the given value."},
-    {"ConfigDump",     (PyCFunction) Application::sDumpConfig,     1,
+    {"ConfigDump",     (PyCFunction) Application::sDumpConfig, METH_VARARGS,
     "Dump the configuration to the output."},
-    {"addImportType",  (PyCFunction) Application::sAddImportType,  1,
+    {"addImportType",  (PyCFunction) Application::sAddImportType, METH_VARARGS,
     "Register filetype for import"},
-    {"getImportType",  (PyCFunction) Application::sGetImportType,  1,
+    {"getImportType",  (PyCFunction) Application::sGetImportType, METH_VARARGS,
     "Get the name of the module that can import the filetype"},
-    {"EndingAdd",      (PyCFunction) Application::sAddImportType  ,1, // deprecated
+    {"EndingAdd",      (PyCFunction) Application::sAddImportType, METH_VARARGS, // deprecated
     "deprecated -- use addImportType"},
-    {"EndingGet",      (PyCFunction) Application::sGetImportType  ,1, // deprecated
+    {"EndingGet",      (PyCFunction) Application::sGetImportType, METH_VARARGS, // deprecated
     "deprecated -- use getImportType"},
-    {"addExportType",  (PyCFunction) Application::sAddExportType  ,1,
+    {"addExportType",  (PyCFunction) Application::sAddExportType, METH_VARARGS,
     "Register filetype for export"},
-    {"getExportType",  (PyCFunction) Application::sGetExportType  ,1,
+    {"getExportType",  (PyCFunction) Application::sGetExportType, METH_VARARGS,
     "Get the name of the module that can export the filetype"},
-    {"getResourceDir", (PyCFunction) Application::sGetResourceDir  ,1,
+    {"getResourceDir", (PyCFunction) Application::sGetResourceDir, METH_VARARGS,
     "Get the root directory of all resources"},
-    {"getUserAppDataDir", (PyCFunction) Application::sGetUserAppDataDir  ,1,
+    {"getUserAppDataDir", (PyCFunction) Application::sGetUserAppDataDir, METH_VARARGS,
     "Get the root directory of user settings"},
-    {"getUserMacroDir", (PyCFunction) Application::sGetUserMacroDir  ,1,
-     "Get the directory of the user's macro directory"},
-    {"getHelpDir", (PyCFunction) Application::sGetHelpDir  ,1,
+    {"getUserMacroDir", (PyCFunction) Application::sGetUserMacroDir, METH_VARARGS,
+     "getUserMacroDir(bool=False) -> string"
+     "Get the directory of the user's macro directory\n"
+     "If parameter is False (the default) it returns the standard path in the"
+     "user's home directory, otherwise it returns the user-defined path."},
+    {"getHelpDir", (PyCFunction) Application::sGetHelpDir, METH_VARARGS,
     "Get the directory of the documentation"},
-    {"getHomePath",    (PyCFunction) Application::sGetHomePath  ,1,
+    {"getHomePath",    (PyCFunction) Application::sGetHomePath, METH_VARARGS,
     "Get the home path, i.e. the parent directory of the executable"},

-    {"loadFile",       (PyCFunction) Application::sLoadFile,   1,
+    {"loadFile",       (PyCFunction) Application::sLoadFile, METH_VARARGS,
     "loadFile(string=filename,[string=module]) -> None\n\n"
     "Loads an arbitrary file by delegating to the given Python module:\n"
     "* If no module is given it will be determined by the file extension.\n"
     "* If more than one module can load a file the first one one will be taken.\n"
     "* If no module exists to load the file an exception will be raised."},
-    {"open",   (PyCFunction) Application::sOpenDocument,   1,
+    {"open",   (PyCFunction) Application::sOpenDocument, METH_VARARGS,
     "See openDocument(string)"},
-    {"openDocument",   (PyCFunction) Application::sOpenDocument,   1,
+    {"openDocument",   (PyCFunction) Application::sOpenDocument, METH_VARARGS,
     "openDocument(string) -> object\n\n"
     "Create a document and load the project file into the document.\n"
     "The string argument must point to an existing file. If the file doesn't exist\n"
     "or the file cannot be loaded an I/O exception is thrown. In this case the\n"
     "document is kept alive."},
-//  {"saveDocument",   (PyCFunction) Application::sSaveDocument,   1,
+//  {"saveDocument",   (PyCFunction) Application::sSaveDocument, METH_VARARGS,
 //   "saveDocument(string) -- Save the document to a file."},
-//  {"saveDocumentAs", (PyCFunction) Application::sSaveDocumentAs, 1},
-    {"newDocument",    (PyCFunction) Application::sNewDocument,    1,
+//  {"saveDocumentAs", (PyCFunction) Application::sSaveDocumentAs, METH_VARARGS},
+    {"newDocument",    (PyCFunction) Application::sNewDocument, METH_VARARGS,
     "newDocument([string]) -> object\n\n"
     "Create a new document with a given name.\n"
     "The document name must be unique which\n"
     "is checked automatically."},
-    {"closeDocument",  (PyCFunction) Application::sCloseDocument,  1,
+    {"closeDocument",  (PyCFunction) Application::sCloseDocument, METH_VARARGS,
     "closeDocument(string) -> None\n\n"
     "Close the document with a given name."},
-    {"activeDocument", (PyCFunction) Application::sActiveDocument, 1,
+    {"activeDocument", (PyCFunction) Application::sActiveDocument, METH_VARARGS,
     "activeDocument() -> object or None\n\n"
     "Return the active document or None if there is no one."},
-    {"setActiveDocument",(PyCFunction) Application::sSetActiveDocument, 1,
+    {"setActiveDocument",(PyCFunction) Application::sSetActiveDocument, METH_VARARGS,
     "setActiveDocement(string) -> None\n\n"
     "Set the active document by its name."},
-    {"getDocument",    (PyCFunction) Application::sGetDocument,    1,
+    {"getDocument",    (PyCFunction) Application::sGetDocument, METH_VARARGS,
     "getDocument(string) -> object\n\n"
     "Get a document by its name or raise an exception\n"
     "if there is no document with the given name."},
-    {"listDocuments",  (PyCFunction) Application::sListDocuments  ,1,
+    {"listDocuments",  (PyCFunction) Application::sListDocuments, METH_VARARGS,
     "listDocuments() -> list\n\n"
     "Return a list of names of all documents."},
-    {"addDocumentObserver",  (PyCFunction) Application::sAddDocObserver  ,1,
+    {"addDocumentObserver",  (PyCFunction) Application::sAddDocObserver, METH_VARARGS,
     "addDocumentObserver() -> None\n\n"
     "Add an observer to get notified about changes on documents."},
-    {"removeDocumentObserver",  (PyCFunction) Application::sRemoveDocObserver  ,1,
+    {"removeDocumentObserver",  (PyCFunction) Application::sRemoveDocObserver, METH_VARARGS,
     "removeDocumentObserver() -> None\n\n"
     "Remove an added document observer."},
-    {"setLogLevel",          (PyCFunction) Application::sSetLogLevel, 1,
+    {"setLogLevel",          (PyCFunction) Application::sSetLogLevel, METH_VARARGS,
     "setLogLevel(tag, level) -- Set the log level for a string tag.\n"
     "'level' can either be string 'Log', 'Msg', 'Wrn', 'Error', or an integer value"},
-    {"getLogLevel",          (PyCFunction) Application::sGetLogLevel, 1,
+    {"getLogLevel",          (PyCFunction) Application::sGetLogLevel, METH_VARARGS,
     "getLogLevel(tag) -- Get the log level of a string tag"},

    {NULL, NULL, 0, NULL}		/* Sentinel */
 };


-PyObject* Application::sLoadFile(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sLoadFile(PyObject * /*self*/, PyObject *args)
 {
    char *path, *doc="",*mod="";
    if (!PyArg_ParseTuple(args, "s|ss", &path, &doc, &mod))     // convert args: Python->C
@@ -191,7 +194,7 @@ PyObject* Application::sLoadFile(PyObject * /*self*/, PyObject *args,PyObject *
    }
 }

-PyObject* Application::sOpenDocument(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sOpenDocument(PyObject * /*self*/, PyObject *args)
 {
    char* Name;
    if (!PyArg_ParseTuple(args, "et","utf-8",&Name))
@@ -213,7 +216,7 @@ PyObject* Application::sOpenDocument(PyObject * /*self*/, PyObject *args,PyObjec
    }
 }

-PyObject* Application::sNewDocument(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sNewDocument(PyObject * /*self*/, PyObject *args)
 {
    char *docName = 0;
    char *usrName = 0;
@@ -228,7 +231,7 @@ PyObject* Application::sNewDocument(PyObject * /*self*/, PyObject *args,PyObject
    }PY_CATCH;
 }

-PyObject* Application::sSetActiveDocument(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sSetActiveDocument(PyObject * /*self*/, PyObject *args)
 {
    char *pstr = 0;
    if (!PyArg_ParseTuple(args, "s", &pstr))     // convert args: Python->C
@@ -245,7 +248,7 @@ PyObject* Application::sSetActiveDocument(PyObject * /*self*/, PyObject *args,Py
    Py_Return;
 }

-PyObject* Application::sCloseDocument(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sCloseDocument(PyObject * /*self*/, PyObject *args)
 {
    char *pstr = 0;
    if (!PyArg_ParseTuple(args, "s", &pstr))     // convert args: Python->C
@@ -269,7 +272,7 @@ PyObject* Application::sCloseDocument(PyObject * /*self*/, PyObject *args,PyObje
    Py_Return;
 }

-PyObject* Application::sSaveDocument(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sSaveDocument(PyObject * /*self*/, PyObject *args)
 {
    char *pDoc;
    if (!PyArg_ParseTuple(args, "s", &pDoc))     // convert args: Python->C
@@ -290,7 +293,7 @@ PyObject* Application::sSaveDocument(PyObject * /*self*/, PyObject *args,PyObjec
    Py_Return;
 }
 #if 0
-PyObject* Application::sSaveDocumentAs(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sSaveDocumentAs(PyObject * /*self*/, PyObject *args)
 {
    char *pDoc, *pFileName;
    if (!PyArg_ParseTuple(args, "ss", &pDoc, &pFileName))     // convert args: Python->C
@@ -308,7 +311,7 @@ PyObject* Application::sSaveDocumentAs(PyObject * /*self*/, PyObject *args,PyObj
    Py_Return;
 }
 #endif
-PyObject* Application::sActiveDocument(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sActiveDocument(PyObject * /*self*/, PyObject *args)
 {
    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
        return NULL;                       // NULL triggers exception
@@ -323,7 +326,7 @@ PyObject* Application::sActiveDocument(PyObject * /*self*/, PyObject *args,PyObj
    }
 }

-PyObject* Application::sGetDocument(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetDocument(PyObject * /*self*/, PyObject *args)
 {
    char *pstr=0;
    if (!PyArg_ParseTuple(args, "s", &pstr))     // convert args: Python->C
@@ -338,7 +341,7 @@ PyObject* Application::sGetDocument(PyObject * /*self*/, PyObject *args,PyObject
    return doc->getPyObject();
 }

-PyObject* Application::sGetParam(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetParam(PyObject * /*self*/, PyObject *args)
 {
    char *pstr=0;
    if (!PyArg_ParseTuple(args, "s", &pstr))     // convert args: Python->C
@@ -349,7 +352,7 @@ PyObject* Application::sGetParam(PyObject * /*self*/, PyObject *args,PyObject *
    }PY_CATCH;
 }

-PyObject* Application::sSaveParameter(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sSaveParameter(PyObject * /*self*/, PyObject *args)
 {
    char *pstr = "User parameter";
    if (!PyArg_ParseTuple(args, "|s", &pstr))
@@ -377,7 +380,7 @@ PyObject* Application::sSaveParameter(PyObject * /*self*/, PyObject *args,PyObje
 }


-PyObject* Application::sGetConfig(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetConfig(PyObject * /*self*/, PyObject *args)
 {
    char *pstr;

@@ -399,7 +402,7 @@ PyObject* Application::sGetConfig(PyObject * /*self*/, PyObject *args,PyObject *
    }
 }

-PyObject* Application::sDumpConfig(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sDumpConfig(PyObject * /*self*/, PyObject *args)
 {
    if (!PyArg_ParseTuple(args, "") )    // convert args: Python->C
        return NULL;                             // NULL triggers exception
@@ -416,7 +419,7 @@ PyObject* Application::sDumpConfig(PyObject * /*self*/, PyObject *args,PyObject
    return dict;
 }

-PyObject* Application::sSetConfig(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sSetConfig(PyObject * /*self*/, PyObject *args)
 {
    char *pstr,*pstr2;

@@ -429,7 +432,7 @@ PyObject* Application::sSetConfig(PyObject * /*self*/, PyObject *args,PyObject *
    return Py_None;
 }

-PyObject* Application::sGetVersion(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetVersion(PyObject * /*self*/, PyObject *args)
 {
    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
        return NULL; // NULL triggers exception
@@ -464,7 +467,7 @@ PyObject* Application::sGetVersion(PyObject * /*self*/, PyObject *args,PyObject
    return Py::new_reference_to(list);
 }

-PyObject* Application::sAddImportType(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sAddImportType(PyObject * /*self*/, PyObject *args)
 {
    char *psKey,*psMod;

@@ -476,7 +479,7 @@ PyObject* Application::sAddImportType(PyObject * /*self*/, PyObject *args,PyObje
    Py_Return;
 }

-PyObject* Application::sGetImportType(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetImportType(PyObject * /*self*/, PyObject *args)
 {
    char*       psKey=0;

@@ -516,7 +519,7 @@ PyObject* Application::sGetImportType(PyObject * /*self*/, PyObject *args,PyObje
    }
 }

-PyObject* Application::sAddExportType(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sAddExportType(PyObject * /*self*/, PyObject *args)
 {
    char *psKey,*psMod;

@@ -528,7 +531,7 @@ PyObject* Application::sAddExportType(PyObject * /*self*/, PyObject *args,PyObje
    Py_Return;
 }

-PyObject* Application::sGetExportType(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetExportType(PyObject * /*self*/, PyObject *args)
 {
    char*       psKey=0;

@@ -568,7 +571,7 @@ PyObject* Application::sGetExportType(PyObject * /*self*/, PyObject *args,PyObje
    }
 }

-PyObject* Application::sGetResourceDir(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetResourceDir(PyObject * /*self*/, PyObject *args)
 {
    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
        return NULL;                       // NULL triggers exception
@@ -577,7 +580,7 @@ PyObject* Application::sGetResourceDir(PyObject * /*self*/, PyObject *args,PyObj
    return Py::new_reference_to(datadir);
 }

-PyObject* Application::sGetUserAppDataDir(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetUserAppDataDir(PyObject * /*self*/, PyObject *args)
 {
    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
        return NULL;                       // NULL triggers exception
@@ -586,16 +589,24 @@ PyObject* Application::sGetUserAppDataDir(PyObject * /*self*/, PyObject *args,Py
    return Py::new_reference_to(user_data_dir);
 }

-PyObject* Application::sGetUserMacroDir(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetUserMacroDir(PyObject * /*self*/, PyObject *args)
 {
-    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
-        return NULL;                       // NULL triggers exception
+    PyObject *actual = Py_False;
+    if (!PyArg_ParseTuple(args, "|O!", &PyBool_Type, &actual))
+        return NULL;

-    Py::String user_macro_dir(Application::getUserMacroDir(),"utf-8");
+    std::string macroDir = Application::getUserMacroDir();
+    if (PyObject_IsTrue(actual)) {
+        macroDir = App::GetApplication().
+            GetParameterGroupByPath("User parameter:BaseApp/Preferences/Macro")
+            ->GetASCII("MacroPath",macroDir.c_str());
+    }
+
+    Py::String user_macro_dir(macroDir,"utf-8");
    return Py::new_reference_to(user_macro_dir);
 }

-PyObject* Application::sGetHelpDir(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetHelpDir(PyObject * /*self*/, PyObject *args)
 {
    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
        return NULL;                       // NULL triggers exception
@@ -604,7 +615,7 @@ PyObject* Application::sGetHelpDir(PyObject * /*self*/, PyObject *args,PyObject
    return Py::new_reference_to(user_macro_dir);
 }

-PyObject* Application::sGetHomePath(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sGetHomePath(PyObject * /*self*/, PyObject *args)
 {
    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
        return NULL;                       // NULL triggers exception
@@ -613,7 +624,7 @@ PyObject* Application::sGetHomePath(PyObject * /*self*/, PyObject *args,PyObject
    return Py::new_reference_to(homedir);
 }

-PyObject* Application::sListDocuments(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sListDocuments(PyObject * /*self*/, PyObject *args)
 {
    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
        return NULL;                       // NULL triggers exception
@@ -640,7 +651,7 @@ PyObject* Application::sListDocuments(PyObject * /*self*/, PyObject *args,PyObje
    } PY_CATCH;
 }

-PyObject* Application::sAddDocObserver(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sAddDocObserver(PyObject * /*self*/, PyObject *args)
 {
    PyObject* o;
    if (!PyArg_ParseTuple(args, "O",&o))
@@ -651,7 +662,7 @@ PyObject* Application::sAddDocObserver(PyObject * /*self*/, PyObject *args,PyObj
    } PY_CATCH;
 }

-PyObject* Application::sRemoveDocObserver(PyObject * /*self*/, PyObject *args,PyObject * /*kwd*/)
+PyObject* Application::sRemoveDocObserver(PyObject * /*self*/, PyObject *args)
 {
    PyObject* o;
    if (!PyArg_ParseTuple(args, "O",&o))
@@ -662,7 +673,7 @@ PyObject* Application::sRemoveDocObserver(PyObject * /*self*/, PyObject *args,Py
    } PY_CATCH;
 }

-PyObject *Application::sSetLogLevel(PyObject * /*self*/, PyObject *args, PyObject * /*kwd*/)
+PyObject *Application::sSetLogLevel(PyObject * /*self*/, PyObject *args)
 {
    char *tag;
    PyObject *pcObj;
@@ -694,7 +705,7 @@ PyObject *Application::sSetLogLevel(PyObject * /*self*/, PyObject *args, PyObjec
                        "Unknown Log Level (use 'Default', 'Error', 'Warning', 'Message', 'Log', 'Trace' or an integer)");
                return NULL;
            }
-        }else 
+        }else
            l = PyLong_AsLong(pcObj);
        GetApplication().GetParameterGroupByPath("User parameter:BaseApp/LogLevels")->SetInt(tag,l);
        if(strcmp(tag,"Default") == 0) {
@@ -712,7 +723,7 @@ PyObject *Application::sSetLogLevel(PyObject * /*self*/, PyObject *args, PyObjec
    }PY_CATCH;
 }

-PyObject *Application::sGetLogLevel(PyObject * /*self*/, PyObject *args, PyObject * /*kwd*/)
+PyObject *Application::sGetLogLevel(PyObject * /*self*/, PyObject *args)
 {
    char *tag;
    if (!PyArg_ParseTuple(args, "s", &tag))
@@ -3,6 +3,10 @@ if(WIN32)
    add_definitions(-DBOOST_DYN_LINK)
 endif(WIN32)

+if(FREECAD_RELEASE_SEH)
+    add_definitions(-DHAVE_SEH)
+endif(FREECAD_RELEASE_SEH)
+
 # This causes some problems with the resource files to be found, especially with the StartPage
 IF(RESOURCEDIR)
    add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
@@ -17,15 +21,17 @@ add_definitions(-DBOOST_${Boost_VERSION})
 #if you want to use the old DAG structure uncomment this line
 #add_definitions(-DUSE_OLD_DAG)

-#write relevant cmake variables to a file for later access with python. Exportet are all variables 
-#starting with BUILD. As the variable only exists if the user set it to ON a dict is useless, we 
-#use a python list for export. 
+# -----------------------------------------------------------------------------
+
+#write relevant cmake variables to a file for later access with python. Exported are all variables 
+#starting with BUILD. As the variable only exists if the user set it to ON a dict is useless, we
+#use a python list for export.
 set(_vars "const char CMakeVariables[] =\"cmake = [")
 set(_delim "")
 get_cmake_property(_variableNames VARIABLES)
 foreach (_variableName ${_variableNames})
    if (${_variableName})
-        STRING(REGEX MATCH "^[_]?[^_]*" _prefix "${_variableName}_") 
+        STRING(REGEX MATCH "^[_]?[^_]*" _prefix "${_variableName}_")
        if(${_prefix} STREQUAL "BUILD")
            STRING(REPLACE "\\" "\\\\" _name ${_variableName})
            set(_vars "${_vars}${_delim}\\n\"\n\"\\\"${_name}\\\"")
@@ -34,7 +40,14 @@ foreach (_variableName ${_variableNames})
    endif ()
 endforeach()
 set(_vars "${_vars}]\\n\" \n;")
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CMakeScript.h "${_vars}" )
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CMakeScript.hh "${_vars}" )
+
+fc_copy_file_if_different(
+    "${CMAKE_CURRENT_BINARY_DIR}/CMakeScript.hh"
+    "${CMAKE_CURRENT_BINARY_DIR}/CMakeScript.h"
+)
+
+# -----------------------------------------------------------------------------

 include_directories(
    ${CMAKE_BINARY_DIR}/src
@@ -266,10 +279,10 @@ SET(FreeCADApp_SRCS
    PreCompiled.h
 )

-if(MSVC)
+if(BUILD_USE_PCH)
    add_definitions(-D_PreComp_)
    ADD_MSVC_PRECOMPILED_HEADER(FreeCADApp PreCompiled.h PreCompiled.cpp FreeCADApp_CPP_SRCS)
-endif(MSVC)
+endif(BUILD_USE_PCH)

 add_library(FreeCADApp SHARED ${FreeCADApp_SRCS})

@@ -26,6 +26,7 @@

 #include "Material.h"

+#include <algorithm>
 #include <deque>
 #include <string>
 #include <vector>
@@ -324,7 +324,7 @@ void Document::exportGraphviz(std::ostream& out) const
        }

        /**
-         * @brief setPropertyVertexAttributes Set vertex attributes for a Porperty node in a graph.
+         * @brief setPropertyVertexAttributes Set vertex attributes for a Property node in a graph.
         * @param g Graph
         * @param vertex Property node
         * @param name Name of node
@@ -525,13 +525,22 @@ void Document::exportGraphviz(std::ostream& out) const
            setGraphLabel(sub, cs);

            for(auto obj : cs->getOutList()) {
-                if(obj->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId()))
-                    recursiveCSSubgraphs(obj, cs);
+                if (obj->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId())) {
+                    // in case of dependencies loops check if obj is already part of the
+                    // map to avoid infinite recursions
+                    auto it = GraphList.find(obj);
+                    if (it == GraphList.end())
+                        recursiveCSSubgraphs(obj, cs);
+                }
            }

            //setup the origin if available
            if(cs->hasExtension(App::OriginGroupExtension::getExtensionClassTypeId())) {
                auto origin = cs->getExtensionByType<OriginGroupExtension>()->Origin.getValue();
+                if (!origin) {
+                    std::cerr << "Origin feature not found" << std::endl;
+                    return;
+                }
                auto& osub = sub.create_subgraph();
                GraphList[origin] = &osub;
                get_property(osub, graph_name) = getClusterName(origin);
@@ -548,7 +557,8 @@ void Document::exportGraphviz(std::ostream& out) const
            if(CSSubgraphs) {
                //first build up the coordinate system subgraphs
                for (auto objectIt : d->objectArray) {
-                    if (objectIt->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId()) && objectIt->getInList().empty())
+                    // do not require an empty inlist (#0003465: Groups breaking dependency graph)
+                    if (objectIt->hasExtension(GeoFeatureGroupExtension::getExtensionClassTypeId()))
                        recursiveCSSubgraphs(objectIt, nullptr);
                }
            }
@@ -955,6 +965,8 @@ void Document::openTransaction(const char* name)
            d->activeUndoTransaction->Name = name;
        else
            d->activeUndoTransaction->Name = "<empty>";
+
+        signalOpenTransaction(*this, d->activeUndoTransaction->Name);
    }
 }

@@ -994,6 +1006,7 @@ void Document::commitTransaction()
            delete mUndoTransactions.front();
            mUndoTransactions.pop_front();
        }
+        signalCommitTransaction(*this);
    }
 }

@@ -1008,6 +1021,7 @@ void Document::abortTransaction()
        // destroy the undo
        delete d->activeUndoTransaction;
        d->activeUndoTransaction = 0;
+        signalAbortTransaction(*this);
    }
 }

@@ -1019,6 +1033,15 @@ bool Document::hasPendingTransaction() const
        return false;
 }

+bool Document::isTransactionEmpty() const
+{
+    if (d->activeUndoTransaction) {
+        return d->activeUndoTransaction->isEmpty();
+    }
+
+    return true;
+}
+
 void Document::clearUndos()
 {
    if (d->activeUndoTransaction)
@@ -1088,8 +1111,15 @@ unsigned int Document::getMaxUndoStackSize(void)const
    return d->UndoMaxStackSize;
 }

+void Document::onBeforeChange(const Property* prop)
+{
+    signalBeforeChange(*this, *prop);
+}
+
 void Document::onChanged(const Property* prop)
 {
+    signalChanged(*this, *prop);
+
    // the Name property is a label for display purposes
    if (prop == &Label) {
        App::GetApplication().signalRelabelDocument(*this);
@@ -1130,6 +1160,9 @@ void Document::onChanged(const Property* prop)

 void Document::onBeforeChangeProperty(const TransactionalObject *Who, const Property *What)
 {
+    if(Who->isDerivedFrom(App::DocumentObject::getClassTypeId()))
+        signalBeforeChangeObject(*static_cast<const App::DocumentObject*>(Who), *What);
+
    if (d->activeUndoTransaction && !d->rollback)
        d->activeUndoTransaction->addObjectChange(Who,What);
 }
@@ -1254,7 +1287,11 @@ Document::~Document()
    Console().Log("-App::Document: %s %p\n",getName(), this);
 #endif

-    clearUndos();
+    try {
+        clearUndos();
+    }
+    catch (const boost::exception&) {
+    }

    std::map<std::string,DocumentObject*>::iterator it;

@@ -1273,6 +1310,7 @@ Document::~Document()
    // not to dec'ref the Python object any more.
    // But we must still invalidate the Python object because it doesn't need to be
    // destructed right now because the interpreter can own several references to it.
+    Base::PyGILStateLocker lock;
    Base::PyObjectBase* doc = (Base::PyObjectBase*)DocumentPythonObject.ptr();
    // Call before decrementing the reference counter, otherwise a heap error can occur
    doc->setInvalid();
@@ -1307,11 +1345,6 @@ std::string Document::getTransientDirectoryName(const std::string& uuid, const s

 void Document::Save (Base::Writer &writer) const
 {
-    writer.Stream() << "<?xml version='1.0' encoding='utf-8'?>" << endl
-    << "<!--" << endl
-    << " FreeCAD Document, see http://www.freecadweb.org for more information..." << endl
-    << "-->" << endl;
-
    writer.Stream() << "<Document SchemaVersion=\"4\" ProgramVersion=\""
                    << App::Application::Config()["BuildVersionMajor"] << "."
                    << App::Application::Config()["BuildVersionMinor"] << "R"
@@ -1522,16 +1555,40 @@ Document::readObjects(Base::XMLReader& reader)
    setStatus(Document::KeepTrailingDigits, keepDigits);

    // read the features itself
+    reader.clearPartialRestoreDocumentObject();
    reader.readElement("ObjectData");
    Cnt = reader.getAttributeAsInteger("Count");
    for (int i=0 ;i<Cnt ;i++) {
        reader.readElement("Object");
        std::string name = reader.getName(reader.getAttribute("name"));
        DocumentObject* pObj = getObject(name.c_str());
+
        if (pObj) { // check if this feature has been registered
            pObj->setStatus(ObjectStatus::Restore, true);
-            pObj->Restore(reader);
+            try {
+                pObj->Restore(reader);
+            }
+            // Try to continue only for certain exception types if not handled
+            // by the feature type. For all other exception types abort the process.
+            catch (const Base::UnicodeError &e) {
+                e.ReportException();
+            }
+            catch (const Base::ValueError &e) {
+                e.ReportException();
+            }
+            catch (const Base::IndexError &e) {
+                e.ReportException();
+            }
+            catch (const Base::RuntimeError &e) {
+                e.ReportException();
+            }
+
            pObj->setStatus(ObjectStatus::Restore, false);
+
+            if (reader.testStatus(Base::XMLReader::ReaderStatus::PartialRestoreInDocumentObject)) {
+                Base::Console().Error("Object \"%s\" was subject to a partial restore. As a result geometry may have changed or be incomplete.\n",name.c_str());
+                reader.clearPartialRestoreDocumentObject();
+            }
        }
        reader.readEndElement("Object");
    }
@@ -1604,19 +1661,10 @@ bool Document::saveAs(const char* file)
    return save();
 }

-bool Document::saveCopy(const char* file)
+bool Document::saveCopy(const char* file) const
 {
-    std::string originalFileName = this->FileName.getStrValue();
-    std::string originalLabel = this->Label.getStrValue();
-    Base::FileInfo fi(file);
    if (this->FileName.getStrValue() != file) {
-        this->FileName.setValue(file);
-        this->Label.setValue(fi.fileNamePure());
-        this->Uid.touch(); // this forces a rename of the transient directory
-        bool result = save();
-        this->FileName.setValue(originalFileName);
-        this->Label.setValue(originalLabel);
-        this->Uid.touch();
+        bool result = saveToFile(file);
        return result;
    }
    return false;
@@ -1625,13 +1673,9 @@ bool Document::saveCopy(const char* file)
 // Save the document under the name it has been opened
 bool Document::save (void)
 {
-    int compression = App::GetApplication().GetParameterGroupByPath
-        ("User parameter:BaseApp/Preferences/Document")->GetInt("CompressionLevel",3);
-    compression = Base::clamp<int>(compression, Z_NO_COMPRESSION, Z_BEST_COMPRESSION);
-
    if (*(FileName.getValue()) != '\0') {
        // Save the name of the tip object in order to handle in Restore()
-        if(Tip.getValue()) {
+        if (Tip.getValue()) {
            TipName.setValue(Tip.getValue()->getNameInDocument());
        }

@@ -1645,40 +1689,72 @@ bool Document::save (void)
                ("User parameter:BaseApp/Preferences/Document")->GetASCII("prefAuthor","");
            LastModifiedBy.setValue(Author.c_str());
        }
-        // make a tmp. file where to save the project data first and then rename to
-        // the actual file name. This may be useful if overwriting an existing file
-        // fails so that the data of the work up to now isn't lost.
-        std::string uuid = Base::Uuid::createUuid();
-        std::string fn = FileName.getValue();
-        fn += "."; fn += uuid;
-        Base::FileInfo tmp(fn);

-        // open extra scope to close ZipWriter properly
-        {
-            Base::ofstream file(tmp, std::ios::out | std::ios::binary);
-            Base::ZipWriter writer(file);
+        return saveToFile(FileName.getValue());
+    }

-            writer.setComment("FreeCAD Document");
-            writer.setLevel(compression);
-            writer.putNextEntry("Document.xml");
+    return false;
+}

-            Document::Save(writer);
+bool Document::saveToFile(const char* filename) const
+{
+    signalStartSave(*this, filename);

-            // Special handling for Gui document.
-            signalSaveDocument(writer);
+    auto hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document");
+    int compression = hGrp->GetInt("CompressionLevel",3);
+    compression = Base::clamp<int>(compression, Z_NO_COMPRESSION, Z_BEST_COMPRESSION);

-            // write additional files
-            writer.writeFiles();
+    bool policy = App::GetApplication().GetParameterGroupByPath
+                ("User parameter:BaseApp/Preferences/Document")->GetBool("BackupPolicy",true);

-            if (writer.hasErrors()) {
-                throw Base::FileException("Failed to write all data to file", tmp);
-            }
+    // make a tmp. file where to save the project data first and then rename to
+    // the actual file name. This may be useful if overwriting an existing file
+    // fails so that the data of the work up to now isn't lost.
+    std::string uuid = Base::Uuid::createUuid();
+    std::string fn = filename;
+    if (policy) {
+        fn += ".";
+        fn += uuid;
+    }
+    Base::FileInfo tmp(fn);

-            GetApplication().signalSaveDocument(*this);
+    // open extra scope to close ZipWriter properly
+    {
+        Base::ofstream file(tmp, std::ios::out | std::ios::binary);
+        Base::ZipWriter writer(file);
+        if (!file.is_open()) {
+            throw Base::FileException("Failed to open file", tmp);
        }

+        writer.setComment("FreeCAD Document");
+        writer.setLevel(compression);
+        writer.putNextEntry("Document.xml");
+
+        if (hGrp->GetBool("SaveBinaryBrep", false))
+            writer.setMode("BinaryBrep");
+
+        writer.Stream() << "<?xml version='1.0' encoding='utf-8'?>" << endl
+                        << "<!--" << endl
+                        << " FreeCAD Document, see http://www.freecadweb.org for more information..." << endl
+                        << "-->" << endl;
+        Document::Save(writer);
+
+        // Special handling for Gui document.
+        signalSaveDocument(writer);
+
+        // write additional files
+        writer.writeFiles();
+
+        if (writer.hasErrors()) {
+            throw Base::FileException("Failed to write all data to file", tmp);
+        }
+
+        GetApplication().signalSaveDocument(*this);
+    }
+
+    if (policy) {
        // if saving the project data succeeded rename to the actual file name
-        Base::FileInfo fi(FileName.getValue());
+        Base::FileInfo fi(filename);
        if (fi.exists()) {
            bool backup = App::GetApplication().GetParameterGroupByPath
                ("User parameter:BaseApp/Preferences/Document")->GetBool("CreateBackupFiles",true);
@@ -1731,14 +1807,15 @@ bool Document::save (void)
                fi.deleteFile();
            }
        }
-        if (tmp.renameFile(FileName.getValue()) == false)
+        if (tmp.renameFile(filename) == false) {
            Base::Console().Warning("Cannot rename file from '%s' to '%s'\n",
-            fn.c_str(), FileName.getValue());
-
-        return true;
+                                    fn.c_str(), filename);
+        }
    }

-    return false;
+    signalFinishSave(*this, filename);
+
+    return true;
 }

 // Open the document
@@ -1755,6 +1832,7 @@ void Document::restore (void)
        signalTransactionRemove(*(*obj), 0);
    }
    for (std::vector<DocumentObject*>::iterator obj = d->objectArray.begin(); obj != d->objectArray.end(); ++obj) {
+        (*obj)->setStatus(ObjectStatus::Destroy, true);
        delete *obj;
    }
    d->objectArray.clear();
@@ -1807,6 +1885,11 @@ void Document::restore (void)

    GetApplication().signalFinishRestoreDocument(*this);
    setStatus(Document::Restoring, false);
+
+    if (reader.testStatus(Base::XMLReader::ReaderStatus::PartialRestore)) {
+        setStatus(Document::PartialRestore, true);
+        Base::Console().Error("There were errors while loading the file. Some data might have been modified or not recovered at all. Look above for more specific information about the objects involved.\n");
+    }
 }

 bool Document::isSaved() const
@@ -1957,7 +2040,7 @@ Document::getDependencyList(const std::vector<App::DocumentObject*>& objs) const
        std::stringstream ss;
        ss << "Gathering all dependencies failed, probably due to circular dependencies. Error: ";
        ss << e.what();
-        throw Base::RuntimeError(ss.str().c_str());
+        throw Base::BadGraphError(ss.str().c_str());
    }

    std::set<Vertex> out;
@@ -2075,7 +2158,7 @@ int Document::recompute()
    if (skip)
        return 0;

-    ObjectStatusLocker<Document::Status, Document> exe(Document::Recomputing, this);
+    Base::ObjectStatusLocker<Document::Status, Document> exe(Document::Recomputing, this);

    // delete recompute log
    for (std::vector<App::DocumentObjectExecReturn*>::iterator it=_RecomputeLog.begin();it!=_RecomputeLog.end();++it)
@@ -2088,7 +2171,6 @@ int Document::recompute()
    std::list<Vertex> make_order;
    DependencyList::out_edge_iterator j, jend;

-
    try {
        // this sort gives the execute
        boost::topological_sort(d->DepList, std::front_inserter(make_order));
@@ -2171,6 +2253,7 @@ int Document::recompute()
                d->vertexMap.clear();
                return -1;
            }
+            signalRecomputedObject(*Cur);
            ++objectCount;
        }
    }
@@ -2225,27 +2308,33 @@ int Document::recompute()

    for (auto objIt = topoSortedObjects.rbegin(); objIt != topoSortedObjects.rend(); ++objIt){
        // ask the object if it should be recomputed
-        if ((*objIt)->isTouched() || (*objIt)->mustExecute() == 1){
+        bool doRecompute = false;
+        if ((*objIt)->mustRecompute()) {
+            doRecompute = true;
            objectCount++;
            if (_recomputeFeature(*objIt)) {
                // if something happened break execution of recompute
                return -1;
            }
-            else{
-                (*objIt)->purgeTouched();
-                // set all dependent object touched to force recompute
-                for (auto inObjIt : (*objIt)->getInList())
-                    inObjIt->touch();
-            }
+
+            signalRecomputedObject(*(*objIt));
+        }
+
+        if ((*objIt)->isTouched() || doRecompute) {
+            (*objIt)->purgeTouched();
+            // force recompute of all dependent objects
+            for (auto inObjIt : (*objIt)->getInList())
+                inObjIt->enforceRecompute();
        }
    }
-#ifdef FC_DEBUG
-    // check if all objects are recalculated which were thouched
+
+    // check if all objects are recalculated which were touched
    for (auto objectIt : d->objectArray) {
-        if (objectIt->isTouched())
-            cerr << "Document::recompute(): " << objectIt->getNameInDocument() << " still touched after recompute" << endl;
+        if (objectIt->isTouched()) {
+            Base::Console().Warning("Document::recompute(): %s still touched after recompute\n",
+                                    objectIt->getNameInDocument());
+        }
    }
-#endif

    signalRecomputed(*this);

@@ -2398,7 +2487,8 @@ std::vector<App::DocumentObject*> DocumentP::topologicalSort(const std::vector<A

        for (auto outListIt : out) {
            auto outListMapIt = countMap.find(outListIt);
-            outListMapIt->second = outListMapIt->second - 1;
+            if (outListMapIt != countMap.end())
+                outListMapIt->second = outListMapIt->second - 1;
        }
        ret.push_back(rootObjeIt->first);

@@ -2437,7 +2527,7 @@ bool Document::_recomputeFeature(DocumentObject* Feat)
            returnCode->Which = Feat;
            _RecomputeLog.push_back(returnCode);
    #ifdef FC_DEBUG
-            Base::Console().Error("%s\n",returnCode->Why.c_str());
+            Base::Console().Error("Error in feature: %s\n%s\n",Feat->getNameInDocument(),returnCode->Why.c_str());
    #endif
            Feat->setError();
            return true;
@@ -2486,7 +2576,7 @@ bool Document::_recomputeFeature(DocumentObject* Feat)
        returnCode->Which = Feat;
        _RecomputeLog.push_back(returnCode);
 #ifdef FC_DEBUG
-        Base::Console().Error("%s\n",returnCode->Why.c_str());
+        Base::Console().Error("Error in feature: %s\n%s\n",Feat->getNameInDocument(),returnCode->Why.c_str());
 #endif
        Feat->setError();
    }
@@ -2501,8 +2591,10 @@ void Document::recomputeFeature(DocumentObject* Feat)
    _RecomputeLog.clear();

    // verify that the feature is (active) part of the document
-    if (Feat->getNameInDocument())
+    if (Feat->getNameInDocument()) {
        _recomputeFeature(Feat);
+        signalRecomputedObject(*Feat);
+    }
 }

 DocumentObject * Document::addObject(const char* sType, const char* pObjectName, bool isNew)
@@ -2819,7 +2911,6 @@ void Document::_removeObject(DocumentObject* pcObject)

    std::map<std::string,DocumentObject*>::iterator pos = d->objectMap.find(pcObject->getNameInDocument());

-
    if (d->activeObject == pcObject)
        d->activeObject = 0;

@@ -2940,7 +3031,13 @@ void Document::breakDependency(DocumentObject* pcObject, bool clear)
            std::vector<App::ObjectIdentifier> paths;
            pcObject->ExpressionEngine.getPathsToDocumentObject(it->second, paths);
            for (std::vector<App::ObjectIdentifier>::iterator jt = paths.begin(); jt != paths.end(); ++jt) {
-                pcObject->ExpressionEngine.setValue(*jt, nullptr);
+                // When nullifying the expression handle case where an identifier lacks of the property
+                try {
+                    pcObject->ExpressionEngine.setValue(*jt, nullptr);
+                }
+                catch (const Base::Exception& e) {
+                    e.ReportException();
+                }
            }
        }
    }
@@ -2956,6 +3053,11 @@ DocumentObject* Document::copyObject(DocumentObject* obj, bool recursive)
    md.setVerbose(recursive);
    if (recursive) {
        objs = obj->getDocument()->getDependencyList(objs);
+        auto it = std::find(objs.begin(), objs.end(), obj);
+        if (it != objs.end()) {
+            auto index = std::distance(objs.begin(), it);
+            std::swap(objs[index], objs.back());
+        }
    }

    unsigned int memsize=1000; // ~ for the meta-information
@@ -37,7 +37,7 @@
 #include <stack>
 #include <functional>

-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>

 namespace Base {
    class Writer;
@@ -68,7 +68,8 @@ public:
        KeepTrailingDigits = 1,
        Closable = 2,
        Restoring = 3,
-        Recomputing = 4
+        Recomputing = 4,
+        PartialRestore = 5
    };

    /** @name Properties */
@@ -112,41 +113,58 @@ public:

    /** @name Signals of the document */
    //@{
+    /// signal before changing an doc property
+    boost::signals2::signal<void (const App::Document&, const App::Property&)> signalBeforeChange;
+    /// signal on changed doc property
+    boost::signals2::signal<void (const App::Document&, const App::Property&)> signalChanged;
    /// signal on new Object
-    boost::signal<void (const App::DocumentObject&)> signalNewObject;
-    //boost::signal<void (const App::DocumentObject&)>     m_sig;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalNewObject;
+    //boost::signals2::signal<void (const App::DocumentObject&)>     m_sig;
    /// signal on deleted Object
-    boost::signal<void (const App::DocumentObject&)> signalDeletedObject;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalDeletedObject;
+    /// signal before changing an Object
+    boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalBeforeChangeObject;
    /// signal on changed Object
-    boost::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
+    boost::signals2::signal<void (const App::DocumentObject&, const App::Property&)> signalChangedObject;
    /// signal on relabeled Object
-    boost::signal<void (const App::DocumentObject&)> signalRelabelObject;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalRelabelObject;
    /// signal on activated Object
-    boost::signal<void (const App::DocumentObject&)> signalActivatedObject;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalActivatedObject;
    /// signal on created object
-    boost::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionAppend;
+    boost::signals2::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionAppend;
    /// signal on removed object
-    boost::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionRemove;
+    boost::signals2::signal<void (const App::DocumentObject&, Transaction*)> signalTransactionRemove;
    /// signal on undo
-    boost::signal<void (const App::Document&)> signalUndo;
+    boost::signals2::signal<void (const App::Document&)> signalUndo;
    /// signal on redo
-    boost::signal<void (const App::Document&)> signalRedo;
+    boost::signals2::signal<void (const App::Document&)> signalRedo;
    /** signal on load/save document
     * this signal is given when the document gets streamed.
     * you can use this hook to write additional information in
-     * the file (like the Gui::Document it does).
+     * the file (like the Gui::Document does).
     */
-    boost::signal<void (Base::Writer   &)> signalSaveDocument;
-    boost::signal<void (Base::XMLReader&)> signalRestoreDocument;
-    boost::signal<void (const std::vector<App::DocumentObject*>&,
-                        Base::Writer   &)> signalExportObjects;
-    boost::signal<void (const std::vector<App::DocumentObject*>&,
-                        Base::Writer   &)> signalExportViewObjects;
-    boost::signal<void (const std::vector<App::DocumentObject*>&,
-                        Base::XMLReader&)> signalImportObjects;
-    boost::signal<void (const std::vector<App::DocumentObject*>&, Base::Reader&,
-                        const std::map<std::string, std::string>&)> signalImportViewObjects;
-    boost::signal<void (const App::Document&)> signalRecomputed;
+    boost::signals2::signal<void (Base::Writer   &)> signalSaveDocument;
+    boost::signals2::signal<void (Base::XMLReader&)> signalRestoreDocument;
+    boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
+                                  Base::Writer   &)> signalExportObjects;
+    boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
+                                  Base::Writer   &)> signalExportViewObjects;
+    boost::signals2::signal<void (const std::vector<App::DocumentObject*>&,
+                                  Base::XMLReader&)> signalImportObjects;
+    boost::signals2::signal<void (const std::vector<App::DocumentObject*>&, Base::Reader&,
+                                  const std::map<std::string, std::string>&)> signalImportViewObjects;
+    //signal starting a save action to a file
+    boost::signals2::signal<void (const App::Document&, const std::string&)> signalStartSave;
+    //signal finishing a save action to a file
+    boost::signals2::signal<void (const App::Document&, const std::string&)> signalFinishSave;
+    boost::signals2::signal<void (const App::Document&)> signalRecomputed;
+    boost::signals2::signal<void (const App::DocumentObject&)> signalRecomputedObject;
+    //signal a new opened transaction
+    boost::signals2::signal<void (const App::Document&, std::string)> signalOpenTransaction;
+    // signal a committed transaction
+    boost::signals2::signal<void (const App::Document&)> signalCommitTransaction;
+    // signal an aborted transaction
+    boost::signals2::signal<void (const App::Document&)> signalAbortTransaction;
    //@}

    /** @name File handling of the document */
@@ -156,7 +174,7 @@ public:
    /// Save the document to the file in Property Path
    bool save (void);
    bool saveAs(const char* file);
-    bool saveCopy(const char* file);
+    bool saveCopy(const char* file) const;
    /// Restore the document from the file in Property Path
    void restore (void);
    void exportObjects(const std::vector<App::DocumentObject*>&, std::ostream&);
@@ -202,7 +220,7 @@ public:
     * is raised.
     */
    void addObject(DocumentObject*, const char* pObjectName=0);
-    
+

    /** Copy an object from another document to this document
     * If \a recursive is true then all objects this object depends on
@@ -255,7 +273,7 @@ public:
    void setClosable(bool);
    /// check whether the document can be closed
    bool isClosable() const;
-    /// Recompute all touched features and return the amount of recalculated features
+    /// Recompute all touched features and return the number of recalculated features
    int recompute();
    /// Recompute only one feature
    void recomputeFeature(DocumentObject* Feat);
@@ -286,6 +304,9 @@ public:
    void abortTransaction();
    /// Check if a transaction is open
    bool hasPendingTransaction() const;
+    /// Check if a transaction is open and its list is empty.
+    /// If no transaction is open true is returned.
+    bool isTransactionEmpty() const;
    /// Set the Undo limit in Byte!
    void setUndoLimit(unsigned int UndoMemSize=0);
    /// Returns the actual memory consumption of the Undo redo stuff.
@@ -364,7 +385,9 @@ protected:
    void breakDependency(DocumentObject* pcObject, bool clear);
    std::vector<App::DocumentObject*> readObjects(Base::XMLReader& reader);
    void writeObjects(const std::vector<App::DocumentObject*>&, Base::Writer &writer) const;
+    bool saveToFile(const char* filename) const;

+    void onBeforeChange(const Property* prop);
    void onChanged(const Property* prop);
    /// callback from the Document objects before property will be changed
    void onBeforeChangeProperty(const TransactionalObject *Who, const Property *What);
@@ -38,7 +38,6 @@
 #include "DocumentObjectExtension.h"
 #include "GeoFeatureGroupExtension.h"
 #include <App/DocumentObjectPy.h>
-#include <boost/signals/connection.hpp>
 #include <boost/bind.hpp>

 using namespace App;
@@ -63,6 +62,7 @@ DocumentObject::DocumentObject(void)
 DocumentObject::~DocumentObject(void)
 {
    if (!PythonObject.is(Py::_None())){
+        Base::PyGILStateLocker lock;
        // Remark: The API of Py::Object has been changed to set whether the wrapper owns the passed
        // Python object or not. In the constructor we forced the wrapper to own the object so we need
        // not to dec'ref the Python object any more.
@@ -77,12 +77,13 @@ DocumentObject::~DocumentObject(void)
 App::DocumentObjectExecReturn *DocumentObject::recompute(void)
 {
    //check if the links are valid before making the recompute
-    if(!GeoFeatureGroupExtension::areLinksValid(this))
+    if(!GeoFeatureGroupExtension::areLinksValid(this)) {
 #if 1
-        Base::Console().Warning("%s: Links go out of the allowed scope\n", getTypeId().getName());
+        Base::Console().Warning("%s / %s: Links go out of the allowed scope\n", getTypeId().getName(), getNameInDocument());
 #else
        return new App::DocumentObjectExecReturn("Links go out of the allowed scope", this);
 #endif
+    }

    // set/unset the execution bit
    Base::ObjectStatusLocker<ObjectStatus, DocumentObject> exe(App::Recompute, this);
@@ -110,19 +111,65 @@ bool DocumentObject::recomputeFeature()
    return isValid();
 }

+/**
+ * @brief Set this document object touched.
+ * Touching a document object does not mean to recompute it, it only means that
+ * other document objects that link it (i.e. its InList) will be recomputed.
+ * If it should be forced to recompute a document object then use
+ * \ref enforceRecompute() instead.
+ */
+void DocumentObject::touch(void)
+{
+    StatusBits.set(ObjectStatus::Touch);
+}
+
+/**
+ * @brief Check whether the document object is touched or not.
+ * @return true if document object is touched, false if not.
+ */
+bool DocumentObject::isTouched() const
+{
+    return ExpressionEngine.isTouched() || StatusBits.test(ObjectStatus::Touch);
+}
+
+/**
+ * @brief Enforces this document object to be recomputed.
+ * This can be useful to recompute the feature without
+ * having to change one of its input properties.
+ */
+void DocumentObject::enforceRecompute(void)
+{
+    StatusBits.set(ObjectStatus::Enforce);
+    StatusBits.set(ObjectStatus::Touch);
+}
+
+/**
+ * @brief Check whether the document object must be recomputed or not.
+ * This means that the 'Enforce' flag is set or that \ref mustExecute()
+ * returns a value > 0.
+ * @return true if document object must be recomputed, false if not.
+ */
+bool DocumentObject::mustRecompute(void) const
+{
+    if (StatusBits.test(ObjectStatus::Enforce))
+        return true;
+
+    return mustExecute() > 0;
+}
+
 short DocumentObject::mustExecute(void) const
 {
-    if(isTouched())
+    if (ExpressionEngine.isTouched())
        return 1;

    //ask all extensions
    auto vector = getExtensionsDerivedFromType<App::DocumentObjectExtension>();
    for(auto ext : vector) {
-        if(ext->extensionMustExecute())
+        if (ext->extensionMustExecute())
            return 1;
    }
+
    return 0;
-    
 }

 const char* DocumentObject::getStatusString(void) const
@@ -251,45 +298,45 @@ std::vector<App::DocumentObject*> DocumentObject::getInList(void) const
 #endif // if USE_OLD_DAG


-void _getInListRecursive(std::vector<DocumentObject*>& objSet, const DocumentObject* obj, const DocumentObject* checkObj, int depth)
+void _getInListRecursive(std::set<DocumentObject*>& objSet,
+                         const DocumentObject* obj,
+                         const DocumentObject* checkObj, int depth)
 {
-    for (const auto objIt : obj->getInList()){
+    for (const auto objIt : obj->getInList()) {
        // if the check object is in the recursive inList we have a cycle!
-        if (objIt == checkObj || depth <= 0){
-            std::cerr << "DocumentObject::getInListRecursive(): cyclic dependency detected!"<<std::endl;
-            throw Base::RuntimeError("DocumentObject::getInListRecursive(): cyclic dependency detected!");
+        if (objIt == checkObj || depth <= 0) {
+            throw Base::BadGraphError("DocumentObject::getInListRecursive(): cyclic dependency detected!");
        }

-        objSet.push_back(objIt);
-        _getInListRecursive(objSet, objIt, checkObj,depth-1);
+        // if the element was already in the set then there is no need to process it again
+        auto pair = objSet.insert(objIt);
+        if (pair.second)
+            _getInListRecursive(objSet, objIt, checkObj, depth-1);
    }
 }

 std::vector<App::DocumentObject*> DocumentObject::getInListRecursive(void) const
 {
    // number of objects in document is a good estimate in result size
-    int maxDepth = getDocument()->countObjects() +2;
-    std::vector<App::DocumentObject*> result;
-    result.reserve(maxDepth);
+    int maxDepth = getDocument()->countObjects() + 2;
+    std::set<App::DocumentObject*> result;

    // using a rcursie helper to collect all InLists
    _getInListRecursive(result, this, this, maxDepth);

-    // remove duplicate entries and resize the vector
-    std::sort(result.begin(), result.end());
-    auto newEnd = std::unique(result.begin(), result.end());
-    result.resize(std::distance(result.begin(), newEnd));
-
-    return result;
+    std::vector<App::DocumentObject*> array;
+    array.insert(array.begin(), result.begin(), result.end());
+    return array;
 }

-void _getOutListRecursive(std::set<DocumentObject*>& objSet, const DocumentObject* obj, const DocumentObject* checkObj, int depth)
+void _getOutListRecursive(std::set<DocumentObject*>& objSet,
+                          const DocumentObject* obj,
+                          const DocumentObject* checkObj, int depth)
 {
-    for (const auto objIt : obj->getOutList()){
+    for (const auto objIt : obj->getOutList()) {
        // if the check object is in the recursive inList we have a cycle!
-        if (objIt == checkObj || depth <= 0){
-            std::cerr << "DocumentObject::getOutListRecursive(): cyclic dependency detected!" << std::endl;
-            throw Base::RuntimeError("DocumentObject::getOutListRecursive(): cyclic dependency detected!");
+        if (objIt == checkObj || depth <= 0) {
+            throw Base::BadGraphError("DocumentObject::getOutListRecursive(): cyclic dependency detected!");
        }

        // if the element was already in the set then there is no need to process it again
@@ -313,6 +360,81 @@ std::vector<App::DocumentObject*> DocumentObject::getOutListRecursive(void) cons
    return array;
 }

+// helper for isInInListRecursive()
+bool _isInInListRecursive(const DocumentObject* act,
+                          const DocumentObject* checkObj, int depth)
+{
+#ifndef  USE_OLD_DAG
+    for (auto obj : act->getInList()) {
+        if (obj == checkObj)
+            return true;
+        // if we reach the depth limit we have a cycle!
+        if (depth <= 0) {
+            throw Base::BadGraphError("DocumentObject::isInInListRecursive(): cyclic dependency detected!");
+        }
+
+        if (_isInInListRecursive(obj, checkObj, depth - 1))
+            return true;
+    }
+#else
+    (void)act;
+    (void)checkObj;
+    (void)depth;
+#endif
+
+    return false;
+}
+
+bool DocumentObject::isInInListRecursive(DocumentObject *linkTo) const
+{
+    int maxDepth = getDocument()->countObjects() + 2;
+    return _isInInListRecursive(this, linkTo, maxDepth);
+}
+
+bool DocumentObject::isInInList(DocumentObject *linkTo) const
+{
+#ifndef  USE_OLD_DAG
+    if (std::find(_inList.begin(), _inList.end(), linkTo) != _inList.end())
+        return true;
+    else
+        return false;
+#else
+    (void)linkTo;
+    return false;
+#endif
+}
+
+// helper for isInOutListRecursive()
+bool _isInOutListRecursive(const DocumentObject* act,
+                           const DocumentObject* checkObj, int depth)
+{
+#ifndef  USE_OLD_DAG
+    for (auto obj : act->getOutList()) {
+        if (obj == checkObj)
+            return true;
+        // if we reach the depth limit we have a cycle!
+        if (depth <= 0) {
+            throw Base::BadGraphError("DocumentObject::isInOutListRecursive(): cyclic dependency detected!");
+        }
+
+        if (_isInOutListRecursive(obj, checkObj, depth - 1))
+            return true;
+    }
+#else
+    (void)act;
+    (void)checkObj;
+    (void)depth;
+#endif
+
+    return false;
+}
+
+bool DocumentObject::isInOutListRecursive(DocumentObject *linkTo) const
+{
+    int maxDepth = getDocument()->countObjects() + 2;
+    return _isInOutListRecursive(this, linkTo, maxDepth);
+}
+
 std::vector<std::list<App::DocumentObject*> >
 DocumentObject::getPathsByOutList(App::DocumentObject* to) const
 {
@@ -358,86 +480,6 @@ bool DocumentObject::testIfLinkDAGCompatible(PropertyLinkSub &linkTo) const
    return this->testIfLinkDAGCompatible(linkTo_in_vector);
 }

-bool DocumentObject::_isInInListRecursive(const DocumentObject* /*act*/,
-                                          const DocumentObject* test,
-                                          const DocumentObject* checkObj, int depth) const
-{
-#ifndef  USE_OLD_DAG
-    if (std::find(_inList.begin(), _inList.end(), test) != _inList.end())
-        return true;
-
-    for (auto obj : _inList){
-        // if the check object is in the recursive inList we have a cycle!
-        if (obj == checkObj || depth <= 0){
-            std::cerr << "DocumentObject::getOutListRecursive(): cyclic dependency detected!" << std::endl;
-            throw Base::RuntimeError("DocumentObject::getOutListRecursive(): cyclic dependency detected!");
-        }
-
-        if (_isInInListRecursive(obj, test, checkObj, depth - 1))
-            return true;
-    }
-#else
-    (void)test;
-    (void)checkObj;
-    (void)depth;
-#endif
-
-    return false;
-}
-
-bool DocumentObject::isInInListRecursive(DocumentObject *linkTo) const
-{
-    return _isInInListRecursive(this, linkTo, this, getDocument()->countObjects());
-}
-
-bool DocumentObject::isInInList(DocumentObject *linkTo) const
-{
-#ifndef  USE_OLD_DAG
-    if (std::find(_inList.begin(), _inList.end(), linkTo) != _inList.end())
-        return true;
-    else
-        return false;
-#else
-    (void)linkTo;
-    return false;
-#endif
-}
-
-bool DocumentObject::_isInOutListRecursive(const DocumentObject* act,
-                                           const DocumentObject* test,
-                                           const DocumentObject* checkObj, int depth) const
-{
-#ifndef  USE_OLD_DAG
-    std::vector <DocumentObject*> outList = act->getOutList();
-
-    if (std::find(outList.begin(), outList.end(), test) != outList.end())
-        return true;
-
-    for (auto obj : outList){
-        // if the check object is in the recursive inList we have a cycle!
-        if (obj == checkObj || depth <= 0){
-            std::cerr << "DocumentObject::isInOutListRecursive(): cyclic dependency detected!" << std::endl;
-            throw Base::RuntimeError("DocumentObject::isInOutListRecursive(): cyclic dependency detected!");
-        }
-
-        if (_isInOutListRecursive(obj, test, checkObj, depth - 1))
-            return true;
-    }
-#else
-    (void)act;
-    (void)test;
-    (void)checkObj;
-    (void)depth;
-#endif
-
-    return false;
-}
-
-bool DocumentObject::isInOutListRecursive(DocumentObject *linkTo) const
-{
-    return _isInOutListRecursive(this, linkTo, this, getDocument()->countObjects());
-}
-
 void DocumentObject::onLostLinkToObject(DocumentObject*)
 {

@@ -454,10 +496,27 @@ void DocumentObject::setDocument(App::Document* doc)
    onSettingDocument();
 }

-void DocumentObject::onAboutToRemoveProperty(const char* prop)
+void DocumentObject::onAboutToRemoveProperty(const char* name)
 {
-    if (_pDoc)
-        _pDoc->removePropertyOfObject(this, prop);
+    if (_pDoc) {
+        _pDoc->removePropertyOfObject(this, name);
+
+        Property* prop = getDynamicPropertyByName(name);
+        if (prop) {
+            auto expressions = ExpressionEngine.getExpressions();
+            std::vector<App::ObjectIdentifier> removeExpr;
+
+            for (auto it : expressions) {
+                if (it.first.getProperty() == prop) {
+                    removeExpr.push_back(it.first);
+                }
+            }
+
+            for (auto it : removeExpr) {
+                ExpressionEngine.setValue(it, boost::shared_ptr<Expression>());
+            }
+        }
+    }
 }

 void DocumentObject::onBeforeChange(const Property* prop)
@@ -481,9 +540,13 @@ void DocumentObject::onChanged(const Property* prop)
        _pDoc->signalRelabelObject(*this);

    // set object touched if it is an input property
-    if (!(prop->getType() & Prop_Output))
+    if (!(prop->getType() & Prop_Output)) {
        StatusBits.set(ObjectStatus::Touch);
-    
+        // must execute on document recompute
+        if (!(prop->getType() & Prop_NoRecompute))
+            StatusBits.set(ObjectStatus::Enforce);
+    }
+
    //call the parent for appropriate handling
    TransactionalObject::onChanged(prop);
 }
@@ -503,21 +566,6 @@ std::vector<PyObject *> DocumentObject::getPySubObjects(const std::vector<std::s
    return std::vector<PyObject *>();
 }

-void DocumentObject::touch(void)
-{
-    StatusBits.set(ObjectStatus::Touch);
-}
-
-/**
- * @brief Check whether the document object is touched or not.
- * @return true if document object is touched, false if not.
- */
-
-bool DocumentObject::isTouched() const
-{
-    return ExpressionEngine.isTouched() || StatusBits.test(ObjectStatus::Touch);
-}
-
 void DocumentObject::Save (Base::Writer &writer) const
 {
    if (this->getNameInDocument())
@@ -33,7 +33,7 @@
 #include <CXX/Objects.hxx>

 #include <bitset>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>

 namespace App
 {
@@ -51,6 +51,7 @@ enum ObjectStatus {
    Remove = 5,
    PythonCall = 6,
    Destroy = 7,
+    Enforce = 8,
    Expand = 16
 };

@@ -105,13 +106,18 @@ public:
    /** Set the property touched -> changed, cause recomputation in Update()
     */
    //@{
-    /// set this feature touched (cause recomputation on depndend features)
+    /// set this document object touched (cause recomputation on dependent features)
    void touch(void);
-    /// test if this feature is touched
+    /// test if this document object is touched
    bool isTouched(void) const;
-    /// reset this feature touched
+    /// Enforce this document object to be recomputed
+    void enforceRecompute();
+    /// Test if this document object must be recomputed
+    bool mustRecompute(void) const;
+    /// reset this document object touched
    void purgeTouched(void) {
        StatusBits.reset(ObjectStatus::Touch);
+        StatusBits.reset(ObjectStatus::Enforce);
        setPropertyStatus(0,false);
    }
    /// set this feature to error
@@ -133,7 +139,7 @@ public:

    /** DAG handling
        This part of the interface deals with viewing the document as
-        an DAG (directed acyclic graph). 
+        a DAG (directed acyclic graph).
    */
    //@{
    /// returns a list of objects this object is pointing to by Links
@@ -146,7 +152,7 @@ public:
    std::vector<std::list<App::DocumentObject*> > getPathsByOutList(App::DocumentObject* to) const;
    /// get all objects link to this object
    std::vector<App::DocumentObject*> getInList(void) const;
-    /// get all objects link directly or indirectly to this object 
+    /// get all objects link directly or indirectly to this object
    std::vector<App::DocumentObject*> getInListRecursive(void) const;
    /// get group if object is part of a group, otherwise 0 is returned
    DocumentObjectGroup* getGroup() const;
@@ -185,9 +191,12 @@ public:
     *  We call this method to check if the object was modified to
     *  be invoked. If the object label or an argument is modified.
     *  If we must recompute the object - to call the method execute().
-     *  0: no recompution is needed
-     *  1: recompution needed
-     * -1: the document examine all links of this object and if one is touched -> recompute
+     *  0: no recomputation is needed
+     *  1: recomputation needed
+     *
+     * @remark If an object is marked as 'touched' then this does not
+     * necessarily mean that it will be recomputed. It only means that all
+     * objects that link it (i.e. its InList) will be recomputed.
     */
    virtual short mustExecute(void) const;

@@ -234,7 +243,7 @@ protected:
    /** get called by the document to recompute this feature
      * Normally this method get called in the processing of
      * Document::recompute().
-      * In execute() the outpupt properties get recomputed
+      * In execute() the output properties get recomputed
      * with the data from linked objects and objects own
      * properties.
      */
@@ -242,7 +251,7 @@ protected:

    /** Status bits of the document object
     * The first 8 bits are used for the base system the rest can be used in
-     * descendent classes to to mark special stati on the objects.
+     * descendent classes to mark special statuses on the objects.
     * The bits and their meaning are listed below:
     *  0 - object is marked as 'touched'
     *  1 - object is marked as 'erroneous'
@@ -275,31 +284,27 @@ protected:
    /// get called when object is going to be removed from the document
    virtual void unsetupObject();

-     /// python object of this class and all descendend
+     /// python object of this class and all descendent
 protected: // attributes
    Py::Object PythonObject;
    /// pointer to the document this object belongs to
    App::Document* _pDoc;

    // Connections to track relabeling of document and document objects
-    boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledDocumentConnection;
-    boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onRelabledObjectConnection;
-    boost::BOOST_SIGNALS_NAMESPACE::scoped_connection onDeletedObjectConnection;
+    boost::signals2::scoped_connection onRelabledDocumentConnection;
+    boost::signals2::scoped_connection onRelabledObjectConnection;
+    boost::signals2::scoped_connection onDeletedObjectConnection;

    /// Old label; used for renaming expressions
    std::string oldLabel;

    // pointer to the document name string (for performance)
    const std::string *pcNameInDocument;
-    
+
 private:
    // Back pointer to all the fathers in a DAG of the document
    // this is used by the document (via friend) to have a effective DAG handling
    std::vector<App::DocumentObject*> _inList;
-    // helper for isInInListRecursive()
-    bool _isInInListRecursive(const DocumentObject *act, const DocumentObject* test, const DocumentObject* checkObj, int depth) const;
-    // helper for isInOutListRecursive()
-    bool _isInOutListRecursive(const DocumentObject *act, const DocumentObject* test, const DocumentObject* checkObj, int depth) const;
 };

 } //namespace App
@@ -45,6 +45,11 @@
 				<UserDocu>Mark the object as unchanged</UserDocu>
 			</Documentation>
 		</Methode>
+        <Methode Name="enforceRecompute">
+            <Documentation>
+                <UserDocu>Mark the object for recompute</UserDocu>
+            </Documentation>
+        </Methode>
        <Methode Name="setExpression">
            <Documentation>
                <UserDocu>Register an expression for a property</UserDocu>
@@ -146,6 +146,14 @@ PyObject*  DocumentObjectPy::purgeTouched(PyObject * args)
    Py_Return;
 }

+PyObject*  DocumentObjectPy::enforceRecompute(PyObject * args)
+{
+    if (!PyArg_ParseTuple(args, ""))     // convert args: Python->C
+        return NULL;                    // NULL triggers exception
+    getDocumentObjectPtr()->enforceRecompute();
+    Py_Return;
+}
+
 Py::List DocumentObjectPy::getState(void) const
 {
    DocumentObject* object = this->getDocumentObjectPtr();
@@ -27,7 +27,6 @@
 # include <sstream>
 #endif

-#include <boost/signals.hpp>
 #include <boost/bind.hpp>

 #include "Application.h"
@@ -47,6 +46,11 @@ DocumentT::DocumentT(Document* doc)
    document = doc->getName();
 }

+DocumentT::DocumentT(const std::string& name)
+{
+    document = name;
+}
+
 DocumentT::~DocumentT()
 {
 }
@@ -63,6 +67,11 @@ void DocumentT::operator=(const Document* doc)
    document = doc->getName();
 }

+void DocumentT::operator=(const std::string& name)
+{
+    document = name;
+}
+
 Document* DocumentT::getDocument() const
 {
    return GetApplication().getDocument(document.c_str());
@@ -78,10 +87,10 @@ std::string DocumentT::getDocumentPython() const
    std::stringstream str;
    Document* doc = GetApplication().getActiveDocument();
    if (doc && document == doc->getName()) {
-        str << "FreeCAD.ActiveDocument";
+        str << "App.ActiveDocument";
    }
    else {
-        str << "FreeCAD.getDocument(\""
+        str << "App.getDocument(\""
            << document
            << "\")";
    }
@@ -136,10 +145,10 @@ std::string DocumentObjectT::getDocumentPython() const
    std::stringstream str;
    Document* doc = GetApplication().getActiveDocument();
    if (doc && document == doc->getName()) {
-        str << "FreeCAD.ActiveDocument";
+        str << "App.ActiveDocument";
    }
    else {
-        str << "FreeCAD.getDocument(\""
+        str << "App.getDocument(\""
            << document
            << "\")";
    }
@@ -171,10 +180,10 @@ std::string DocumentObjectT::getObjectPython() const
    std::stringstream str;
    Document* doc = GetApplication().getActiveDocument();
    if (doc && document == doc->getName()) {
-        str << "FreeCAD.ActiveDocument.";
+        str << "App.ActiveDocument.";
    }
    else {
-        str << "FreeCAD.getDocument(\""
+        str << "App.getDocument(\""
            << document
            << "\").";
    }
@@ -228,6 +237,10 @@ void DocumentObserver::attachDocument(Document* doc)
            (&DocumentObserver::slotDeletedObject, this, _1));
        this->connectDocumentChangedObject = _document->signalChangedObject.connect(boost::bind
            (&DocumentObserver::slotChangedObject, this, _1, _2));
+        this->connectDocumentRecomputedObject = _document->signalRecomputedObject.connect(boost::bind
+            (&DocumentObserver::slotRecomputedObject, this, _1));
+        this->connectDocumentRecomputed = _document->signalRecomputed.connect(boost::bind
+            (&DocumentObserver::slotRecomputedDocument, this, _1));
    }
 }

@@ -238,6 +251,8 @@ void DocumentObserver::detachDocument()
        this->connectDocumentCreatedObject.disconnect();
        this->connectDocumentDeletedObject.disconnect();
        this->connectDocumentChangedObject.disconnect();
+        this->connectDocumentRecomputedObject.disconnect();
+        this->connectDocumentRecomputed.disconnect();
    }
 }

@@ -261,6 +276,15 @@ void DocumentObserver::slotChangedObject(const App::DocumentObject& /*Obj*/, con
 {
 }

+void DocumentObserver::slotRecomputedObject(const DocumentObject& /*Obj*/)
+{
+}
+
+void DocumentObserver::slotRecomputedDocument(const Document& /*doc*/)
+{
+}
+
+
 // -----------------------------------------------------------------------------

 DocumentObjectObserver::DocumentObjectObserver()
@@ -25,7 +25,7 @@
 #define APP_DOCUMENTOBSERVER_H

 #include <Base/BaseClass.h>
-#include <boost/signals.hpp>
+#include <boost/signals2.hpp>
 #include <set>

 namespace App
@@ -48,12 +48,16 @@ public:
    DocumentT();
    /*! Constructor */
    DocumentT(Document*);
+    /*! Constructor */
+    DocumentT(const std::string&);
    /*! Destructor */
    ~DocumentT();
    /*! Assignment operator */
    void operator=(const DocumentT&);
    /*! Assignment operator */
    void operator=(const Document*);
+    /*! Assignment operator */
+    void operator=(const std::string&);

    /*! Get a pointer to the document or 0 if it doesn't exist any more. */
    Document* getDocument() const;
@@ -151,18 +155,24 @@ private:
    virtual void slotDeletedObject(const App::DocumentObject& Obj);
    /** The property of an observed object has changed */
    virtual void slotChangedObject(const App::DocumentObject& Obj, const App::Property& Prop);
+    /** Called when a given object is recomputed */
+    virtual void slotRecomputedObject(const App::DocumentObject& Obj);
+    /** Called when a observed document is recomputed */
+    virtual void slotRecomputedDocument(const App::Document& Doc);

 protected:
    Document* getDocument() const;

 private:
    App::Document* _document;
-    typedef boost::signals::connection Connection;
+    typedef boost::signals2::connection Connection;
    Connection connectApplicationCreatedDocument;
    Connection connectApplicationDeletedDocument;
    Connection connectDocumentCreatedObject;
    Connection connectDocumentDeletedObject;
    Connection connectDocumentChangedObject;
+    Connection connectDocumentRecomputedObject;
+    Connection connectDocumentRecomputed;
 };

 /**
--- a/Show More
+++ b/Show More