[SCM] OCE packaging branch, debian, updated. debian/0.10-1-4-g9c65e78

Denis Barbier bouzim at gmail.com
Tue Jul 31 23:19:26 UTC 2012 

The following commit has been merged in the debian branch:
commit 5a56051f4e4f1ea12f608e3e7d6350aafa56ffca
Author: Denis Barbier <bouzim at gmail.com>
Date:   Tue Jan 10 14:09:25 2012 +0100

    Add support for multiarch
    
    Closes: #682866

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index b242f1e..e8862c7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>, Denis Barbier <barbier at debian.org>
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 8), quilt, cmake,
+Build-Depends: debhelper (>= 9), quilt, cmake,
  libx11-dev, libxmu-dev, libxext-dev, tcl8.5-dev, tk8.5-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev,
  libftgl-dev, libgl2ps-dev
@@ -16,6 +16,8 @@ Package: liboce-foundation3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: OpenCASCADE Community Edition CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -37,6 +39,8 @@ Package: liboce-modeling3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: OpenCASCADE Community Edition CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -58,6 +62,8 @@ Package: liboce-visualization3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: OpenCASCADE Community Edition CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -76,6 +82,8 @@ Package: liboce-ocaf-lite3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: OpenCASCADE Community Edition CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -96,6 +104,8 @@ Package: liboce-ocaf3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: OpenCASCADE Community Edition CAE platform shared library
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -136,6 +146,7 @@ Depends: liboce-foundation3 (>= ${source:Upstream-Version}), liboce-foundation3
          ${misc:Depends}
 Replaces: libopencascade-foundation-dev
 Conflicts: libopencascade-foundation-dev
+Multi-Arch: same
 Description: OpenCASCADE Community Edition CAE platform library development files
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -153,6 +164,7 @@ Depends: liboce-foundation-dev (>= ${source:Upstream-Version}), liboce-foundatio
          ${misc:Depends}
 Replaces: libopencascade-modeling-dev
 Conflicts: libopencascade-modeling-dev
+Multi-Arch: foreign
 Description: OpenCASCADE Community Edition CAE platform library development files
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -171,6 +183,7 @@ Depends: liboce-foundation-dev (>= ${source:Upstream-Version}), liboce-foundatio
          ${misc:Depends}
 Replaces: libopencascade-ocaf-lite-dev
 Conflicts: libopencascade-ocaf-lite-dev
+Multi-Arch: foreign
 Description: OpenCASCADE Community Edition CAE platform library development files
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -190,6 +203,7 @@ Depends: liboce-foundation-dev (>= ${source:Upstream-Version}), liboce-foundatio
          ${misc:Depends}
 Replaces: libopencascade-ocaf-dev
 Conflicts: libopencascade-ocaf-dev
+Multi-Arch: foreign
 Description: OpenCASCADE Community Edition CAE platform library development files
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
@@ -209,6 +223,7 @@ Depends: liboce-foundation-dev (>= ${source:Upstream-Version}), liboce-foundatio
          ${misc:Depends}
 Replaces: libopencascade-ocaf-lite-dev
 Conflicts: libopencascade-ocaf-lite-dev
+Multi-Arch: foreign
 Description: OpenCASCADE Community Edition CAE platform library development files
  OpenCASCADE is a suite for 3D surface and solid modeling, visualization, data
  exchange and rapid application development.  It is an excellent platform for
diff --git a/debian/liboce-foundation-dev.install b/debian/liboce-foundation-dev.install
index 8534c2f..e7d84ee 100644
--- a/debian/liboce-foundation-dev.install
+++ b/debian/liboce-foundation-dev.install
@@ -1,7 +1,7 @@
-usr/lib/oce-*/OCE-libraries.cmake
-usr/lib/oce-*/OCE-libraries-release.cmake
-usr/lib/oce-*/OCEConfig.cmake
-usr/lib/oce-*/OCEConfigVersion.cmake
+usr/lib/*/oce-*/OCE-libraries.cmake
+usr/lib/*/oce-*/OCE-libraries-release.cmake
+usr/lib/*/oce-*/OCEConfig.cmake
+usr/lib/*/oce-*/OCEConfigVersion.cmake
 
 usr/include/oce/oce_build_config.defs
 usr/include/oce/oce-config.h
@@ -10,9 +10,9 @@ usr/include/oce/oce-config.h
 #
 # See ros/adm/make/Makefile.am
 # FoundationClasses_PKGS = TKernel TKMath TKAdvTools
-usr/lib/libTKernel.so
-usr/lib/libTKMath.so
-usr/lib/libTKAdvTools.so
+usr/lib/*/libTKernel.so
+usr/lib/*/libTKMath.so
+usr/lib/*/libTKAdvTools.so
 
 # list="TKernel TKMath TKAdvTools"; 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 inc/${f}_* inc/Handle_${f}_* inc/$f.* inc/Handle_$f.* 2>/dev/null | sed -e 's,^inc,usr/include/oce,'; done; done | LC_ALL=C sort -u
 usr/include/oce/BSplCLib.hxx
diff --git a/debian/liboce-foundation3.install b/debian/liboce-foundation3.install
index 9f2a86a..dc3265c 100644
--- a/debian/liboce-foundation3.install
+++ b/debian/liboce-foundation3.install
@@ -1,8 +1,8 @@
 # See ros/adm/make/Makefile.am
 # FoundationClasses_PKGS = TKernel TKMath TKAdvTools
-usr/lib/libTKernel.so.*
-usr/lib/libTKMath.so.*
-usr/lib/libTKAdvTools.so.*
+usr/lib/*/libTKernel.so.*
+usr/lib/*/libTKMath.so.*
+usr/lib/*/libTKAdvTools.so.*
 
 usr/share/oce-*/src/OS/*
 usr/share/oce-*/src/StdResource/*
diff --git a/debian/liboce-modeling-dev.install b/debian/liboce-modeling-dev.install
index e16a9a9..129b2e1 100644
--- a/debian/liboce-modeling-dev.install
+++ b/debian/liboce-modeling-dev.install
@@ -2,34 +2,34 @@
 #
 # See ros/adm/make/Makefile.am
 # ModelingData_PKGS = TKG2d TKG3d TKGeomBase TKBRep
-usr/lib/libTKG2d.so
-usr/lib/libTKG3d.so
-usr/lib/libTKGeomBase.so
-usr/lib/libTKBRep.so
+usr/lib/*/libTKG2d.so
+usr/lib/*/libTKG3d.so
+usr/lib/*/libTKGeomBase.so
+usr/lib/*/libTKBRep.so
 
 # ModelingAlgorithms_PKGS = TKGeomAlgo TKTopAlgo TKPrim TKBO TKHLR TKMesh TKShHealing TKXMesh TKBool TKFillet TKFeat TKOffset
-usr/lib/libTKGeomAlgo.so
-usr/lib/libTKTopAlgo.so
-usr/lib/libTKPrim.so
-usr/lib/libTKBO.so
-usr/lib/libTKHLR.so
-usr/lib/libTKMesh.so
-usr/lib/libTKShHealing.so
-usr/lib/libTKXMesh.so
-usr/lib/libTKBool.so
-usr/lib/libTKFillet.so
-usr/lib/libTKFeat.so
-usr/lib/libTKOffset.so
+usr/lib/*/libTKGeomAlgo.so
+usr/lib/*/libTKTopAlgo.so
+usr/lib/*/libTKPrim.so
+usr/lib/*/libTKBO.so
+usr/lib/*/libTKHLR.so
+usr/lib/*/libTKMesh.so
+usr/lib/*/libTKShHealing.so
+usr/lib/*/libTKXMesh.so
+usr/lib/*/libTKBool.so
+usr/lib/*/libTKFillet.so
+usr/lib/*/libTKFeat.so
+usr/lib/*/libTKOffset.so
 
 # DataExchange_PKGS = TKVRML TKXCAF TKSTL TKXSBase TKXCAFSchema TKXmlXCAF TKBinXCAF TKSTEPBase TKIGES TKSTEPAttr TKSTEP209 TKXDEIGES TKSTEP TKXDESTEP
 # Packages not depending on X11 are put into modeling, others into ocaf.
-usr/lib/libTKSTL.so
-usr/lib/libTKXSBase.so
-usr/lib/libTKSTEPBase.so
-usr/lib/libTKIGES.so
-usr/lib/libTKSTEPAttr.so
-usr/lib/libTKSTEP209.so
-usr/lib/libTKSTEP.so
+usr/lib/*/libTKSTL.so
+usr/lib/*/libTKXSBase.so
+usr/lib/*/libTKSTEPBase.so
+usr/lib/*/libTKIGES.so
+usr/lib/*/libTKSTEPAttr.so
+usr/lib/*/libTKSTEP209.so
+usr/lib/*/libTKSTEP.so
 
 
 # extra_files="inc/igesread.h inc/step.tab.h"; list="TKG2d TKG3d TKGeomBase TKBRep TKGeomAlgo TKTopAlgo TKPrim TKBO TKHLR TKMesh TKShHealing TKXMesh TKBool TKFillet TKFeat TKOffset TKSTL TKXSBase TKSTEPBase TKIGES TKSTEPAttr TKSTEP209 TKSTEP"; 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
diff --git a/debian/liboce-modeling3.install b/debian/liboce-modeling3.install
index 1dc1d8e..a8cb83e 100644
--- a/debian/liboce-modeling3.install
+++ b/debian/liboce-modeling3.install
@@ -1,33 +1,33 @@
 # See ros/adm/make/Makefile.am
 # ModelingData_PKGS = TKG2d TKG3d TKGeomBase TKBRep
-usr/lib/libTKG2d.so.*
-usr/lib/libTKG3d.so.*
-usr/lib/libTKGeomBase.so.*
-usr/lib/libTKBRep.so.*
+usr/lib/*/libTKG2d.so.*
+usr/lib/*/libTKG3d.so.*
+usr/lib/*/libTKGeomBase.so.*
+usr/lib/*/libTKBRep.so.*
 
 # ModelingAlgorithms_PKGS = TKGeomAlgo TKTopAlgo TKPrim TKBO TKHLR TKMesh TKShHealing TKXMesh TKBool TKFillet TKFeat TKOffset
-usr/lib/libTKGeomAlgo.so.*
-usr/lib/libTKTopAlgo.so.*
-usr/lib/libTKPrim.so.*
-usr/lib/libTKBO.so.*
-usr/lib/libTKHLR.so.*
-usr/lib/libTKMesh.so.*
-usr/lib/libTKShHealing.so.*
-usr/lib/libTKXMesh.so.*
-usr/lib/libTKBool.so.*
-usr/lib/libTKFillet.so.*
-usr/lib/libTKFeat.so.*
-usr/lib/libTKOffset.so.*
+usr/lib/*/libTKGeomAlgo.so.*
+usr/lib/*/libTKTopAlgo.so.*
+usr/lib/*/libTKPrim.so.*
+usr/lib/*/libTKBO.so.*
+usr/lib/*/libTKHLR.so.*
+usr/lib/*/libTKMesh.so.*
+usr/lib/*/libTKShHealing.so.*
+usr/lib/*/libTKXMesh.so.*
+usr/lib/*/libTKBool.so.*
+usr/lib/*/libTKFillet.so.*
+usr/lib/*/libTKFeat.so.*
+usr/lib/*/libTKOffset.so.*
 
 # DataExchange_PKGS = TKVRML TKXCAF TKSTL TKXSBase TKXCAFSchema TKXmlXCAF TKBinXCAF TKSTEPBase TKIGES TKSTEPAttr TKSTEP209 TKXDEIGES TKSTEP TKXDESTEP
 # Packages not depending on X11 are put into modeling, others into ocaf.
-usr/lib/libTKSTL.so.*
-usr/lib/libTKXSBase.so.*
-usr/lib/libTKSTEPBase.so.*
-usr/lib/libTKIGES.so.*
-usr/lib/libTKSTEPAttr.so.*
-usr/lib/libTKSTEP209.so.*
-usr/lib/libTKSTEP.so.*
+usr/lib/*/libTKSTL.so.*
+usr/lib/*/libTKXSBase.so.*
+usr/lib/*/libTKSTEPBase.so.*
+usr/lib/*/libTKIGES.so.*
+usr/lib/*/libTKSTEPAttr.so.*
+usr/lib/*/libTKSTEP209.so.*
+usr/lib/*/libTKSTEP.so.*
 
 usr/share/oce-*/src/SHMessage/*
 usr/share/oce-*/src/XSMessage/*
diff --git a/debian/liboce-ocaf-dev.install b/debian/liboce-ocaf-dev.install
index 987febc..7a06937 100644
--- a/debian/liboce-ocaf-dev.install
+++ b/debian/liboce-ocaf-dev.install
@@ -3,22 +3,22 @@
 # See ros/adm/make/Makefile.am
 # ApplicationFramework_PKGS = TKCDF PTKernel TKLCAF FWOSPlugin TKPShape TKCAF TKBinL TKXmlL TKPLCAF TKTObj TKShapeSchema TKBin TKXml TKPCAF TKBinTObj TKXmlTObj TKStdLSchema TKStdSchema
 # It is split into ocaf-lite (no dependency on X11) and ocaf (all others)
-usr/lib/libTKCAF.so
-usr/lib/libTKBin.so
-usr/lib/libTKXml.so
-usr/lib/libTKPCAF.so
-usr/lib/libTKBinTObj.so
-usr/lib/libTKXmlTObj.so
-usr/lib/libTKStdSchema.so
+usr/lib/*/libTKCAF.so
+usr/lib/*/libTKBin.so
+usr/lib/*/libTKXml.so
+usr/lib/*/libTKPCAF.so
+usr/lib/*/libTKBinTObj.so
+usr/lib/*/libTKXmlTObj.so
+usr/lib/*/libTKStdSchema.so
 
 # DataExchange_PKGS = TKVRML TKXCAF TKSTL TKXSBase TKXCAFSchema TKXmlXCAF TKBinXCAF TKSTEPBase TKIGES TKSTEPAttr TKSTEP209 TKXDEIGES TKSTEP TKXDESTEP
 # Packages not depending on X11 are put into modeling, others into ocaf.
-usr/lib/libTKXCAF.so
-usr/lib/libTKXCAFSchema.so
-usr/lib/libTKXmlXCAF.so
-usr/lib/libTKBinXCAF.so
-usr/lib/libTKXDEIGES.so
-usr/lib/libTKXDESTEP.so
+usr/lib/*/libTKXCAF.so
+usr/lib/*/libTKXCAFSchema.so
+usr/lib/*/libTKXmlXCAF.so
+usr/lib/*/libTKBinXCAF.so
+usr/lib/*/libTKXDEIGES.so
+usr/lib/*/libTKXDESTEP.so
 
 # list="TKCAF TKBin TKXml TKPCAF TKBinTObj TKXmlTObj TKStdSchema TKXCAF TKXCAFSchema TKXmlXCAF TKBinXCAF TKXDEIGES TKXDESTEP"; 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 inc/${f}_* inc/Handle_${f}_* inc/$f.* inc/Handle_$f.* 2>/dev/null | sed -e 's,^inc,usr/include/oce,'; done; done | LC_ALL=C sort -u
 usr/include/oce/AppStd_Application.hxx
diff --git a/debian/liboce-ocaf-lite-dev.install b/debian/liboce-ocaf-lite-dev.install
index e32daef..4c9a7a4 100644
--- a/debian/liboce-ocaf-lite-dev.install
+++ b/debian/liboce-ocaf-lite-dev.install
@@ -3,17 +3,17 @@
 # See ros/adm/make/Makefile.am
 # ApplicationFramework_PKGS = TKCDF PTKernel TKLCAF FWOSPlugin TKPShape TKCAF TKBinL TKXmlL TKPLCAF TKTObj TKShapeSchema TKBin TKXml TKPCAF TKBinTObj TKXmlTObj TKStdLSchema TKStdSchema
 # It is split into ocaf-lite (no dependency on X11) and ocaf (all others)
-usr/lib/libTKCDF.so
-usr/lib/libPTKernel.so
-usr/lib/libTKLCAF.so
-usr/lib/libFWOSPlugin.so
-usr/lib/libTKPShape.so
-usr/lib/libTKBinL.so
-usr/lib/libTKXmlL.so
-usr/lib/libTKPLCAF.so
-usr/lib/libTKTObj.so
-usr/lib/libTKShapeSchema.so
-usr/lib/libTKStdLSchema.so
+usr/lib/*/libTKCDF.so
+usr/lib/*/libPTKernel.so
+usr/lib/*/libTKLCAF.so
+usr/lib/*/libFWOSPlugin.so
+usr/lib/*/libTKPShape.so
+usr/lib/*/libTKBinL.so
+usr/lib/*/libTKXmlL.so
+usr/lib/*/libTKPLCAF.so
+usr/lib/*/libTKTObj.so
+usr/lib/*/libTKShapeSchema.so
+usr/lib/*/libTKStdLSchema.so
 
 # extra_files="inc/LDOMBasicString.hxx inc/LDOMParser.hxx inc/LDOMString.hxx"; list="TKCDF PTKernel TKLCAF FWOSPlugin TKPShape TKBinL TKXmlL TKPLCAF TKTObj TKShapeSchema TKStdLSchema"; 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
 usr/include/oce/AppStdL_Application.hxx
diff --git a/debian/liboce-ocaf-lite3.install b/debian/liboce-ocaf-lite3.install
index d19da4a..32106a2 100644
--- a/debian/liboce-ocaf-lite3.install
+++ b/debian/liboce-ocaf-lite3.install
@@ -1,14 +1,14 @@
 # See ros/adm/make/Makefile.am
 # ApplicationFramework_PKGS = TKCDF PTKernel TKLCAF FWOSPlugin TKPShape TKCAF TKBinL TKXmlL TKPLCAF TKTObj TKShapeSchema TKBin TKXml TKPCAF TKBinTObj TKXmlTObj TKStdLSchema TKStdSchema
 # It is split into ocaf-lite (no dependency on X11) and ocaf (all others)
-usr/lib/libTKCDF.so.*
-usr/lib/libPTKernel.so.*
-usr/lib/libTKLCAF.so.*
-usr/lib/libFWOSPlugin.so.*
-usr/lib/libTKPShape.so.*
-usr/lib/libTKBinL.so.*
-usr/lib/libTKXmlL.so.*
-usr/lib/libTKPLCAF.so.*
-usr/lib/libTKTObj.so.*
-usr/lib/libTKShapeSchema.so.*
-usr/lib/libTKStdLSchema.so.*
+usr/lib/*/libTKCDF.so.*
+usr/lib/*/libPTKernel.so.*
+usr/lib/*/libTKLCAF.so.*
+usr/lib/*/libFWOSPlugin.so.*
+usr/lib/*/libTKPShape.so.*
+usr/lib/*/libTKBinL.so.*
+usr/lib/*/libTKXmlL.so.*
+usr/lib/*/libTKPLCAF.so.*
+usr/lib/*/libTKTObj.so.*
+usr/lib/*/libTKShapeSchema.so.*
+usr/lib/*/libTKStdLSchema.so.*
diff --git a/debian/liboce-ocaf3.install b/debian/liboce-ocaf3.install
index d1639b4..d3a49c5 100644
--- a/debian/liboce-ocaf3.install
+++ b/debian/liboce-ocaf3.install
@@ -1,22 +1,22 @@
 # See ros/adm/make/Makefile.am
 # ApplicationFramework_PKGS = TKCDF PTKernel TKLCAF FWOSPlugin TKPShape TKCAF TKBinL TKXmlL TKPLCAF TKTObj TKShapeSchema TKBin TKXml TKPCAF TKBinTObj TKXmlTObj TKStdLSchema TKStdSchema
 # It is split into ocaf-lite (no dependency on X11) and ocaf (all others)
-usr/lib/libTKCAF.so.*
-usr/lib/libTKBin.so.*
-usr/lib/libTKXml.so.*
-usr/lib/libTKPCAF.so.*
-usr/lib/libTKBinTObj.so.*
-usr/lib/libTKXmlTObj.so.*
-usr/lib/libTKStdSchema.so.*
+usr/lib/*/libTKCAF.so.*
+usr/lib/*/libTKBin.so.*
+usr/lib/*/libTKXml.so.*
+usr/lib/*/libTKPCAF.so.*
+usr/lib/*/libTKBinTObj.so.*
+usr/lib/*/libTKXmlTObj.so.*
+usr/lib/*/libTKStdSchema.so.*
 
 # DataExchange_PKGS = TKVRML TKXCAF TKSTL TKXSBase TKXCAFSchema TKXmlXCAF TKBinXCAF TKSTEPBase TKIGES TKSTEPAttr TKSTEP209 TKXDEIGES TKSTEP TKXDESTEP
 # Packages not depending on X11 are put into modeling, others into ocaf.
-usr/lib/libTKXCAF.so.*
-usr/lib/libTKXCAFSchema.so.*
-usr/lib/libTKXmlXCAF.so.*
-usr/lib/libTKBinXCAF.so.*
-usr/lib/libTKXDEIGES.so.*
-usr/lib/libTKXDESTEP.so.*
+usr/lib/*/libTKXCAF.so.*
+usr/lib/*/libTKXCAFSchema.so.*
+usr/lib/*/libTKXmlXCAF.so.*
+usr/lib/*/libTKBinXCAF.so.*
+usr/lib/*/libTKXDEIGES.so.*
+usr/lib/*/libTKXDESTEP.so.*
 
 usr/share/oce-*/src/XSTEPResource/*
 usr/share/oce-*/src/XmlOcafResource/*
diff --git a/debian/liboce-visualization-dev.install b/debian/liboce-visualization-dev.install
index cbb8735..4ae53f5 100644
--- a/debian/liboce-visualization-dev.install
+++ b/debian/liboce-visualization-dev.install
@@ -2,14 +2,14 @@
 #
 # See ros/adm/make/Makefile.am
 # Visualization_PKGS = TKService TKV2d TKV3d TKOpenGl TKMeshVS TKNIS TKVoxel
-usr/lib/libTKService.so
-usr/lib/libTKV2d.so
-usr/lib/libTKV3d.so
-usr/lib/libTKOpenGl.so
-usr/lib/libTKMeshVS.so
-usr/lib/libTKNIS.so
-usr/lib/libTKVoxel.so
-usr/lib/libTKVRML.so
+usr/lib/*/libTKService.so
+usr/lib/*/libTKV2d.so
+usr/lib/*/libTKV3d.so
+usr/lib/*/libTKOpenGl.so
+usr/lib/*/libTKMeshVS.so
+usr/lib/*/libTKNIS.so
+usr/lib/*/libTKVoxel.so
+usr/lib/*/libTKVRML.so
 
 # extra_files="inc/cgm* inc/W*_Allocator.hxx inc/Degrees.hxx inc/EHDC.hxx inc/VoxelClient_VisDrawer.h"; extra_modules="InterfaceGraphic WNT ImageUtility Xw"; list="TKService TKV2d TKV3d TKOpenGl TKMeshVS TKNIS TKVoxel TKVRML"; for p in $list; do for f in $extra_modules $(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; extra_modules="" ; done | LC_ALL=C sort -u
 usr/include/oce/AIS.hxx
diff --git a/debian/liboce-visualization3.install b/debian/liboce-visualization3.install
index 8678458..2462ec5 100644
--- a/debian/liboce-visualization3.install
+++ b/debian/liboce-visualization3.install
@@ -1,12 +1,12 @@
 # See ros/adm/make/Makefile.am
 # Visualization_PKGS = TKService TKV2d TKV3d TKOpenGl TKMeshVS TKNIS TKVoxel
-usr/lib/libTKService.so.*
-usr/lib/libTKV2d.so.*
-usr/lib/libTKV3d.so.*
-usr/lib/libTKOpenGl.so.*
-usr/lib/libTKMeshVS.so.*
-usr/lib/libTKNIS.so.*
-usr/lib/libTKVRML.so.*
-usr/lib/libTKVoxel.so.*
+usr/lib/*/libTKService.so.*
+usr/lib/*/libTKV2d.so.*
+usr/lib/*/libTKV3d.so.*
+usr/lib/*/libTKOpenGl.so.*
+usr/lib/*/libTKMeshVS.so.*
+usr/lib/*/libTKNIS.so.*
+usr/lib/*/libTKVRML.so.*
+usr/lib/*/libTKVoxel.so.*
 
 usr/share/oce-*/src/Textures/*
diff --git a/debian/oce-draw.install b/debian/oce-draw.install
index ccefadc..b74a185 100644
--- a/debian/oce-draw.install
+++ b/debian/oce-draw.install
@@ -5,14 +5,14 @@ usr/share/man/man1/DRAWEXE.1
 #
 # See ros/adm/make/Makefile.am
 # Draw_PKGS = TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw DRAWEXE
-usr/lib/oce-*/libTKDraw.so*
-usr/lib/oce-*/libTKTopTest.so*
-usr/lib/oce-*/libTKViewerTest.so*
-usr/lib/oce-*/libTKXSDRAW.so*
-usr/lib/oce-*/libTKDCAF.so*
-usr/lib/oce-*/libTKXDEDRAW.so*
-usr/lib/oce-*/libTKTObjDRAW.so*
-usr/lib/oce-*/libTKQADraw.so*
+usr/lib/*/oce-*/libTKDraw.so*
+usr/lib/*/oce-*/libTKTopTest.so*
+usr/lib/*/oce-*/libTKViewerTest.so*
+usr/lib/*/oce-*/libTKXSDRAW.so*
+usr/lib/*/oce-*/libTKDCAF.so*
+usr/lib/*/oce-*/libTKXDEDRAW.so*
+usr/lib/*/oce-*/libTKTObjDRAW.so*
+usr/lib/*/oce-*/libTKQADraw.so*
 
 usr/share/oce-*/src/DrawResources/*.tcl
 usr/share/oce-*/src/DrawResources/DrawDefault
diff --git a/debian/rules b/debian/rules
index b73c11c..5233f65 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,8 @@ CFLAGS   := $(shell dpkg-buildflags --get CPPFLAGS) $(shell dpkg-buildflags --ge
 CXXFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) $(shell dpkg-buildflags --get CXXFLAGS)
 LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --buildsystem=cmake --parallel --with quilt
 
@@ -12,6 +14,8 @@ override_dh_auto_configure:
         -DOCE_BUILD_SHARED_LIB:BOOL=ON \
         -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_DRAW:BOOL=ON \
         -DOCE_RPATH_FILTER_SYSTEM_PATHS:BOOL=ON \
         -DCMAKE_C_FLAGS_RELEASE:STRING='$(CFLAGS)' \

-- 
OCE packaging

More information about the debian-science-commits mailing list