[SCM] OCE packaging branch, debian, updated. debian/0.11-1
Denis Barbier
bouzim at gmail.com
Thu Dec 13 19:16:57 UTC 2012
The following commit has been merged in the debian branch:
commit 96e2d6dc4bf535d3ff82b5fbc7984376dd942738
Author: Denis Barbier <bouzim at gmail.com>
Date: Wed Dec 12 01:19:53 2012 +0100
Upgrade all install files and soname
diff --git a/debian/liboce-foundation-dev.install b/debian/liboce-foundation-dev.install
index 8762e3d..1274f92 100644
--- a/debian/liboce-foundation-dev.install
+++ b/debian/liboce-foundation-dev.install
@@ -433,7 +433,6 @@ usr/include/oce/Handle_OSD_Exception_NONCONTINUABLE_EXCEPTION.hxx
usr/include/oce/Handle_OSD_Exception_PRIV_INSTRUCTION.hxx
usr/include/oce/Handle_OSD_Exception_STACK_OVERFLOW.hxx
usr/include/oce/Handle_OSD_Exception_STATUS_NO_MEMORY.hxx
-usr/include/oce/Handle_OSD_FontMgr.hxx
usr/include/oce/Handle_OSD_OSDError.hxx
usr/include/oce/Handle_OSD_SIGBUS.hxx
usr/include/oce/Handle_OSD_SIGHUP.hxx
@@ -444,7 +443,6 @@ usr/include/oce/Handle_OSD_SIGQUIT.hxx
usr/include/oce/Handle_OSD_SIGSEGV.hxx
usr/include/oce/Handle_OSD_SIGSYS.hxx
usr/include/oce/Handle_OSD_Signal.hxx
-usr/include/oce/Handle_OSD_SystemFont.hxx
usr/include/oce/Handle_PLib_Base.hxx
usr/include/oce/Handle_PLib_HermitJacobi.hxx
usr/include/oce/Handle_PLib_JacobiPolynomial.hxx
@@ -783,6 +781,9 @@ usr/include/oce/NCollection_TListNode.hxx
usr/include/oce/NCollection_TypeDef.hxx
usr/include/oce/NCollection_UBTree.hxx
usr/include/oce/NCollection_UBTreeFiller.hxx
+usr/include/oce/NCollection_Vec2.hxx
+usr/include/oce/NCollection_Vec3.hxx
+usr/include/oce/NCollection_Vec4.hxx
usr/include/oce/NCollection_Vector.hxx
usr/include/oce/OSD.hxx
usr/include/oce/OSD_Chronometer.hxx
@@ -816,8 +817,6 @@ usr/include/oce/OSD_Exception_STATUS_NO_MEMORY.hxx
usr/include/oce/OSD_File.hxx
usr/include/oce/OSD_FileIterator.hxx
usr/include/oce/OSD_FileNode.hxx
-usr/include/oce/OSD_FontAspect.hxx
-usr/include/oce/OSD_FontMgr.hxx
usr/include/oce/OSD_FromWhere.hxx
usr/include/oce/OSD_Function.hxx
usr/include/oce/OSD_Host.hxx
@@ -828,7 +827,6 @@ usr/include/oce/OSD_LockType.hxx
usr/include/oce/OSD_MAllocHook.hxx
usr/include/oce/OSD_MailBox.hxx
usr/include/oce/OSD_MemInfo.hxx
-usr/include/oce/OSD_NListOfSystemFont.hxx
usr/include/oce/OSD_OEMType.hxx
usr/include/oce/OSD_OSDError.hxx
usr/include/oce/OSD_OpenMode.hxx
@@ -855,7 +853,6 @@ usr/include/oce/OSD_Signal.hxx
usr/include/oce/OSD_Signals.hxx
usr/include/oce/OSD_SingleProtection.hxx
usr/include/oce/OSD_SysType.hxx
-usr/include/oce/OSD_SystemFont.hxx
usr/include/oce/OSD_Thread.hxx
usr/include/oce/OSD_ThreadFunction.hxx
usr/include/oce/OSD_Timer.hxx
diff --git a/debian/liboce-modeling-dev.install b/debian/liboce-modeling-dev.install
index b8b4a8e..6029209 100644
--- a/debian/liboce-modeling-dev.install
+++ b/debian/liboce-modeling-dev.install
@@ -608,6 +608,7 @@ usr/include/oce/BRepCheck_Shell.hxx
usr/include/oce/BRepCheck_Status.hxx
usr/include/oce/BRepCheck_Vertex.hxx
usr/include/oce/BRepCheck_Wire.hxx
+usr/include/oce/BRepClass3d.hxx
usr/include/oce/BRepClass3d_DataMapIteratorOfMapOfInter.hxx
usr/include/oce/BRepClass3d_DataMapNodeOfMapOfInter.hxx
usr/include/oce/BRepClass3d_Intersector3d.hxx
@@ -891,6 +892,7 @@ usr/include/oce/BRepOffsetAPI_MakeOffsetShape.hxx
usr/include/oce/BRepOffsetAPI_MakePipe.hxx
usr/include/oce/BRepOffsetAPI_MakePipeShell.hxx
usr/include/oce/BRepOffsetAPI_MakeThickSolid.hxx
+usr/include/oce/BRepOffsetAPI_MiddlePath.hxx
usr/include/oce/BRepOffsetAPI_NormalProjection.hxx
usr/include/oce/BRepOffsetAPI_SequenceNodeOfSequenceOfSequenceOfReal.hxx
usr/include/oce/BRepOffsetAPI_SequenceNodeOfSequenceOfSequenceOfShape.hxx
@@ -3126,6 +3128,7 @@ usr/include/oce/Handle_ShapeUpgrade_SplitSurfaceAngle.hxx
usr/include/oce/Handle_ShapeUpgrade_SplitSurfaceArea.hxx
usr/include/oce/Handle_ShapeUpgrade_SplitSurfaceContinuity.hxx
usr/include/oce/Handle_ShapeUpgrade_Tool.hxx
+usr/include/oce/Handle_ShapeUpgrade_UnifySameDomain.hxx
usr/include/oce/Handle_ShapeUpgrade_WireDivide.hxx
usr/include/oce/Handle_StepAP203_CcDesignApproval.hxx
usr/include/oce/Handle_StepAP203_CcDesignCertification.hxx
@@ -6149,6 +6152,7 @@ usr/include/oce/ShapeUpgrade_SplitSurfaceArea.lxx
usr/include/oce/ShapeUpgrade_SplitSurfaceContinuity.hxx
usr/include/oce/ShapeUpgrade_Tool.hxx
usr/include/oce/ShapeUpgrade_Tool.lxx
+usr/include/oce/ShapeUpgrade_UnifySameDomain.hxx
usr/include/oce/ShapeUpgrade_WireDivide.hxx
usr/include/oce/StepAP203_ApprovedItem.hxx
usr/include/oce/StepAP203_Array1OfApprovedItem.hxx
@@ -7643,6 +7647,7 @@ usr/include/oce/TopTools_MapIteratorOfMapOfOrientedShape.hxx
usr/include/oce/TopTools_MapIteratorOfMapOfShape.hxx
usr/include/oce/TopTools_MapOfOrientedShape.hxx
usr/include/oce/TopTools_MapOfShape.hxx
+usr/include/oce/TopTools_MutexForShapeProvider.hxx
usr/include/oce/TopTools_OrientedShapeMapHasher.hxx
usr/include/oce/TopTools_OrientedShapeMapHasher.lxx
usr/include/oce/TopTools_SequenceNodeOfSequenceOfShape.hxx
diff --git a/debian/liboce-visualization-dev.install b/debian/liboce-visualization-dev.install
index 3e71249..aef2095 100644
--- a/debian/liboce-visualization-dev.install
+++ b/debian/liboce-visualization-dev.install
@@ -278,7 +278,6 @@ usr/include/oce/Aspect_MarkMapDefinitionError.hxx
usr/include/oce/Aspect_MarkMapEntry.hxx
usr/include/oce/Aspect_MarkerStyle.hxx
usr/include/oce/Aspect_MarkerStyleDefinitionError.hxx
-usr/include/oce/Aspect_PixMap.hxx
usr/include/oce/Aspect_Pixel.hxx
usr/include/oce/Aspect_PixmapDefinitionError.hxx
usr/include/oce/Aspect_PixmapError.hxx
@@ -373,6 +372,10 @@ usr/include/oce/DsgPrs_TangentPresentation.hxx
usr/include/oce/DsgPrs_XYZAxisPresentation.hxx
usr/include/oce/DsgPrs_XYZPlanePresentation.hxx
usr/include/oce/EHDC.hxx
+usr/include/oce/Font_FontAspect.hxx
+usr/include/oce/Font_FontMgr.hxx
+usr/include/oce/Font_NListOfSystemFont.hxx
+usr/include/oce/Font_SystemFont.hxx
usr/include/oce/GGraphic2d_Curve.hxx
usr/include/oce/GGraphic2d_CurveDefinitionError.hxx
usr/include/oce/GGraphic2d_SetOfCurves.hxx
@@ -473,6 +476,7 @@ usr/include/oce/Graphic3d_AspectLine3d.hxx
usr/include/oce/Graphic3d_AspectMarker3d.hxx
usr/include/oce/Graphic3d_AspectText3d.hxx
usr/include/oce/Graphic3d_AspectTextDefinitionError.hxx
+usr/include/oce/Graphic3d_BufferType.hxx
usr/include/oce/Graphic3d_CBitFields16.hxx
usr/include/oce/Graphic3d_CBitFields20.hxx
usr/include/oce/Graphic3d_CBitFields4.hxx
@@ -696,7 +700,6 @@ usr/include/oce/Handle_Aspect_LineWidthDefinitionError.hxx
usr/include/oce/Handle_Aspect_MarkMap.hxx
usr/include/oce/Handle_Aspect_MarkMapDefinitionError.hxx
usr/include/oce/Handle_Aspect_MarkerStyleDefinitionError.hxx
-usr/include/oce/Handle_Aspect_PixMap.hxx
usr/include/oce/Handle_Aspect_PixmapDefinitionError.hxx
usr/include/oce/Handle_Aspect_PixmapError.hxx
usr/include/oce/Handle_Aspect_PolyStyleDefinitionError.hxx
@@ -717,6 +720,8 @@ usr/include/oce/Handle_Aspect_WindowDefinitionError.hxx
usr/include/oce/Handle_Aspect_WindowDriver.hxx
usr/include/oce/Handle_Aspect_WindowError.hxx
usr/include/oce/Handle_CGM_Driver.hxx
+usr/include/oce/Handle_Font_FontMgr.hxx
+usr/include/oce/Handle_Font_SystemFont.hxx
usr/include/oce/Handle_GGraphic2d_Curve.hxx
usr/include/oce/Handle_GGraphic2d_CurveDefinitionError.hxx
usr/include/oce/Handle_GGraphic2d_SetOfCurves.hxx
@@ -828,7 +833,6 @@ usr/include/oce/Handle_Image_DIndexedImage.hxx
usr/include/oce/Handle_Image_DataMapNodeOfColorPixelDataMap.hxx
usr/include/oce/Handle_Image_DataMapNodeOfLookupTable.hxx
usr/include/oce/Handle_Image_Image.hxx
-usr/include/oce/Handle_Image_PixMap.hxx
usr/include/oce/Handle_Image_PseudoColorImage.hxx
usr/include/oce/Handle_MFT_FontManager.hxx
usr/include/oce/Handle_MFT_FontManagerDefinitionError.hxx
@@ -1095,7 +1099,6 @@ usr/include/oce/Handle_WNT_Icon.hxx
usr/include/oce/Handle_WNT_IconBox.hxx
usr/include/oce/Handle_WNT_Image.hxx
usr/include/oce/Handle_WNT_ImageManager.hxx
-usr/include/oce/Handle_WNT_PixMap.hxx
usr/include/oce/Handle_WNT_SequenceNodeOfSequenceOfImage.hxx
usr/include/oce/Handle_WNT_TextManager.hxx
usr/include/oce/Handle_WNT_WClass.hxx
@@ -1108,7 +1111,6 @@ usr/include/oce/Handle_Xw_GraphicDevice.hxx
usr/include/oce/Handle_Xw_HListOfMFTFonts.hxx
usr/include/oce/Handle_Xw_IconBox.hxx
usr/include/oce/Handle_Xw_MarkMap.hxx
-usr/include/oce/Handle_Xw_PixMap.hxx
usr/include/oce/Handle_Xw_TextManager.hxx
usr/include/oce/Handle_Xw_TypeMap.hxx
usr/include/oce/Handle_Xw_WidthMap.hxx
@@ -1123,10 +1125,11 @@ usr/include/oce/ImageUtility_X11XImage.hxx
usr/include/oce/ImageUtility_XPR.hxx
usr/include/oce/ImageUtility_XWD.hxx
usr/include/oce/ImageUtility_XWUD.hxx
+usr/include/oce/Image_AlienPixMap.hxx
usr/include/oce/Image_AveragePixelInterpolation.hxx
usr/include/oce/Image_BalancedPixelInterpolation.hxx
usr/include/oce/Image_BilinearPixelInterpolation.hxx
-usr/include/oce/Image_CRawBufferData.hxx
+usr/include/oce/Image_Color.hxx
usr/include/oce/Image_ColorImage.hxx
usr/include/oce/Image_ColorPixelDataMap.hxx
usr/include/oce/Image_ColorPixelMapHasher.hxx
@@ -1137,16 +1140,17 @@ usr/include/oce/Image_DataMapIteratorOfColorPixelDataMap.hxx
usr/include/oce/Image_DataMapIteratorOfLookupTable.hxx
usr/include/oce/Image_DataMapNodeOfColorPixelDataMap.hxx
usr/include/oce/Image_DataMapNodeOfLookupTable.hxx
+usr/include/oce/Image_Diff.hxx
usr/include/oce/Image_DitheringMethod.hxx
usr/include/oce/Image_FlipType.hxx
usr/include/oce/Image_GImage.gxx
usr/include/oce/Image_GPixelField.gxx
usr/include/oce/Image_GPixelField.lxx
-usr/include/oce/Image_HPrivateImage.hxx
usr/include/oce/Image_Image.hxx
usr/include/oce/Image_IndexPixelMapHasher.hxx
usr/include/oce/Image_LookupTable.hxx
usr/include/oce/Image_PixMap.hxx
+usr/include/oce/Image_PixMapData.hxx
usr/include/oce/Image_PixelAddress.hxx
usr/include/oce/Image_PixelFieldOfDColorImage.hxx
usr/include/oce/Image_PixelFieldOfDIndexedImage.hxx
@@ -1163,7 +1167,6 @@ usr/include/oce/InterfaceGraphic_Graphic3d.hxx
usr/include/oce/InterfaceGraphic_Labels.hxx
usr/include/oce/InterfaceGraphic_Portability.hxx
usr/include/oce/InterfaceGraphic_PrimitiveArray.hxx
-usr/include/oce/InterfaceGraphic_RawBufferData.hxx
usr/include/oce/InterfaceGraphic_Visual3d.hxx
usr/include/oce/InterfaceGraphic_WNT.hxx
usr/include/oce/InterfaceGraphic_X11.hxx
@@ -1273,17 +1276,19 @@ usr/include/oce/NIS_Triangulated.hxx
usr/include/oce/NIS_TriangulatedDrawer.hxx
usr/include/oce/NIS_View.hxx
usr/include/oce/OpenGl_AVIWriter.hxx
+usr/include/oce/OpenGl_ArbIns.hxx
+usr/include/oce/OpenGl_ArbTBO.hxx
usr/include/oce/OpenGl_ArbVBO.hxx
usr/include/oce/OpenGl_AspectFace.hxx
usr/include/oce/OpenGl_AspectLine.hxx
usr/include/oce/OpenGl_AspectMarker.hxx
usr/include/oce/OpenGl_AspectText.hxx
usr/include/oce/OpenGl_CView.hxx
-usr/include/oce/OpenGl_Callback.hxx
usr/include/oce/OpenGl_Context.hxx
usr/include/oce/OpenGl_Display.hxx
usr/include/oce/OpenGl_Element.hxx
usr/include/oce/OpenGl_ExtFBO.hxx
+usr/include/oce/OpenGl_ExtGS.hxx
usr/include/oce/OpenGl_FontMgr.hxx
usr/include/oce/OpenGl_FrameBuffer.hxx
usr/include/oce/OpenGl_GlCore11.hxx
@@ -1296,6 +1301,7 @@ usr/include/oce/OpenGl_GraduatedTrihedron.hxx
usr/include/oce/OpenGl_GraphicDriver.hxx
usr/include/oce/OpenGl_Group.hxx
usr/include/oce/OpenGl_ImageBox.hxx
+usr/include/oce/OpenGl_IndexBuffer.hxx
usr/include/oce/OpenGl_LayerList.hxx
usr/include/oce/OpenGl_Light.hxx
usr/include/oce/OpenGl_Marker.hxx
@@ -1308,14 +1314,15 @@ usr/include/oce/OpenGl_PrimitiveArray.hxx
usr/include/oce/OpenGl_PrinterContext.hxx
usr/include/oce/OpenGl_PriorityList.hxx
usr/include/oce/OpenGl_Resource.hxx
-usr/include/oce/OpenGl_ResourceCleaner.hxx
usr/include/oce/OpenGl_ResourceTexture.hxx
-usr/include/oce/OpenGl_ResourceVBO.hxx
usr/include/oce/OpenGl_Structure.hxx
usr/include/oce/OpenGl_Text.hxx
usr/include/oce/OpenGl_TextParam.hxx
usr/include/oce/OpenGl_TextureBox.hxx
+usr/include/oce/OpenGl_TextureBufferArb.hxx
usr/include/oce/OpenGl_Trihedron.hxx
+usr/include/oce/OpenGl_VertexBuffer.hxx
+usr/include/oce/OpenGl_VertexBufferEditor.hxx
usr/include/oce/OpenGl_View.hxx
usr/include/oce/OpenGl_Window.hxx
usr/include/oce/OpenGl_Workspace.hxx
@@ -1738,7 +1745,6 @@ usr/include/oce/Visual3d_ViewOrientation.hxx
usr/include/oce/Visual3d_ViewOrientationDefinitionError.hxx
usr/include/oce/Visual3d_ViewPtr.hxx
usr/include/oce/Visual3d_ZClippingDefinitionError.hxx
-usr/include/oce/VoxelClient_VisDrawer.h
usr/include/oce/Voxel_BoolDS.hxx
usr/include/oce/Voxel_BooleanOperation.hxx
usr/include/oce/Voxel_CollisionDetection.hxx
@@ -1888,7 +1894,6 @@ usr/include/oce/WNT_LogFont.hxx
usr/include/oce/WNT_Long.hxx
usr/include/oce/WNT_MFTDraw.hxx
usr/include/oce/WNT_OrientationType.hxx
-usr/include/oce/WNT_PixMap.hxx
usr/include/oce/WNT_SequenceNodeOfSequenceOfImage.hxx
usr/include/oce/WNT_SequenceOfImage.hxx
usr/include/oce/WNT_TextManager.hxx
@@ -1912,7 +1917,6 @@ usr/include/oce/Xw_HListOfMFTFonts.hxx
usr/include/oce/Xw_IconBox.hxx
usr/include/oce/Xw_ListOfMFTFonts.hxx
usr/include/oce/Xw_MarkMap.hxx
-usr/include/oce/Xw_PixMap.hxx
usr/include/oce/Xw_TextManager.hxx
usr/include/oce/Xw_TypeMap.hxx
usr/include/oce/Xw_TypeOfMapping.hxx
diff --git a/debian/oce-draw.install b/debian/oce-draw.install
index fece11f..d5da2c2 100644
--- a/debian/oce-draw.install
+++ b/debian/oce-draw.install
@@ -16,6 +16,8 @@ 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
@@ -23,7 +25,7 @@ usr/share/oce-*/src/DrawResources/DrawPlugin
usr/share/applications/*
usr/share/pixmaps/*
-# extra_files="inc/DrawRessource.h inc/COMMANDWINDOW.h inc/MAINWINDOW.h inc/init.h inc/ModelDefinitions.hxx"; list="TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw DRAWEXE"; for p in $list; do for f in $(sed -e '1,/^SET(TOOLKIT_MODULES/d' -e '/)/,$d' adm/cmake/$p/CMakeLists.txt); do ls -1 $extra_files inc/${f}_* inc/Handle_${f}_* inc/$f.* inc/Handle_$f.* 2>/dev/null | sed -e 's,^inc,usr/include/oce,'; extra_files=""; done; done | LC_ALL=C sort -u
+# extra_files="inc/DrawRessource.h inc/COMMANDWINDOW.h inc/MAINWINDOW.h inc/init.h inc/ModelDefinitions.hxx inc/QAViewer2dTest.hxx"; list="TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw DRAWEXE"; for p in $list; do for f in $(sed -e '1,/^SET(TOOLKIT_MODULES/d' -e '/)/,$d' adm/cmake/$p/CMakeLists.txt); do ls -1 $extra_files inc/${f}_* inc/Handle_${f}_* inc/$f.* inc/Handle_$f.* 2>/dev/null | sed -e 's,^inc,usr/include/oce,'; extra_files=""; done; done | LC_ALL=C sort -u
# Includes are included only to make dh_install --list-missing quiet
usr/include/oce/BOPTest.hxx
usr/include/oce/BOPTest_DrawableShape.hxx
@@ -360,6 +362,7 @@ usr/include/oce/QANewBRepNaming_Sphere.hxx
usr/include/oce/QANewBRepNaming_TopNaming.hxx
usr/include/oce/QANewBRepNaming_TopNaming.lxx
usr/include/oce/QANewBRepNaming_TypeOfPrimitive3D.hxx
+usr/include/oce/QANewDBRepNaming.hxx
usr/include/oce/QANewModTopOpe.hxx
usr/include/oce/QANewModTopOpe_CommonPtr.hxx
usr/include/oce/QANewModTopOpe_CutPtr.hxx
diff --git a/debian/rules b/debian/rules
index b393c9e..b8c5d29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_configure:
-DOCE_BUILD_TYPE:STRING=Release \
-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.10 \
+ -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)' \
@@ -50,8 +50,8 @@ override_dh_install:
dh_install --list-missing
rm -rf debian/oce-draw/usr/include
# Allow using plugins when liboce-ocaf-lite-dev is not installed, see #683374
- sed -i -e 's/FWOSPlugin$$/&-3/' debian/liboce-foundation3/usr/share/oce-0.10/src/StdResource/Plugin
- ln -sf libFWOSPlugin.so.3 debian/liboce-ocaf-lite3/usr/lib/$(DEB_HOST_MULTIARCH)/libFWOSPlugin-3.so
+ sed -i -e 's/FWOSPlugin$$/&-5/' debian/liboce-foundation5/usr/share/oce-*/src/StdResource/Plugin
+ ln -sf libFWOSPlugin.so.5 debian/liboce-ocaf-lite5/usr/lib/$(DEB_HOST_MULTIARCH)/libFWOSPlugin-5.so
override_dh_makeshlibs:
dh_makeshlibs -Noce-draw
--
OCE packaging
More information about the debian-science-commits
mailing list