Anton Gladky wrote:
Hi Peter!
Thanks a lot for that! I have tried yesterday to fix the problem,
but could not manage that.
You, probably, forgot to attach the patch. Could you, please, do it?
Done.
Thank you,
Anton
2013/8/6 peter green <plugw...@p10link.net>:
Tags 717034 +patch
Tags 718545 +patch
Thanks
Attatched is a patch that fixes the build failure by forcing the occ include
directory from debian/rules. The patch also contains a fix to the clean
target.
I have tested that the package builds succesfully with this patch, that the
resulting package can be installed and that freecad runs and successfully
displays the application window. I have not tested beyond that.
--
debian-science-maintainers mailing list
debian-science-maintain...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers
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-06 21:05:16.000000000
+0000
@@ -1,3 +1,15 @@
+freecad (0.13.1830-dfsg-2.1) UNRELEASED; 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
+
+ -- Peter Michael Green <plugw...@p10link.net> 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/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 21:01:39.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
