r36959 - in /packages/gmsh/trunk/debian: changelog control patches/scotchmetis.patch patches/series postinst postrm rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Mon Oct 25 12:28:16 UTC 2010 

Author: trophime-guest
Date: Mon Oct 25 12:28:07 2010
New Revision: 36959

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36959
Log:
add scotchmetis and openmp support

Added:
    packages/gmsh/trunk/debian/patches/scotchmetis.patch
    packages/gmsh/trunk/debian/patches/series
    packages/gmsh/trunk/debian/postrm
Modified:
    packages/gmsh/trunk/debian/changelog
    packages/gmsh/trunk/debian/control
    packages/gmsh/trunk/debian/postinst
    packages/gmsh/trunk/debian/rules

Modified: packages/gmsh/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/changelog?rev=36959&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/changelog (original)
+++ packages/gmsh/trunk/debian/changelog Mon Oct 25 12:28:07 2010
@@ -1,3 +1,11 @@
+gmsh (2.5.0.dfsg-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add openmp support
+  * Add metis support : use scotchmetis
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Thu, 21 Oct 2010 16:28:01 +0200
+
 gmsh (2.5.0.dfsg-1) unstable; urgency=low
 
   [Christophe Prud'homme]

Modified: packages/gmsh/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/control?rev=36959&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/control (original)
+++ packages/gmsh/trunk/debian/control Mon Oct 25 12:28:07 2010
@@ -3,13 +3,14 @@
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, cmake, gfortran, libgl1-mesa-dev|nvidia-glx-dev,
+Build-Depends: debhelper (>= 7), cdbs, quilt, cmake, gfortran, libgl1-mesa-dev|nvidia-glx-dev,
  libglu1-mesa-dev, libfltk1.1-dev (>=1.1.7),
  libpng12-dev, libjpeg62-dev, zlib1g-dev, texlive, texinfo,
  mpi-default-dev,
  libopencascade-modeling-dev,
  libcgns-dev (>= 2.5.3),
- libmedc-dev (>= 2.3.6),
+ libmedc-dev (>= 2.3.6), 
+ libscotchmetis-dev,
  libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/gmsh/trunk

Added: packages/gmsh/trunk/debian/patches/scotchmetis.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/patches/scotchmetis.patch?rev=36959&op=file
==============================================================================
--- packages/gmsh/trunk/debian/patches/scotchmetis.patch (added)
+++ packages/gmsh/trunk/debian/patches/scotchmetis.patch Mon Oct 25 12:28:07 2010
@@ -1,0 +1,25 @@
+Index: gmsh-2.5.0.dfsg/CMakeLists.txt
+===================================================================
+--- gmsh-2.5.0.dfsg.orig/CMakeLists.txt	2010-10-22 10:20:27.000000000 +0200
++++ gmsh-2.5.0.dfsg/CMakeLists.txt	2010-10-22 10:24:35.000000000 +0200
+@@ -484,11 +484,16 @@
+ endif(ENABLE_MPEG_ENCODE)
+ 
+ if(ENABLE_METIS)
+-  add_subdirectory(contrib/Metis)
+-  include_directories(contrib/Metis)
++  find_library(METIS_LIB metis PATH_SUFFIXES lib)
++  if(METIS_LIB)
++    find_path(METIS_INC "metis.h" PATH_SUFFIXES src include include/metis)
++    if(METIS_INC)
++      list(APPEND EXTERNAL_LIBRARIES ${METIS_LIB})
++      list(APPEND EXTERNAL_INCLUDES ${METIS_INC})
++    endif(METIS_INC)
++  endif(METIS_LIB)
+   set_config_option(HAVE_METIS "Metis")
+-  message("WARNING: By including Metis you have to comply with Metis' special "
+-          "licensing requirements stated in contrib/Metis/README.txt.")
++  message("WARNING: Including ScotchMetis")
+ endif(ENABLE_METIS)
+ 
+ if(HAVE_MESH)

Added: packages/gmsh/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/patches/series?rev=36959&op=file
==============================================================================
--- packages/gmsh/trunk/debian/patches/series (added)
+++ packages/gmsh/trunk/debian/patches/series Mon Oct 25 12:28:07 2010
@@ -1,0 +1,1 @@
+scotchmetis.patch

Modified: packages/gmsh/trunk/debian/postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/postinst?rev=36959&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/postinst (original)
+++ packages/gmsh/trunk/debian/postinst Mon Oct 25 12:28:07 2010
@@ -2,6 +2,10 @@
 
 set -e
 
+if [ "$1" = "configure" ] ; then
+	ldconfig
+fi
+
 #DEBHELPER#
 
 exit 0;

Added: packages/gmsh/trunk/debian/postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/postrm?rev=36959&op=file
==============================================================================
--- packages/gmsh/trunk/debian/postrm (added)
+++ packages/gmsh/trunk/debian/postrm Mon Oct 25 12:28:07 2010
@@ -1,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "remove" ]; then
+    ldconfig
+fi
+
+#DEBHELPER#
+
+exit 0;

Modified: packages/gmsh/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh/trunk/debian/rules?rev=36959&op=diff
==============================================================================
--- packages/gmsh/trunk/debian/rules (original)
+++ packages/gmsh/trunk/debian/rules Mon Oct 25 12:28:07 2010
@@ -8,7 +8,7 @@
 
 include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-# include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 #ENABLE_MED=--enable-med
 #ENABLE_MED=--disable-med
@@ -31,6 +31,12 @@
 CXXFLAGS +=-I/usr/include/mpi  -DOMPI_SKIP_MPICXX
 CPPFLAGS +=-I/usr/include/mpi  -DOMPI_SKIP_MPICXX
 
+# To enable openmp support
+CFLAGS +=-fopenmp
+CXXFLAGS +=-fopenmp
+CPPFLAGS +=-fopenmp
+LDFLAGS += -fopenmp
+
 
 # DEB_CONFIGURE_EXTRA_FLAGS :=       \
 #   --host=$(DEB_HOST_GNU_TYPE)      \
@@ -46,7 +52,7 @@
 #   --with-blas-lapack-prefix=/usr/lib
 
 DEB_CMAKE_EXTRA_FLAGS= \
-	-DENABLE_METIS=OFF \
+	-DENABLE_METIS=ON \
 	-DENABLE_TAUCS=OFF \
 	-DENABLE_CGNS=OFF \
 	-DENABLE_MPI=ON \
@@ -59,10 +65,21 @@
 build/gmsh::
 	cd $(DEB_BUILDDIR) && $(MAKE) lib
 	cd $(DEB_BUILDDIR) && $(MAKE) shared
-	cd $(DEB_BUILDDIR) && $(MAKE) pdf html info
+	# To avoid the texi2dvi pb add LC_ALL=C
+	cd $(DEB_BUILDDIR) && $(MAKE) pdf html info LC_ALL=C
 
 install/gmsh::
 	-rm debian/gmsh/usr/share/doc/gmsh/LICENSE.txt
+
+clean::
+	-rm doc/texinfo/gmsh.vr doc/texinfo/gmsh.fn doc/texinfo/gmsh.ky doc/texinfo/gmsh.pg
+	-rm doc/texinfo/gmsh.toc
+	-rm doc/texinfo/gmsh.log
+	-rm doc/texinfo/gmsh.cp
+	-rm doc/texinfo/gmsh.tp
+	-rm doc/texinfo/gmsh.tps
+	-rm doc/texinfo/gmsh.cps
+	-rm doc/texinfo/gmsh.aux
 
 get-orig-source:
 	uscan --force-download --rename --verbose --upstream-version $(GMSH_VERSION)

More information about the debian-science-commits mailing list