[med-svn] r13854 - trunk/packages/gdcm/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2013-06-06 15:33:16 +0000 (Thu, 06 Jun 2013)
New Revision: 13854

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/rules
Log:
Prepare new upload

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2013-06-06 14:28:34 UTC (rev 13853)
+++ trunk/packages/gdcm/trunk/debian/changelog	2013-06-06 15:33:16 UTC (rev 13854)
@@ -1,3 +1,10 @@
+gdcm (2.2.3-2) unstable; urgency=low
+
+  * Fix compilation with multi-arch python
+  * Fix GDCM import (new CMake generated files breaks compat). Closes: #711214
+
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 06 Jun 2013 17:32:30 +0200
+
 gdcm (2.2.3-1) unstable; urgency=low
 
   * New upstream

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2013-06-06 14:28:34 UTC (rev 13853)
+++ trunk/packages/gdcm/trunk/debian/rules	2013-06-06 15:33:16 UTC (rev 13854)
@@ -38,6 +38,14 @@
 PYMODDIR := /usr/lib/$(shell pyversions -r)
 VTKVERS=$(shell apt-cache policy libvtk5-dev | grep "Installed:" | cut -d: -f2 | cut -d' ' -f2 | cut -d- -f1 | cut -d. -f1-2)
 
+PYTHON_INCLUDE_DIRS=$(shell python-config --includes | cut -f1 -d' '|cut -c3-)
+PYTHON_INCLUDE_DIR="$(PYTHON_INCLUDE_DIRS)"
+# See bug #709181
+PYTHON_INCLUDE_DIRS2=$(shell python-config --includes | cut -f2 -d' '|cut -c3-)
+PYTHON_INCLUDE_DIR2="$(PYTHON_INCLUDE_DIRS2)"
+PYTHON_CONFIG_DIR=$(shell python-config --configdir)
+PYTHON_LIBRARY="$(PYTHON_CONFIG_DIR)/libpython2.7.so"
+
 # GDCM_DOCUMENTATION:BOOL=ON is required to build man page (build target)
 # Need to make sure to build using the same vtk/python version:
 CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
@@ -66,8 +74,9 @@
 		-DGDCM_USE_SYSTEM_POPPLER:BOOL=ON \
 		-DGDCM_USE_PARAVIEW:BOOL=OFF \
 		-DGDCM_USE_ACTIVIZ:BOOL=ON \
-		-DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
-		-DPYTHON_LIBRARY:FILEPATH=/usr/lib/python2.7/config/libpython2.7.so \
+		-DPYTHON_INCLUDE_DIR=$(PYTHON_INCLUDE_DIR) \
+		-DPYTHON_INCLUDE_DIR2=$(PYTHON_INCLUDE_DIR2) \
+		-DPYTHON_LIBRARY=$(PYTHON_LIBRARY) \
 		-DGDCM_INSTALL_DOC_DIR:STRING=share/doc/gdcm-doc \
 		-DTAGFILES:STRING="/usr/share/doc/vtk-doc/html/vtk$(VTKVERS).tag=/usr/share/doc/vtk-doc/html/" \
 		-DGDCM_USE_VTK:BOOL=ON
@@ -81,6 +90,8 @@
 override_dh_auto_install:
 	# See #664188
 	sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.2/GDCMTargets-relwithdebinfo.cmake
+	# See #711214
+	sed -i -e "s/FATAL_ERROR/STATUS/g" obj-*/CMake/ExportConfiguration/CMakeFiles/Export/lib/gdcm-2.2/GDCMTargets.cmake
 	dh_auto_install
 	# PHP
 	mkdir -p debian/tmp/$(PHP_EX)