[Pkg-scicomp-commits] gmsh/branches/gmsh-contrib/debian

[Christophe Prud'homme]

SVN commit 2675 by prudhomm:

update

 M  +3 -3      gmsh/branches/gmsh-contrib/debian/gmsh-contrib.doc-base  
 M  +1 -0      gmsh/branches/gmsh-contrib/debian/patches/series  
 A             gmsh/branches/gmsh-contrib/debian/patches/tetgen.patch  
 M  +11 -8     gmsh/branches/gmsh-contrib/debian/rules  


--- gmsh/branches/gmsh-contrib/debian/gmsh-contrib.doc-base #2674:2675
@@ -5,8 +5,8 @@
 Section: Science/Mathematics
 
 Format: pdf
-Files: /usr/share/doc/gmsh/gmsh.pdf
+Files: /usr/share/doc/gmsh-contrib/gmsh-contrib.pdf
 
 Format: HTML
-Index: /usr/share/doc/gmsh/html/index.html
-Files: /usr/share/doc/gmsh/html/*.html
+Index: /usr/share/doc/gmsh-contrib/html/index.html
+Files: /usr/share/doc/gmsh-contrib/html/*.html
--- gmsh/branches/gmsh-contrib/debian/patches/series #2674:2675
@@ -1 +1,2 @@
 makefile.patch
+tetgen.patch
--- gmsh/branches/gmsh-contrib/debian/rules #2674:2675
@@ -9,6 +9,7 @@
 DEB_COMPRESS_EXCLUDE   := .pdf
 DEB_MAKE_INSTALL_TARGET = install $(DEB_DESTDIR)
 
+DEB_AUTO_UPDATE_AUTOCONF := yes
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -16,6 +17,7 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 
+
 DEB_CONFIGURE_EXTRA_FLAGS :=       \
   --host=$(DEB_HOST_GNU_TYPE)      \
   --build=$(DEB_BUILD_GNU_TYPE)    \
@@ -23,23 +25,24 @@
   --mandir=\$${prefix}/share/man   \
   --infodir=\$${prefix}/share/info \
   --enable-tetgen                  \
-  --enable-occ                     \
-  --disable-metis 
+  --enable-occ
 
+
 #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
-export CXXFLAGS= -O3
+export CFLAGS= -O3 -I/usr/include/opencascade
+export CXXFLAGS= -O3 -I/usr/include/opencascade
 export FFLAGS= -O3
 export CPPFLAGS=-I/usr/include/opencascade
 
 
-build/gmsh:: build-doc-stamp
-build-doc-stamp:
-	$(MAKE) -C doc/texinfo all
-	touch $@
+build/gmsh-contrib:: 
+	-mv bin/gmsh bin/gmsh-contrib
+	-$(MAKE) -C doc/texinfo all
+	-(cd doc/texinfo && for i in gmsh*; do mv $$i `echo $$i | sed s/gmsh/gmsh-contrib/g`; done)
+	-(cd doc/ && mv gmsh.1 gmsh-contrib.1)
 
 clean::
 	-$(RM) $(DEB_BUILDDIR)/bin/gmsh \