[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, master, updated. debian/2.6.0.dfsg-2-1-g3bf9207

Anton Gladky gladky.anton at gmail.com
Thu Jun 21 18:22:12 UTC 2012 

The following commit has been merged in the master branch:
commit 3bf9207bac8b4372bf59192764acc5975a68d7ef
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jun 21 20:17:35 2012 +0200

    Split gmsh into gmsh, libgmsh2, gmsh-doc and gmsh-dev. (Closes: #678319)

diff --git a/debian/control b/debian/control
index 1e1538f..b65efeb 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,8 @@ Homepage: http://www.geuz.org/gmsh/
 Package: gmsh
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
- python (>= 2.7), python (<<2.8)
+ python (>= 2.7), python (<<2.8), libgmsh2
+Recommends: gmsh-doc
 Description: Three-dimensional finite element mesh generator
  Gmsh is an automatic 3D finite element mesh generator (primarily
  Delaunay) with build-in CAD and post-processing facilities. Its
@@ -44,3 +45,62 @@ Description: Three-dimensional finite element mesh generator
  .
  See Gmsh's reference manual for a more thorough overview of Gmsh's
  capabilities.
+
+Package: libgmsh2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
+ python (>= 2.7), python (<<2.8)
+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
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
+ .
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
+
+Package: libgmsh-dev
+Architecture: all
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
+ python (>= 2.7), python (<<2.8)
+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
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
+ .
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
+
+Package: gmsh-doc
+Section: doc
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, mpi-default-bin,
+ python (>= 2.7), python (<<2.8)
+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
+ design goal is to provide a simple meshing tool for academic test
+ cases with parametric input and up to date visualization
+ capabilities.
+ .
+ Gmsh is built around four modules: geometry, mesh, solver and
+ post-processing. The specification of any input to these modules is
+ done either interactively using the graphical user interface or in
+ ASCII text files using Gmsh's own scripting language.
+ .
+ See Gmsh's reference manual for a more thorough overview of Gmsh's
+ capabilities.
diff --git a/debian/gmsh.doc-base b/debian/gmsh-doc.doc-base
similarity index 62%
rename from debian/gmsh.doc-base
rename to debian/gmsh-doc.doc-base
index 56cc9a6..773c2d7 100644
--- a/debian/gmsh.doc-base
+++ b/debian/gmsh-doc.doc-base
@@ -5,8 +5,8 @@ Abstract: This is the reference manual for gmsh.
 Section: Science/Mathematics
 
 Format: pdf
-Files: /usr/share/doc/gmsh/gmsh.pdf.gz
+Files: /usr/share/doc/gmsh-doc/gmsh.pdf.gz
 
 Format: HTML
-Index: /usr/share/doc/gmsh/gmsh.html
-Files: /usr/share/doc/gmsh/gmsh.html
+Index: /usr/share/doc/gmsh-doc/gmsh.html
+Files: /usr/share/doc/gmsh-doc/gmsh.html
diff --git a/debian/gmsh-doc.docs b/debian/gmsh-doc.docs
new file mode 100644
index 0000000..d6cda16
--- /dev/null
+++ b/debian/gmsh-doc.docs
@@ -0,0 +1,4 @@
+utils/converters
+utils/solvers
+utils/api_demos
+debian/tmp/usr/share/doc/gmsh/*
diff --git a/debian/gmsh-doc.lintian-overrides b/debian/gmsh-doc.lintian-overrides
new file mode 100644
index 0000000..ba6d965
--- /dev/null
+++ b/debian/gmsh-doc.lintian-overrides
@@ -0,0 +1,2 @@
+gmsh-doc: extra-license-file usr/share/doc/gmsh-doc/converters/stl_to_cartesian/LICENCE.txt
+#It is not a license file, just a link on topic of forum, where it was published
diff --git a/debian/gmsh.docs b/debian/gmsh.docs
deleted file mode 100644
index 685c212..0000000
--- a/debian/gmsh.docs
+++ /dev/null
@@ -1,3 +0,0 @@
-utils/converters
-utils/solvers
-utils/api_demos
diff --git a/debian/gmsh.install b/debian/gmsh.install
index 4591e5f..21bbf52 100644
--- a/debian/gmsh.install
+++ b/debian/gmsh.install
@@ -1,18 +1,3 @@
 debian/*.xpm /usr/share/pixmaps
 debian/gmsh.desktop /usr/share/applications
-#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/StringUtils.h /usr/include/gmsh
-Mesh/Field.h  /usr/include/gmsh
-Post/PViewData.h /usr/include/gmsh
+usr/bin
diff --git a/debian/gmsh.links b/debian/gmsh.links
deleted file mode 100644
index 223fcad..0000000
--- a/debian/gmsh.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/libgmsh.so /usr/lib/libgmsh.so.2.5.1
diff --git a/debian/gmsh.lintian-overrides b/debian/gmsh.lintian-overrides
deleted file mode 100644
index 7bc92e1..0000000
--- a/debian/gmsh.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-gmsh: package-name-doesnt-match-sonames libgmsh-2.5.1
-gmsh: extra-license-file usr/share/doc/gmsh/converters/stl_to_cartesian/LICENCE.txt  
-#It is not a license file, just a link on topic of forum, where it was published
diff --git a/debian/gmsh.manpages b/debian/gmsh.manpages
new file mode 100644
index 0000000..5ea05fe
--- /dev/null
+++ b/debian/gmsh.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man1/*
diff --git a/debian/gmsh.install b/debian/libgmsh-dev.install
similarity index 88%
copy from debian/gmsh.install
copy to debian/libgmsh-dev.install
index 4591e5f..4990465 100644
--- a/debian/gmsh.install
+++ b/debian/libgmsh-dev.install
@@ -1,5 +1,4 @@
-debian/*.xpm /usr/share/pixmaps
-debian/gmsh.desktop /usr/share/applications
+usr/include
 #The following files are for compiling api_demos
 Common/Gmsh.h /usr/include/gmsh
 Geo/Chain.h /usr/include/gmsh
diff --git a/debian/libgmsh2.install b/debian/libgmsh2.install
new file mode 100644
index 0000000..20be4b6
--- /dev/null
+++ b/debian/libgmsh2.install
@@ -0,0 +1 @@
+usr/lib/libgmsh*
diff --git a/debian/patches/change_shared_library_name.patch b/debian/patches/change_shared_library_name.patch
index b6f282d..6278d2f 100644
--- a/debian/patches/change_shared_library_name.patch
+++ b/debian/patches/change_shared_library_name.patch
@@ -4,28 +4,26 @@ Last-Update: 2012-06-20
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1027,7 +1027,12 @@
+@@ -1027,7 +1027,11 @@
  # want to build the lib we need to recompile everything (the first
  # time--it's a separate target)
  add_library(lib STATIC EXCLUDE_FROM_ALL ${GMSH_SRC})
 -set_target_properties(lib PROPERTIES OUTPUT_NAME Gmsh)
 +set_target_properties(lib PROPERTIES 
 +  OUTPUT_NAME gmsh
-+  VERSION "${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}"
 +  SOVERSION "${GMSH_MAJOR_VERSION}"
 +  )
 +
  if(MSVC)
    set_target_properties(lib PROPERTIES DEBUG_POSTFIX d) 
    if(ENABLE_MSVC_STATIC_RUNTIME)
-@@ -1037,7 +1042,12 @@
+@@ -1037,7 +1041,11 @@
  
  # shared library target: we don't build it by default either
  add_library(shared SHARED EXCLUDE_FROM_ALL ${GMSH_SRC})
 -set_target_properties(shared PROPERTIES OUTPUT_NAME Gmsh)
 +set_target_properties(shared PROPERTIES 
 +  OUTPUT_NAME gmsh
-+  VERSION "${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}"
 +  SOVERSION "${GMSH_MAJOR_VERSION}"
 +  )
 +
diff --git a/debian/patches/fix_FTBFS_linking.patch b/debian/patches/fix_FTBFS_linking.patch
index b6f0432..1cd28bf 100644
--- a/debian/patches/fix_FTBFS_linking.patch
+++ b/debian/patches/fix_FTBFS_linking.patch
@@ -4,7 +4,7 @@ Last-Update: 2012-04-08
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1071,7 +1071,7 @@
+@@ -1069,7 +1069,7 @@
    message("WARNING: By enabling ENABLE_MSVC_STATIC_RUNTIME, shared library wont link. "
            "Change in msvc /MT flag to /MD in the shared project properties")
  endif(MSVC AND ENABLE_MSVC_STATIC_RUNTIME)		  
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 457b447..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "configure" ] ; then
-	ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0;
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100644
index 9372194..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
-    ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0;
diff --git a/debian/rules b/debian/rules
index bd63c3d..dffbdcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ BUILDDIR = $(CURDIR)/debian/build
 export OMPI_MCA_plm_rsh_agent=/bin/false                #workaround to start MPI-applications in chroot
 
 disable_mpi_archs = armel armhf kfreebsd-amd64 kfreebsd-i386 mips mipsel
+export LD_LIBRARY_PATH :=  $(CURDIR)/debian/tmp/usr/lib:$(LD_LIBRARY_PATH); 
 
 extra_flags += \
 -DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
@@ -15,19 +16,19 @@ extra_flags += \
 -DENABLE_METIS:BOOL=OFF \
 -DENABLE_TAUCS:BOOL=OFF \
 -DENABLE_OSMESA:BOOL=OFF \
--DENABLE_CGNS:BOOL=OFF
+-DENABLE_CGNS:BOOL=OFF \
+-DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
+-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
 
 ifeq (,$(filter $(DEB_HOST_ARCH),$(disable_mpi_archs)))
 	extra_flags += \
 	-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
 	                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
-	-DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
 	-DENABLE_MPI:BOOL=ON
 else
 	extra_flags += \
 	-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -fPIC \
 	                   -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
-	-DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
 	-DENABLE_MPI:BOOL=OFF
 endif
 
@@ -38,6 +39,7 @@ export SLEPC_DIR=/usr/lib/slepcdir/3.2
 
 override_dh_auto_clean:
 	rm -rf $(BUILDDIR)
+	rm -rf $(CURDIR)/debian/tmp
 	rm -f doc/texinfo/gmsh.vr 
 	rm -f doc/texinfo/gmsh.fn 
 	rm -f doc/texinfo/gmsh.ky 

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

More information about the debian-science-commits mailing list