[med-svn] r15300 - trunk/packages/vxl/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2013-11-28 12:24:52 +0000 (Thu, 28 Nov 2013)
New Revision: 15300

Modified:
   trunk/packages/vxl/trunk/debian/changelog
   trunk/packages/vxl/trunk/debian/control
   trunk/packages/vxl/trunk/debian/rules
Log:
Remove RelWithDebInfo from cmake

Modified: trunk/packages/vxl/trunk/debian/changelog
===================================================================
--- trunk/packages/vxl/trunk/debian/changelog	2013-11-28 12:17:51 UTC (rev 15299)
+++ trunk/packages/vxl/trunk/debian/changelog	2013-11-28 12:24:52 UTC (rev 15300)
@@ -2,8 +2,9 @@
 
   * Hide symptoms from --as-needed on IA64. Closes: #728574
   * Update d/copyright. Closes: #723126
+  * Do set CMAKE_BUILD_TYPE.
 
- -- Mathieu Malaterre <malat at debian.org>  Thu, 28 Nov 2013 13:14:57 +0100
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 28 Nov 2013 13:24:23 +0100
 
 vxl (1.17.0-5) unstable; urgency=low
 

Modified: trunk/packages/vxl/trunk/debian/control
===================================================================
--- trunk/packages/vxl/trunk/debian/control	2013-11-28 12:17:51 UTC (rev 15299)
+++ trunk/packages/vxl/trunk/debian/control	2013-11-28 12:24:52 UTC (rev 15300)
@@ -4,12 +4,33 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Mathieu Malaterre <malat at debian.org>,
- Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 9), cmake (>= 2.4.5), libtiff5-dev | libtiff-dev,
- libdcmtk2-dev, libpng-dev, libjpeg-dev, zlib1g-dev, libexpat-dev, python-dev (>= 2.6.6-3~),
- libgeotiff-dev, libcoin80-dev, libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libqt4-dev, libxerces-c-dev, libglu-dev, libqt4-opengl-dev, libshp-dev, opencl-headers, libavifile-0.7-dev,
- libmpeg2-4-dev, libswscale-dev, libavformat-dev, libavcodec-dev, libbz2-dev, freeglut3-dev, ocl-icd-opencl-dev
+           Andreas Tille <tille at debian.org>
+Build-Depends: cmake (>= 2.4.5),
+               debhelper (>= 9),
+               freeglut3-dev,
+               libavcodec-dev,
+               libavformat-dev,
+               libavifile-0.7-dev,
+               libbz2-dev,
+               libcoin80-dev,
+               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libdcmtk2-dev,
+               libexpat-dev,
+               libgeotiff-dev,
+               libglu-dev,
+               libjpeg-dev,
+               libmpeg2-4-dev,
+               libpng-dev,
+               libqt4-dev,
+               libqt4-opengl-dev,
+               libshp-dev,
+               libswscale-dev,
+               libtiff5-dev | libtiff-dev,
+               libxerces-c-dev,
+               ocl-icd-opencl-dev,
+               opencl-headers,
+               python-dev (>= 2.6.6-3~),
+               zlib1g-dev
 Standards-Version: 3.9.4
 X-Python-Version: 2.7
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/vxl/trunk/
@@ -18,7 +39,7 @@
 Package: libvxl1.17
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: C++ Libraries for Computer Vision Research
  VXL (the Vision-something-Libraries) is a collection of C++ libraries
@@ -30,7 +51,7 @@
 Package: libvxl1-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libvxl1.17 (= ${binary:Version})
+Depends: libvxl1.17 (= ${binary:Version}), ${misc:Depends}
 Provides: libvxl-dev
 Description: C++ Libraries for Computer Vision Research
  VXL (the Vision-something-Libraries) is a collection of C++ libraries

Modified: trunk/packages/vxl/trunk/debian/rules
===================================================================
--- trunk/packages/vxl/trunk/debian/rules	2013-11-28 12:17:51 UTC (rev 15299)
+++ trunk/packages/vxl/trunk/debian/rules	2013-11-28 12:24:52 UTC (rev 15300)
@@ -26,9 +26,10 @@
 PYTHON_LIBRARY="$(PYTHON_CONFIG_DIR)/libpython2.7.so"
 
 # CMAKE_SKIP_RPATH=OFF is required when BUILD_TESTING=ON
+# Do not set CMAKE_BUILD_TYPE / http://bugs.debian.org/711515
 CMAKE_EXTRA_FLAGS = \
 	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+	-DCMAKE_BUILD_TYPE:STRING="" \
 	-DCMAKE_SKIP_RPATH:BOOL=OFF \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
 	-DAVIFILE_INCLUDE_DIR:PATH=/usr/include/avifile-0.7 \