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

[Christophe Prud'homme]

SVN commit 1963 by prudhomm:

-4 is almost ready

 M  +10 -0     gmsh/trunk/debian/changelog  
 M  +1 -0      gmsh/trunk/debian/gmsh.install  
 M  +14 -12    gmsh/trunk/debian/rules  


--- gmsh/trunk/debian/changelog #1962:1963
@@ -1,3 +1,13 @@
+gmsh (2.0.8-4) unstable; urgency=low
+
+  [ Christophe Prud'homme ]
+  * debian/control: depend on quilt and cdbs
+  * debian/rules: use quilt and cdbs
+  * Bug fix: "FTBFS with GCC 4.3: duplicate function parameters & co",
+    thanks to Martin Michlmayr (Closes: #454883).
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Sun, 16 Dec 2007 15:40:18 +0100
+
 gmsh (2.0.8-3) unstable; urgency=low
 
   [ Christophe Prud'homme ]
--- gmsh/trunk/debian/gmsh.install #1962:1963
@@ -1,3 +1,4 @@
+bin/gmsh /usr/bin
 doc/texinfo/gmsh.txt /usr/share/doc/gmsh
 doc/texinfo/gmsh.pdf /usr/share/doc/gmsh
 doc/texinfo/gmsh*.html /usr/share/doc/gmsh/html
--- gmsh/trunk/debian/rules #1962:1963
@@ -2,22 +2,19 @@
 # Sample debian/rules that uses cdbs.  Originaly written by Robert Millan.
 # This file is public domain.
 
-DEB_TAR_SRCDIR                  := gmsh-8.0.1
+
 DEB_AUTO_CLEANUP_RCS            := yes
-
-
 DEB_BUILDDIR 			:= $(DEB_SRCDIR)/
 DEB_CONFIGURE_SCRIPT		:= $(DEB_SRCDIR)/configure
 DEB_MAKE_CLEAN_TARGET    := clean
 DEB_MAKE_BUILD_TARGET    := default
 DEB_COMPRESS_EXCLUDE     := .pdf
+DEB_MAKE_INSTALL_TARGET = install $(DEB_DESTDIR)
 
 
 
-
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_BUILDDIR 			:= $(DEB_SRCDIR)/
@@ -31,16 +28,21 @@
   --infodir=\$${prefix}/share/info \
   --disable-metis --disable-tetgen
 
+CXX=/usr/lib/gcc-snapshot/bin/g++
+CC=/usr/lib/gcc-snapshot/bin/gcc
 CFLAGS= -O3
 CXXFLAGS= -O3
 FFLAGS= -O3
 
+build/gmsh::
+	cd doc/texinfo && make all
+
 clean::
-	-$(RM) bin/gmsh
-	-$(RM) config.log config.status
-	-$(RM) -rf utils/converters/autocad/CVS
-	-$(RM) -rf utils/converters/maya/CVS
-	-$(RM) -rf contrib/Netgen/nglib_addon.o
-	-$(RM) utils/solvers/c++/solver.exe; fi
-	-$(RM) utils/solvers/c++/interactive.exe; fi
+	-$(RM) $(DEB_BUILDDIR)/bin/gmsh
+	-$(RM) $(DEB_BUILDDIR)/config.log $(DEB_BUILDDIR)/config.status
+	-$(RM) -rf $(DEB_BUILDDIR)/utils/converters/autocad/CVS
+	-$(RM) -rf $(DEB_BUILDDIR)/utils/converters/maya/CVS
+	-$(RM) -rf $(DEB_BUILDDIR)/contrib/Netgen/nglib_addon.o
+	-$(RM) $(DEB_BUILDDIR)/utils/solvers/c++/solver.exe
+	-$(RM) $(DEB_BUILDDIR)/utils/solvers/c++/interactive.exe