[SCM] OCE packaging branch, debian, updated. debian/0.11-1

Denis Barbier bouzim at gmail.com
Thu Dec 13 19:16:58 UTC 2012


The following commit has been merged in the debian branch:
commit 679c29a2f5dd8c8868a352f3e333d55f7c5e77c1
Author: Denis Barbier <bouzim at gmail.com>
Date:   Wed Dec 12 22:00:26 2012 +0100

    Change build type to RelWithDebInfo, maybe we will ship *-dbg packages one day

diff --git a/debian/oce-draw.install b/debian/oce-draw.install
index d5da2c2..36ab12f 100644
--- a/debian/oce-draw.install
+++ b/debian/oce-draw.install
@@ -1,4 +1,4 @@
-usr/lib/*/oce-*/OCE06_DrawTargets.cmake
+usr/lib/*/oce-*/OCE06_DrawTargets*.cmake
 
 usr/bin/DRAWEXE
 usr/share/man/man1/DRAWEXE.1
@@ -16,8 +16,6 @@ usr/lib/*/oce-*/libTKXDEDRAW.so*
 usr/lib/*/oce-*/libTKTObjDRAW.so*
 usr/lib/*/oce-*/libTKQADraw.so*
 
-usr/lib/*/oce-*/OCE06_DrawTargets-release.cmake
-
 usr/share/oce-*/src/DrawResources/*.tcl
 usr/share/oce-*/src/DrawResources/DrawDefault
 usr/share/oce-*/src/DrawResources/DrawPlugin
diff --git a/debian/rules b/debian/rules
index b8c5d29..7cb01da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,17 +17,18 @@ override_dh_auto_configure:
 	# See in debian/patches/split-export.patch why we must ignore cmake return value
 	-dh_auto_configure -- \
         -DOCE_BUILD_SHARED_LIB:BOOL=ON \
-        -DOCE_BUILD_TYPE:STRING=Release \
+        -DOCE_TESTING:BOOL=ON \
+        -DOCE_BUILD_TYPE:STRING=RelWithDebInfo \
         -DOCE_INSTALL_PREFIX:PATH=/usr \
         -DOCE_INSTALL_LIB_DIR:PATH=lib/$(DEB_HOST_MULTIARCH) \
         -DOCE_INSTALL_CMAKE_DATA_DIR:PATH=lib/$(DEB_HOST_MULTIARCH)/oce-0.11 \
         -DOCE_DRAW:BOOL=ON \
         -DOCE_RPATH_FILTER_SYSTEM_PATHS:BOOL=ON \
         -DCMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES:STRING='/lib/$(DEB_HOST_MULTIARCH);/usr/lib/$(DEB_HOST_MULTIARCH)' \
-        -DCMAKE_C_FLAGS_RELEASE:STRING='$(CFLAGS)' \
-        -DCMAKE_CXX_FLAGS_RELEASE:STRING='$(CXXFLAGS)' \
-        -DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING='$(LDFLAGS)' \
-        -DCMAKE_EXE_LINKER_FLAGS_RELEASE:STRING='$(LDFLAGS)' \
+        -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING='$(CFLAGS)' \
+        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING='$(CXXFLAGS)' \
+        -DCMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(LDFLAGS)' \
+        -DCMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING='$(LDFLAGS)' \
         -DOCE_MULTITHREAD_LIBRARY:STRING=NONE \
         -DOCE_WITH_FREEIMAGE:BOOL=ON \
         -DOCE_WITH_GL2PS:BOOL=ON

-- 
OCE packaging



More information about the debian-science-commits mailing list