[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, experimental, updated. debian/gmsh_2.7.0.dfsg-1_exp1-2-g1662134

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit 16c9a14e767f1511bbc1d81ec26d45ea73ac82aa
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Mar 15 20:48:55 2013 +0100

    Implement multiarch-support.

diff --git a/debian/control b/debian/control
index 97b714b..ab993d9 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: gmsh (<< 2.6.0.dfsg-3)
 Breaks: gmsh (<< 2.6.0.dfsg-3)
 Recommends: gmsh
+Multi-Arch: same
+Pre-Depends: multiarch-support
 Description: Three-dimensional finite element mesh generator. Shared library
  Gmsh is an automatic 3D finite element mesh generator (primarily
  Delaunay) with build-in CAD and post-processing facilities. Its
@@ -75,6 +77,7 @@ Breaks: gmsh (<< 2.6.0.dfsg-3)
 Recommends: gmsh
 Depends: libgmsh2 (= ${binary:Version}), libjava-gmsh2 (= ${binary:Version}),
  ${misc:Depends}
+Multi-Arch: foreign
 Description: Three-dimensional finite element mesh generator. Development files
  Gmsh is an automatic 3D finite element mesh generator (primarily
  Delaunay) with build-in CAD and post-processing facilities. Its
@@ -97,6 +100,7 @@ Replaces: gmsh (<< 2.6.0.dfsg-3)
 Breaks: gmsh (<< 2.6.0.dfsg-3)
 Recommends: gmsh
 Depends: ${misc:Depends} 
+Multi-Arch: foreign
 Description: Three-dimensional finite element mesh generator. Documentation
  Gmsh is an automatic 3D finite element mesh generator (primarily
  Delaunay) with build-in CAD and post-processing facilities. Its
@@ -118,6 +122,7 @@ Architecture: any
 Replaces: gmsh (<< 2.6.0.dfsg-3)
 Breaks: gmsh (<< 2.6.0.dfsg-3)
 Recommends: gmsh
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7), python (<<2.8), 
   libgmsh2 (= ${binary:Version})
 Description: Three-dimensional finite element mesh generator. Documentation
@@ -141,6 +146,8 @@ Package: libjava-gmsh2
 Section: java
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: multiarch-support
 Recommends: gmsh
 Description: Three-dimensional finite element mesh generator. Documentation
  Gmsh is an automatic 3D finite element mesh generator (primarily
diff --git a/debian/libgmsh-dev.install b/debian/libgmsh-dev.install
index 4459625..5e70c96 100644
--- a/debian/libgmsh-dev.install
+++ b/debian/libgmsh-dev.install
@@ -1,19 +1,19 @@
-usr/include
-usr/lib/libgmsh.so
-usr/lib/libjava-gmsh.so
 #The following files are for compiling api_demos
 Common/Gmsh.h /usr/include/gmsh
-Geo/Chain.h /usr/include/gmsh
-Graphics/Camera.h /usr/include/gmsh
-Graphics/Trackball.h /usr/include/gmsh
-Solver/functionSpace.h /usr/include/gmsh
-Solver/STensor43.h /usr/include/gmsh
-Solver/STensor33.h /usr/include/gmsh
 Common/OS.h /usr/include/gmsh
-Common/Options.h /usr/include/gmsh
-Post/ColorTable.h /usr/include/gmsh
-Post/PViewOptions.h /usr/include/gmsh
 Common/OpenFile.h /usr/include/gmsh
+Common/Options.h /usr/include/gmsh
 Common/StringUtils.h /usr/include/gmsh
+Geo/Chain.h /usr/include/gmsh
+Graphics/Camera.h /usr/include/gmsh
+Graphics/Trackball.h /usr/include/gmsh
 Mesh/Field.h  /usr/include/gmsh
+Post/ColorTable.h /usr/include/gmsh
 Post/PViewData.h /usr/include/gmsh
+Post/PViewOptions.h /usr/include/gmsh
+Solver/STensor33.h /usr/include/gmsh
+Solver/STensor43.h /usr/include/gmsh
+Solver/functionSpace.h /usr/include/gmsh
+usr/include
+usr/lib/*/libgmsh.so
+usr/lib/*/libjava-gmsh.so
diff --git a/debian/libgmsh2.install b/debian/libgmsh2.install
index 3b89f4d..3b385e1 100644
--- a/debian/libgmsh2.install
+++ b/debian/libgmsh2.install
@@ -1 +1 @@
-usr/lib/libgmsh.so.*
+usr/lib/*/libgmsh.so.*
diff --git a/debian/libjava-gmsh2.install b/debian/libjava-gmsh2.install
index 5728238..cec95c4 100644
--- a/debian/libjava-gmsh2.install
+++ b/debian/libjava-gmsh2.install
@@ -1 +1 @@
-usr/lib/libjava-gmsh.so.*
+usr/lib/*/libjava-gmsh.so.*
diff --git a/debian/libjava-gmsh2.jlibs b/debian/libjava-gmsh2.jlibs
index e49ba44..b4222bc 100644
--- a/debian/libjava-gmsh2.jlibs
+++ b/debian/libjava-gmsh2.jlibs
@@ -1 +1 @@
-debian/tmp/usr/lib/*.jar
+debian/tmp/usr/lib/*/*.jar
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index 015641d..043ee09 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -28,7 +28,7 @@ Last-Update: 2012-11-28
    if(MSVC)
      set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
      if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1060,7 +1060,7 @@
+@@ -1060,10 +1060,10 @@
  # shared library target
  if(ENABLE_BUILD_SHARED OR ENABLE_WRAP_PYTHON OR ENABLE_WRAP_JAVA)
    add_library(shared SHARED ${GMSH_SRC})
@@ -36,4 +36,8 @@ Last-Update: 2012-11-28
 +  set_target_properties(shared PROPERTIES OUTPUT_NAME gmsh)
    set_target_properties(shared PROPERTIES 
                          VERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}
-                         SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
+-                        SOVERSION ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION})
++                        SOVERSION ${GMSH_MAJOR_VERSION})
+   if(HAVE_LAPACK AND LAPACK_FLAGS)
+     set_target_properties(shared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
+   endif(HAVE_LAPACK AND LAPACK_FLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 14d6b3c..b060d11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ switch_from_opencascade_to_oce.patch
 fix_FTBFS_linking.patch
 alauzet.patch
 fix_gmshpy_import.patch
+fix_libdir.patch
diff --git a/debian/rules b/debian/rules
index f0c7974..ba3354e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ extra_flags += \
 -DENABLE_ONELAB:BOOL=ON \
 -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
 -DCMAKE_INSTALL_PREFIX:STRING="/usr" \
+-DINSTALL_LIB_DIR:STRING="/usr/lib/$(DEB_HOST_MULTIARCH)" \
 
 ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_mpi_archs)))
 	extra_flags += \

-- 
Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator.