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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-10 13:41:13 +0000 (Mon, 10 Oct 2011)
New Revision: 8118

Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/control
   trunk/packages/gdcm/trunk/debian/rules
Log:
prepare for next upload

Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================
--- trunk/packages/gdcm/trunk/debian/changelog	2011-10-10 13:10:55 UTC (rev 8117)
+++ trunk/packages/gdcm/trunk/debian/changelog	2011-10-10 13:41:13 UTC (rev 8118)
@@ -1,3 +1,12 @@
+gdcm (2.0.18-5) UNRELEASED; urgency=low
+
+  * Properly compile against a single python version (X-Python-Version)
+  * Forward CFLAGS/CXXFLAGS to cmake
+  * Remove dep on paraview-dev for now
+  * Remove deprecated XB-Python-Version
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 10 Oct 2011 15:38:45 +0200
+
 gdcm (2.0.18-4) unstable; urgency=low
 
   * One cannot call --with cli when mono is not available

Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control	2011-10-10 13:10:55 UTC (rev 8117)
+++ trunk/packages/gdcm/trunk/debian/control	2011-10-10 13:41:13 UTC (rev 8118)
@@ -11,11 +11,12 @@
  swig, cmake, libvtk5-dev, python-vtk, libpng-dev, libcharls-dev,
  libjpeg-dev, libtiff-dev, libfreetype6-dev, libopenjpeg-dev, graphviz,
  libxext-dev, libxss-dev, libxft-dev, default-jdk, libmysqlclient-dev,
- libpoppler-dev, libssl-dev, ghostscript, mpi-default-dev, paraview-dev,
+ libpoppler-dev, libssl-dev, ghostscript, mpi-default-dev,
  libavcodec-dev, libavutil-dev, libavformat-dev, libswscale-dev, libgl2ps-dev,
  cli-common-dev (>= 0.5.7) [!alpha !mips !mipsel !m68k !hppa],
  mono-devel (>= 2.0) [!alpha !mips !mipsel !m68k !hppa]
 Standards-Version: 3.9.2
+X-Python-Version: 2.7
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/gdcm/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/gdcm/trunk/
 Homepage: http://gdcm.sourceforge.net/

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2011-10-10 13:10:55 UTC (rev 8117)
+++ trunk/packages/gdcm/trunk/debian/rules	2011-10-10 13:41:13 UTC (rev 8118)
@@ -3,6 +3,12 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+# http://lists.alioth.debian.org/pipermail/debian-science-maintainers/2011-June/008157.html
+export CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
+export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
+
 # to please dpkg-shlibdeps and java private libs in /usr/lib/jni
 export LD_LIBRARY_PATH+=:/usr/lib/jni
 
@@ -26,15 +32,14 @@
 		-DGDCM_BUILD_APPLICATIONS=ON \
 		-DGDCM_DOCUMENTATION:BOOL=ON \
 		-DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
-		-DGDCM_BUILD_SHARED_LIBS=ON \
-		-DGDCM_WRAP_PYTHON=ON \
-		-DGDCM_WRAP_CSHARP=$(DEB_WRAP_CSHARP) \
-		-DGDCM_WRAP_JAVA=ON \
-		-DGDCM_USE_PVRG=ON \
-		-DGDCM_USE_SYSTEM_PVRG=ON \
+		-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
+		-DGDCM_WRAP_PYTHON:BOOL=ON \
+		-DGDCM_WRAP_CSHARP:BOOL=$(DEB_WRAP_CSHARP) \
+		-DGDCM_WRAP_JAVA:BOOL=ON \
+		-DGDCM_USE_PVRG:BOOL=ON \
+		-DGDCM_USE_SYSTEM_PVRG:BOOL=ON \
 		-DGMCS_EXECUTABLE:FILEPATH=/usr/bin/mono-csc \
 		-DGDCM_BUILD_TESTING:BOOL=OFF \
-		-DCMAKE_BUILD_TYPE:STRING=Release \
 		-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON \
 		-DGDCM_USE_SYSTEM_UUID:BOOL=ON \
 		-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON \