[SCM] FreeCAD packaging branch, master, updated. debian/0.13.1830-dfsg-1-2-gabee4e5

[Anton Gladky]

The following commit has been merged in the master branch:
commit 800a2d9f21e9a77b51cbce82e8eaafb18cb8af5b
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu May 23 21:13:27 2013 +0200

    Compile freecad against libcoin80. (Closes: #617613)

diff --git a/debian/control b/debian/control
index cde9850..57897ee 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9), libtool, cmake,
  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,
- libcoin60-dev, libsoqt4-dev (>= 1.4.2~svn20090224), libeigen3-dev,
+ libcoin80-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, libfltk1.1-dev, oce-draw, libf2c2-dev,
diff --git a/debian/patches/coin80.patch b/debian/patches/coin80.patch
new file mode 100644
index 0000000..144290c
--- /dev/null
+++ b/debian/patches/coin80.patch
@@ -0,0 +1,24 @@
+Description: fix compilation error afainst coin80
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2013-05-23
+
+--- freecad-0.13.1830-dfsg.orig/src/Gui/SoTextLabel.cpp
++++ freecad-0.13.1830-dfsg/src/Gui/SoTextLabel.cpp
+@@ -55,7 +55,7 @@
+ #include <Inventor/elements/SoViewVolumeElement.h>
+ #include <Inventor/elements/SoViewportRegionElement.h>
+ #include <Inventor/elements/SoGLTextureEnabledElement.h>
+-#include <Inventor/elements/SoGLTexture3EnabledElement.h>
++#include <Inventor/elements/SoMultiTextureEnabledElement.h>
+ 
+ #include "SoTextLabel.h"
+ #include "SoFCInteractiveElement.h"
+@@ -250,7 +250,7 @@ void SoTextLabel::GLRender(SoGLRenderAct
+ 
+         // disable textures for all units
+         SoGLTextureEnabledElement::set(state, this, FALSE);
+-        SoGLTexture3EnabledElement::set(state, this, FALSE);
++        SoMultiTextureEnabledElement::set(state, this, FALSE);
+ 
+         glPushAttrib(GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT);
+         glPushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
diff --git a/debian/patches/series b/debian/patches/series
index ac3c325..3926208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ set_install_rpath.patch
 use_install_rpath.patch
 use_share.patch
 dir_as_string.patch
+coin80.patch

-- 
FreeCAD packaging