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

[Daniel Leidert]

SVN commit 2473 by dleidert-guest:

* debian/control (Build-Depends): Use texlive instead of tetex-bin.
* debian/rules: Removed some variable declarations, which lead to double
  configuration and seem to be useless.
  (build/gmsh): Try to avoid multiple runs by using a stamp.
  (orig-tarball): Renamed to get-orig-source and changed to use uscan.

 M  +5 -3      gmsh/trunk/debian/changelog  
 M  +1 -1      gmsh/trunk/debian/control  
 M  +16 -18    gmsh/trunk/debian/rules  


--- gmsh/trunk/debian/changelog #2472:2473
@@ -1,10 +1,12 @@
 gmsh (2.2.0-2) UNRELEASED; urgency=low
 
   * debian/control (Vcs-Svn): Fixed.
-    (Build-Depends): Use texlive-base-bin instead of tetex-bin.
+    (Build-Depends): Use texlive instead of tetex-bin.
   * debian/gmsh.doc-base (Section): Fixed accordingly to doc-base (>= 0.8.10).
-  * debian/rules (orig-tarball): Renamed to get-orig-source and changed to use
-    uscan.
+  * debian/rules: Removed some variable declarations, that lead to double
+    configuration and seem to be useless.
+    (build/gmsh): Try to avoid multiple runs by using a stamp.
+    (orig-tarball): Renamed to get-orig-source and changed to use uscan.
   * debian/watch: Added.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sat, 10 May 2008 08:40:07 +0200
--- gmsh/trunk/debian/control #2472:2473
@@ -5,7 +5,7 @@
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
 Build-Depends: debhelper (>> 4), quilt, cdbs, libgl1-mesa-dev|nvidia-glx-dev,
  libglu1-xorg-dev, libfltk1.1-dev, libgsl0-dev, libpng12-dev, libjpeg62-dev,
- zlib1g-dev, texlive-base-bin | tetex-bin, texinfo
+ zlib1g-dev, texlive | tetex-bin, texinfo
 Standards-Version: 3.7.3
 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 #2472:2473
@@ -3,22 +3,17 @@
 # This file is public domain.
 
 
-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_AUTO_CLEANUP_RCS   := yes
+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/patchsys-quilt.mk
 
-DEB_BUILDDIR 			:= $(DEB_SRCDIR)/
-DEB_CONFIGURE_SCRIPT		:= $(CURDIR)/configure
 
 DEB_CONFIGURE_EXTRA_FLAGS :=       \
   --host=$(DEB_HOST_GNU_TYPE)      \
@@ -34,17 +29,20 @@
 export CXXFLAGS= -O3
 export FFLAGS= -O3
 
-build/gmsh::
-	cd doc/texinfo && make all
+build/gmsh:: build-doc-stamp
+build-doc-stamp:
+	$(MAKE) -C doc/texinfo all
+	touch $@
 
 clean::
-	-$(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
+	-$(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
 
 get-orig-source:
 	uscan --force-download --rename