[Pkg-scicomp-commits] gmsh/trunk/debian

[Christophe Prud'homme]

SVN commit 4290 by prudhomm:

new upstream release


 M  +15 -0     gmsh/trunk/debian/changelog  
 M  +2 -1      gmsh/trunk/debian/control  
 M  +25 -10    gmsh/trunk/debian/rules  


--- gmsh/trunk/debian/changelog #4289:4290
@@ -1,3 +1,18 @@
+gmsh (2.3.1.dfsg-1) unstable; urgency=low
+
+  * New upstream release
+    + removed GSL dependency (Gmsh now simply uses Blas and Lapack);
+    + new per-window visibility; 
+    + added support for composite window printing and background images;
+    + fixed string option affectation in parser; 
+    + fixed surface mesh orientation for Open Cascade models; 
+    + fixed random triangle orientations in Delaunay and Frontal
+    algorithms.
+  * debian/{control,rules}: Build with occ support only on amd64 and i386
+  * debian/rules: find GMSH_VERSION automatically
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 20 Mar 2009 07:48:29 +0100
+
 gmsh (2.3.0.dfsg-3) unstable; urgency=low
 
   * debian/: added prerm and postinst to get rid of two lintian errors
--- gmsh/trunk/debian/control #4289:4290
@@ -5,7 +5,8 @@
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
 Build-Depends: debhelper (>= 7), quilt, cdbs, libgl1-mesa-dev|nvidia-glx-dev,
  libglu1-mesa-dev, libfltk1.1-dev (>=1.1.7), libgsl0-dev,
- libpng12-dev, libjpeg62-dev, zlib1g-dev, texlive, texinfo, libopencascade-dev
+ libpng12-dev, libjpeg62-dev, zlib1g-dev, texlive, texinfo, 
+ libopencascade-dev [i386 amd64]
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/gmsh/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/gmsh/
--- gmsh/trunk/debian/rules #4289:4290
@@ -18,8 +18,28 @@
 #ENABLE_MED=--enable-med
 ENABLE_MED=--disable-med
 
-GMSH_VERSION=2.3.0
+#export CXX=g++-4.3
+#export CC=gcc-4.3
+#export CFLAGS= -O3 -I/usr/include/opencascade
+#export CXXFLAGS= -O3 -I/usr/include/opencascade
+export CFLAGS= -O3  -I/usr/include/mpi -DOMPI_SKIP_MPICXX 
+export CXXFLAGS= -O3 -I/usr/include/mpi -DOMPI_SKIP_MPICXX 
+export FFLAGS= -O3
+export CPPFLAGS=
 
+WITH_OCC=no
+ifeq ($(shell dpkg --print-architecture),amd64)
+ WITH_OCC=yes
+endif
+ifeq ($(shell dpkg --print-architecture),i386)
+ WITH_OCC=yes
+endif
+ifeq ($(WITH_OCC),yes)
+ CFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
+ CXXFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
+ CPPFLAGS += -I/usr/include/opencascade -DHAVE_NO_OCC_CONFIG_H
+endif
+
 DEB_CONFIGURE_EXTRA_FLAGS :=       \
   --host=$(DEB_HOST_GNU_TYPE)      \
   --build=$(DEB_BUILD_GNU_TYPE)    \
@@ -27,17 +47,9 @@
   --mandir=\$${prefix}/share/man   \
   --infodir=\$${prefix}/share/info \
   $(ENABLE_MED)                    \
-  --enable-occ=yes                 \
+  --enable-occ=$(WITH_OCC)         \
   --disable-metis --disable-tetgen
 
-#export CXX=g++-4.3
-#export CC=gcc-4.3
-#export CFLAGS= -O3 -I/usr/include/opencascade
-#export CXXFLAGS= -O3 -I/usr/include/opencascade
-export CFLAGS= -O3 -I/usr/include/opencascade -I/usr/include/mpi -DOMPI_SKIP_MPICXX -DHAVE_NO_OCC_CONFIG_H
-export CXXFLAGS= -O3 -I/usr/include/opencascade -I/usr/include/mpi -DOMPI_SKIP_MPICXX -DHAVE_NO_OCC_CONFIG_H
-export FFLAGS= -O3
-export CPPFLAGS=-I/usr/include/opencascade
 
 
 build/gmsh:: build-doc-stamp
@@ -55,6 +67,9 @@
 	           $(DEB_BUILDDIR)/contrib/Netgen/nglib_addon.o
 	-$(RM) build-doc-stamp
 
+DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
+GMSH_VERSION=$(DEB_STRIPPED_UPSTREAM_VERSION)
+
 get-orig-source:
 	uscan --force-download --rename --verbose --upstream-version $(GMSH_VERSION)
 	tar xzf ../gmsh_$(GMSH_VERSION).orig.tar.gz