[SCM] Gmsh packaging. Gmsh is an automatic 3D finite element mesh generator. branch, gmsh-tetgen, updated. debian/2.6.0.dfsg-2-20-gd3d918e
Anton Gladky
gladky.anton at gmail.com
Wed Jun 27 18:23:13 UTC 2012
The following commit has been merged in the gmsh-tetgen branch:
commit f0248b4601525757a47b1e5b0791fe02bf0f8ab5
Merge: fa563e331512afcb1027ac011b00ab617b5ba766 3bf9207bac8b4372bf59192764acc5975a68d7ef
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Sun Jun 24 11:22:28 2012 +0200
Make merge with the main branch.
diff --combined debian/changelog
index 2c933ab,5b578d9..e130313
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,45 +1,62 @@@
++<<<<<<< HEAD
+gmsh-tetgen (2.5.1~beta2~svn12143~dfsg-1) non-free; urgency=low
+
+ * Imported Upstream version 2.5.1~beta2~svn12143~dfsg
+ * Import debian/rules changes from non-free version
+ * Remove change_shared_library_name.patch. Applied by upstream.
+ * Remove skip_license_file.patch. Applied by upstream.
+ * Remove fix_spelling_errors.patch. Applied by upstream.
+ * Remove delete_gl2ps_from_source.patch. Applied by upstream.
+ * Remove switch_from_opencascade_to_oce.patch. Applied by upstream.
+ * Remove api_demos.patch. Applied by upstream.
+ * Remove skip_license_file.patch. Applied by upstream.
+ * Remove fix_FTBFS_linking.patch. Applied by upstream.
+
+ -- Anton Gladky <gladky.anton at gmail.com> Thu, 24 May 2012 21:15:53 +0200
++=======
+ gmsh (2.6.0.dfsg-2) unstable; urgency=low
+
+ * [5b8e374] Add dfsg-prefix to the upstream number.
+ * [3892439] Update patch, change the name of shared library.
+ * [d9902a5] Add alauzet patch, refresh other patches.
+
+ -- Anton Gladky <gladky.anton at gmail.com> Wed, 20 Jun 2012 18:59:00 +0200
+
+ gmsh (2.6.0-1) unstable; urgency=low
+
+ * [47ff0e6] Imported Upstream version 2.6.0
+ * [e3079c4] Refresh patches, remove ones applied by upstream.
+
+ -- Anton Gladky <gladky.anton at gmail.com> Tue, 19 Jun 2012 22:43:42 +0200
+
+ gmsh (2.5.1~beta2~svn12375~dfsg-1) unstable; urgency=low
+
+ * [f29f130] Imported Upstream version 2.5.1~beta2~svn12375~dfsg.
+ (Closes: #677544)
+ * [a5d25f5] Remove patch, applied by upstream.
+
+ -- Anton Gladky <gladky.anton at gmail.com> Thu, 14 Jun 2012 22:28:02 +0200
+
+ gmsh (2.5.1~beta2~svn12143~dfsg-2) unstable; urgency=low
+
+ * [97cda71] Disable MPI on armel, armhf, kfreebsd-amd64, kfreebsd-i386,
+ mips and mipsel. Hopefully will fix FTBFS on those platforms.
+
+ -- Anton Gladky <gladky.anton at gmail.com> Fri, 25 May 2012 21:40:37 +0200
+
+ gmsh (2.5.1~beta2~svn12143~dfsg-1) unstable; urgency=low
+
+ * [2d76517] Imported Upstream version 2.5.1~beta2~svn12143~dfsg.
+ (Closes: #674358)
+ * [551fd6f] Import debian/rules changes from non-free version.
+ * [fa51002] Refresh patches.
+ * [77b9389] Add alauzet.patch from gmsh-tetgen.
+ * [ad9026f] Add cgns.patch from gmsh-tetgen.
+ * [40004dc] Add pedantic.patch from gmsh-tetgen.
+ * [ba6f120] Fix FTBFS against gcc-4.7 (bamg-library).
+
+ -- Anton Gladky <gladky.anton at gmail.com> Thu, 24 May 2012 22:06:11 +0200
++>>>>>>> master
gmsh (2.5.1~beta2~svn11845~dfsg-2) unstable; urgency=low
diff --combined debian/control
index e81cc4d,b65efeb..c07805c
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
-Source: gmsh
+Source: gmsh-tetgen
Section: math
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
@@@ -26,10 -26,11 +26,11 @@@ Vcs-Git: git://git.debian.org/git/debia
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/gmsh.git
Homepage: http://www.geuz.org/gmsh/
-Package: gmsh
+Package: gmsh-tetgen
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 +45,62 @@@
.
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 --combined debian/patches/series
index 627ab69,826079e..3042807
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -5,8 -5,6 +5,11 @@@ delete_gl2ps_from_source.patc
switch_from_opencascade_to_oce.patch
api_demos.patch
fix_FTBFS_linking.patch
- alauzet.patch
cgns.patch
pedantic.patch
++<<<<<<< HEAD
+metis.patch
+tetgen-1.4.3.patch
++=======
+ alauzet.patch
++>>>>>>> master
diff --combined debian/rules
index 11eaa08,dffbdcd..e680d05
--- a/debian/rules
+++ b/debian/rules
@@@ -6,19 -6,31 +6,42 @@@ BUILDDIR = $(CURDIR)/debian/buil
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 += \
++<<<<<<< HEAD
+-DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -lmpi -fPIC \
+ -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
++=======
++>>>>>>> master
-DCMAKE_C_FLAGS="-fPIC -Wall $(shell dpkg-buildflags --get CFLAGS)" \
- -DCMAKE_INCLUDE_PATH:STRING="/usr/include/mpi" \
- -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python2.7 \
-DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 \
-DPYTHON_LIBRARY:FILEPATH=/usr/lib/libpython2.7.so \
++<<<<<<< HEAD
+-DENABLE_METIS:BOOL=ON \
+-DENABLE_TAUCS:BOOL=ON \
+-DENABLE_MPI:BOOL=ON \
++=======
+ -DENABLE_METIS:BOOL=OFF \
+ -DENABLE_TAUCS:BOOL=OFF \
++>>>>>>> master
-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)" \
+ -DENABLE_MPI:BOOL=ON
+ else
+ extra_flags += \
+ -DCMAKE_CXX_FLAGS="-DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -fopenmp -fPIC \
+ -Wall $(shell dpkg-buildflags --get CXXFLAGS)" \
+ -DENABLE_MPI:BOOL=OFF
+ endif
# PETSC_DIR is the location of PETSc.
export PETSC_DIR=/usr/lib/petscdir/3.2
@@@ -27,6 -39,7 +50,7 @@@ export SLEPC_DIR=/usr/lib/slepcdir/3.
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