diff -Nru freecad-0.13.1830-dfsg/debian/changelog freecad-0.13.1830-dfsg/debian/changelog --- freecad-0.13.1830-dfsg/debian/changelog 2013-05-30 17:49:15.000000000 +0000 +++ freecad-0.13.1830-dfsg/debian/changelog 2013-08-07 18:42:52.000000000 +0000 @@ -1,3 +1,23 @@ +freecad (0.13.1830-dfsg-2+rpi2) jessie-staging; urgency=low + + * Also reduce dependency on python-pivy to match version we have. + + -- Peter Michael Green Wed, 07 Aug 2013 18:42:18 +0000 + +freecad (0.13.1830-dfsg-2+rpi1) jessie-staging; urgency=low + + * Fix build failures with new oce by forcing occ include directory + (Closes: 718545, 717034) + * Remove some stuff left behind by build process in clean target to prevent + errors from dpkg-source when building multiple times in a row. + + obj-* + + src/Mod/Start/Gui/share + + src/Mod/Drawing/App/share + * Drop back to using coin 60 and corresponding version of soqt4-dev for now + since that is what is in jessie + + -- Peter Michael Green Mon, 05 Aug 2013 18:41:52 +0000 + freecad (0.13.1830-dfsg-2) unstable; urgency=low * [800a2d9] Compile freecad against libcoin80. (Closes: #617613) diff -Nru freecad-0.13.1830-dfsg/debian/control freecad-0.13.1830-dfsg/debian/control --- freecad-0.13.1830-dfsg/debian/control 2013-05-30 19:03:53.000000000 +0000 +++ freecad-0.13.1830-dfsg/debian/control 2013-08-07 18:44:50.000000000 +0000 @@ -14,7 +14,7 @@ libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev, libboost-python-dev, libboost-thread-dev, python-dev, python-support, libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev, - libcoin80-dev, libsoqt4-dev (>=1.5.0-2.1), libeigen3-dev, + libcoin60-dev, libsoqt4-dev (>=1.5.0-2), libeigen3-dev, libgts-bin, libgts-dev, libcv-dev, zlib1g-dev, libxerces-c2-dev, liboce-foundation-dev, liboce-modeling-dev, liboce-ocaf-dev, libfltk1.3-dev, oce-draw, libf2c2-dev, @@ -25,7 +25,7 @@ Package: freecad Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, - python-pivy (>=0.5.0~v609hg-2) [!powerpc], python-matplotlib + python-pivy (>=0.5.0~v609hg-1) [!powerpc], python-matplotlib Suggests: freecad-doc Description: Extensible Open Source CAx program (alpha) FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python. diff -Nru freecad-0.13.1830-dfsg/debian/patches/series freecad-0.13.1830-dfsg/debian/patches/series --- freecad-0.13.1830-dfsg/debian/patches/series 2013-05-23 13:23:24.000000000 +0000 +++ freecad-0.13.1830-dfsg/debian/patches/series 2013-08-06 00:53:25.000000000 +0000 @@ -5,4 +5,3 @@ use_install_rpath.patch use_share.patch dir_as_string.patch -coin80.patch diff -Nru freecad-0.13.1830-dfsg/debian/rules freecad-0.13.1830-dfsg/debian/rules --- freecad-0.13.1830-dfsg/debian/rules 2013-05-02 21:07:15.000000000 +0000 +++ freecad-0.13.1830-dfsg/debian/rules 2013-08-06 00:57:04.000000000 +0000 @@ -16,7 +16,8 @@ -DCMAKE_INSTALL_PREFIX="/usr" \ -DCMAKE_INSTALL_DATADIR="share/freecad" \ -DRESOURCEDIR="/usr/share/freecad" \ --DCMAKE_INSTALL_INCLUDEDIR="include/freecad" +-DCMAKE_INSTALL_INCLUDEDIR="include/freecad" \ +-DOCC_INCLUDE_DIR="/usr/include/oce" #-DCMAKE_INSTALL_DOCDIR="share/doc/freecad" \ override_dh_auto_configure: @@ -31,4 +32,5 @@ override_dh_auto_clean: find -name '*.pyc' | xargs rm -f + rm -rf obj-* src/Mod/Start/Gui/share src/Mod/Drawing/App/share dh_clean