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

[Christophe Prud'homme]

SVN commit 4551 by prudhomm:

cleanup 
use cmake build system


 M  +7 -0      gmsh/trunk/debian/changelog  
 M  +3 -16     gmsh/trunk/debian/gmsh.install  
 M  +1 -2      gmsh/trunk/debian/patches/series  
 M  +16 -31    gmsh/trunk/debian/rules  


--- gmsh/trunk/debian/changelog #4550:4551
@@ -1,3 +1,10 @@
+gmsh (2.4.0.dfsg-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/rules: use cmake build system
+
+ -- Christophe Prud'homme <prudhomm at debian.org>  Wed, 26 Aug 2009 18:25:57 +0200
+
 gmsh (2.3.1.dfsg-4) unstable; urgency=low
 
   [Christophe Prud'homme]
--- gmsh/trunk/debian/gmsh.install #4550:4551
@@ -1,18 +1,5 @@
-bin/gmsh /usr/bin
-doc/gmsh.1 /usr/share/man/man1
-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
-doc/texinfo/index.html /usr/share/doc/gmsh/html
-demos /usr/share/doc/gmsh
-tutorial /usr/share/doc/gmsh
-utils /usr/share/doc/gmsh
-doc/FAQ.txt /usr/share/doc/gmsh
-doc/CREDITS.txt /usr/share/doc/gmsh
-doc/VERSIONS.txt /usr/share/doc/gmsh
-doc/README.cvs /usr/share/doc/gmsh
-doc/README.gui /usr/share/doc/gmsh
-doc/README.occ /usr/share/doc/gmsh
-doc/TODO.txt /usr/share/doc/gmsh
+debian/gmsh/usr/bin/gmsh /usr/bin
+debian/gmsh/usr/share/doc/gmsh /usr/share/doc
+debian/gmsh/usr/include/gmsh /usr/include
 debian/gmsh16x16-smooth.xpm /usr/share/pixmaps
 debian/gmsh.desktop /usr/share/applications
--- gmsh/trunk/debian/patches/series #4550:4551
@@ -1,2 +1 @@
-gcc44.patch
-makefile.patch
+
--- gmsh/trunk/debian/rules #4550:4551
@@ -10,9 +10,8 @@
 DEB_MAKE_INSTALL_TARGET = install $(DEB_DESTDIR)
 
 
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 #ENABLE_MED=--enable-med
@@ -40,43 +39,29 @@
  CPPFLAGS += -I/usr/include/mpi -DOMPI_SKIP_MPICXX
 endif
 
-DEB_CONFIGURE_EXTRA_FLAGS :=       \
-  --host=$(DEB_HOST_GNU_TYPE)      \
-  --build=$(DEB_BUILD_GNU_TYPE)    \
-  --prefix=/usr                    \
-  --mandir=\$${prefix}/share/man   \
-  --infodir=\$${prefix}/share/info \
-  $(ENABLE_MED)                    \
-  --enable-cgns=yes                \
-  --enable-occ=$(WITH_OCC)         \
-  --enable-mpi=$(WITH_MPI)         \
-  --disable-metis --disable-tetgen \
-  --with-blas-lapack-prefix=/usr/lib
+# DEB_CONFIGURE_EXTRA_FLAGS :=       \
+#   --host=$(DEB_HOST_GNU_TYPE)      \
+#   --build=$(DEB_BUILD_GNU_TYPE)    \
+#   --prefix=/usr                    \
+#   --mandir=\$${prefix}/share/man   \
+#   --infodir=\$${prefix}/share/info \
+#   $(ENABLE_MED)                    \
+#   --enable-cgns=yes                \
+#   --enable-occ=$(WITH_OCC)         \
+#   --enable-mpi=$(WITH_MPI)         \
+#   --disable-metis --disable-tetgen \
+#   --with-blas-lapack-prefix=/usr/lib
 
+DEB_CMAKE_EXTRA_FLAGS= \
+	-DENABLE_METIS=OFF
 
-
-build/gmsh:: build-doc-stamp
-build-doc-stamp:
-	$(MAKE) -C doc/texinfo all
-	touch $@
-
-clean::
-	-$(RM) $(DEB_BUILDDIR)/bin/gmsh \
-	       $(DEB_BUILDDIR)/config.log $(DEB_BUILDDIR)/config.status \
-	       $(DEB_BUILDDIR)/utils/solvers/c++/solver.exe \
-	       $(DEB_BUILDDIR)/utils/solvers/c++/interactive.exe
-	-$(RM) -rf $(DEB_BUILDDIR)/utils/converters/autocad/CVS \
-	           $(DEB_BUILDDIR)/utils/converters/maya/CVS \
-	           $(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
-	mv gmsh-$(GMSH_VERSION) gmsh-$(GMSH_VERSION).dfsg
+	mv gmsh-$(GMSH_VERSION)-source gmsh-$(GMSH_VERSION).dfsg
 	cd gmsh-$(GMSH_VERSION).dfsg/contrib/Metis && rm *.c *.h
 	tar czf gmsh_$(GMSH_VERSION).dfsg.orig.tar.gz gmsh-$(GMSH_VERSION).dfsg
 	rm -rf gmsh-$(GMSH_VERSION).dfsg