[SCM] FreeCAD packaging branch, master, updated. debian/0.12.5284-dfsg-3-5-gab0da24

Anton Gladky gladky.anton at gmail.com
Fri Feb 17 19:00:35 UTC 2012


The following commit has been merged in the master branch:
commit 84c5407ddba5296d9a1b46a50b7bdb560588f743
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Feb 17 19:52:53 2012 +0100

    Add needed #include. Fix compilation on Ubuntu Precise.

diff --git a/debian/control b/debian/control
index e805dad..8cfd0e8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libtool, automake,
  libcoin60-dev, libsoqt4-dev (>= 1.4.2~svn20090224), libeigen3-dev,
  libgts-bin, libgts-dev, libcv-dev, zlib1g-dev, libxerces-c2-dev,
  liboce-foundation-dev, liboce-modeling-dev,
- liboce-ocaf-dev,
+ liboce-ocaf-dev, libfltk1.1-dev,
  liboce-visualization-dev, python-cxx-dev, libswscale-dev, 
  libzipios++-dev, swig, gfortran, libqtwebkit-dev
 Standards-Version: 3.9.2
diff --git a/debian/patches/fix_FTBFS_on_precise.patch b/debian/patches/fix_FTBFS_on_precise.patch
new file mode 100644
index 0000000..1a98965
--- /dev/null
+++ b/debian/patches/fix_FTBFS_on_precise.patch
@@ -0,0 +1,16 @@
+Description: Add needed #include. Fixes compilation on Ubuntu Precise, 
+ the problem can appear in Debian too.
+Origin: https://bugs.launchpad.net/ubuntu/+source/freecad/+bug/932723/comments/2
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2012-02-17
+
+--- a/src/Mod/Image/Gui/GLImageBox.cpp
++++ b/src/Mod/Image/Gui/GLImageBox.cpp
+@@ -16,6 +16,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <FL/glu.h>
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+ # include <cmath>
diff --git a/debian/patches/series b/debian/patches/series
index c97fa04..d1c892d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable_memory_check.patch
 fix_armel_FTBFS.patch
+fix_FTBFS_on_precise.patch

-- 
FreeCAD packaging



More information about the debian-science-commits mailing list