[vmtk] 15/17: * Build tetgen with -O1 instead of -O0 to work around a build failure on armhf. See LP: #1049614. * debian/control: - Use unversioned libtiff-dev instead of libtiff4-dev (closes: #682714).

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository vmtk.

commit e5cd49dc79330b7b2f2a60df263b4341cdd2ca48
Author: Johannes Ring <johannr at simula.no>
Date:   Thu Aug 1 09:39:04 2013 +0000

    * Build tetgen with -O1 instead of -O0 to work around a build failure
      on armhf. See LP: #1049614.
    * debian/control:
      - Use unversioned libtiff-dev instead of libtiff4-dev (closes: #682714).
---
 debian/changelog              |  9 +++++++++
 debian/control                |  2 +-
 debian/patches/series         |  1 +
 debian/patches/tetgen-O1.diff | 24 ++++++++++++++++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8a732ed..3360c5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vmtk (1.0.1-2) unstable; urgency=low
+
+  * Build tetgen with -O1 instead of -O0 to work around a build failure
+    on armhf. See LP: #1049614.
+  * debian/control:
+    - Use unversioned libtiff-dev instead of libtiff4-dev (closes: #682714).
+
+ -- Johannes Ring <johannr at simula.no>  Thu, 01 Aug 2013 10:15:39 +0200
+
 vmtk (1.0.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 19362a3..628808c 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
 Uploaders: Johannes Ring <johannr at simula.no>
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), cmake,
  python-support (>= 0.6.4), python-dev, libvtk5-dev, python-vtk,
- libinsighttoolkit3-dev | libinsighttoolkit-dev, libjpeg-dev, libtiff4-dev,
+ libinsighttoolkit3-dev | libinsighttoolkit-dev, libjpeg-dev, libtiff-dev,
  libfreetype6-dev, libxext-dev, libpng-dev, libexpat1-dev, uuid-dev,
  libgdcm2-dev, libvtkgdcm2-dev, libopenjpeg-dev, libssl-dev, libvtk5-qt4-dev,
  libvtk-java
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..876c954
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+tetgen-O1.diff
diff --git a/debian/patches/tetgen-O1.diff b/debian/patches/tetgen-O1.diff
new file mode 100644
index 0000000..a6d92e0
--- /dev/null
+++ b/debian/patches/tetgen-O1.diff
@@ -0,0 +1,24 @@
+--- a/vtkVmtk/Utilities/tetgen1.4.3/CMakeLists.txt.orig	2012-05-24 15:01:14.000000000 +0000
++++ b/vtkVmtk/Utilities/tetgen1.4.3/CMakeLists.txt	2012-09-12 11:08:11.250041582 +0000
+@@ -9,8 +9,8 @@
+ INCLUDE_DIRECTORIES(${TETGEN_SOURCE_DIR})
+ ADD_LIBRARY (tet STATIC ${TETGEN_SRCS})
+ 
+-SET_TARGET_PROPERTIES(tet PROPERTIES COMPILE_FLAGS "-O0")
++SET_TARGET_PROPERTIES(tet PROPERTIES COMPILE_FLAGS "-O1")
+ 
+ IF(NOT WIN32)
+-  SET_TARGET_PROPERTIES(tet PROPERTIES COMPILE_FLAGS "-O0 -fPIC")
++  SET_TARGET_PROPERTIES(tet PROPERTIES COMPILE_FLAGS "-O1 -fPIC")
+ ENDIF(NOT WIN32)
+--- a/vtkVmtk/Utilities/tetgen1.4.3/makefile.orig	2012-05-24 15:01:14.000000000 +0000
++++ b/vtkVmtk/Utilities/tetgen1.4.3/makefile	2012-09-12 11:08:55.109419232 +0000
+@@ -25,7 +25,7 @@
+ # always be equal to -O0 (no optimization). Otherwise, TetGen may not
+ # work properly.
+ 
+-PREDCXXFLAGS = -O0
++PREDCXXFLAGS = -O1
+ 
+ # SWITCHES is a list of switches to compile TetGen.
+ # =================================================

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vmtk.git