[SCM] FreeCAD packaging branch, master, updated. debian/0.10.3247.dfsg-2-10-g83e9150

Adam C Powell IV hazelsct at debian.org
Mon Apr 11 11:42:41 UTC 2011


The following commit has been merged in the master branch:
commit a5eb224b0d36727fff69f3bc88a7b10c78691390
Author: Adam C Powell IV <hazelsct at debian.org>
Date:   Mon Apr 11 06:48:47 2011 -0400

    Boost 1.46 compatibility

diff --git a/debian/changelog b/debian/changelog
index 93ec159..b888079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ freecad (0.11.3729.dfsg-1) UNRELEASED; urgency=low
   * Changed to source format 3.0 (quilt).
   * Set aside src/Build/Version.h to prevent build problems.
   * Does not install .la files (closes: #621298).
+  * Boost 1.46 compatibility patch (closes #621877).
 
- -- "Adam C. Powell, IV" <hazelsct at debian.org>  Mon, 11 Apr 2011 06:46:23 -0400
+ -- "Adam C. Powell, IV" <hazelsct at debian.org>  Mon, 11 Apr 2011 06:48:32 -0400
 
 freecad (0.10.3247.dfsg-2) unstable; urgency=low
 
diff --git a/debian/patches/freecad-boost-146.patch b/debian/patches/freecad-boost-146.patch
new file mode 100644
index 0000000..d497e3c
--- /dev/null
+++ b/debian/patches/freecad-boost-146.patch
@@ -0,0 +1,16 @@
+FreeCAD hasn't upgraded its boost filesystem compatibility
+
+Index: freecad/src/App/PreCompiled.h
+===================================================================
+--- freecad.orig/src/App/PreCompiled.h
++++ freecad/src/App/PreCompiled.h
+@@ -24,6 +24,9 @@
+ #ifndef APP_PRECOMPILED_H
+ #define APP_PRECOMPILED_H
+ 
++// Compatibility mode with old boost filesystem
++#define BOOST_FILESYSTEM_VERSION 2
++
+ #include <FCConfig.h>
+ 
+ // here get the warnings of too long specifiers disabled
diff --git a/debian/patches/series b/debian/patches/series
index fbd705f..faad41b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 freecad-occ650.patch
+freecad-boost-146.patch

-- 
FreeCAD packaging



More information about the debian-science-commits mailing list