[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

Stephane Popinet popinet at users.sf.net
Fri May 15 02:56:21 UTC 2009 

The following commit has been merged in the upstream branch:
commit e2cc376a4a45507c6fc8783e7710ecd035eec7c3
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri May 1 14:28:27 2009 +1000

    Updated debian package build (based on Drew Parson's)
    
    Ignore-this: b9078873d82081a0bfc11d5ba6f98a23
    
    darcs-hash:20090501042827-d4795-b5a3da0b7e37708d7f3b178bedea6b130aeecc12.gz

diff --git a/Makefile.am b/Makefile.am
index 34740f9..9796f3a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,8 +16,8 @@ changelog:
 	darcs changes > ChangeLog
 
 debian-snapshot: $(DARCS_CHANGELOG) config.h src/version.h
-	sh debian/control.sh
-	dpkg-buildpackage -rfakeroot -b -d
+	sh debian/changelog.sh
+	dpkg-buildpackage -rfakeroot -b
 	rm -f debian/repo/*
 	mv -f ../*.changes ../*.deb debian/repo
 	cd debian/repo && dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
diff --git a/debian/changelog.sh b/debian/changelog.sh
new file mode 100644
index 0000000..605059b
--- /dev/null
+++ b/debian/changelog.sh
@@ -0,0 +1,10 @@
+GERRIS_VERSION=$(grep GFS_VERSION config.h | awk 'BEGIN{FS=" |\""}{print $4}')
+version=$(grep GFS_BUILD_VERSION src/version.h | awk 'BEGIN{FS=" |\"|-"}{print $4}')
+date=$(date +"%a, %e %b %Y %T %z")
+cat <<EOF > debian/changelog
+gerris-snapshot ($GERRIS_VERSION-$version) testing; urgency=low
+
+  * gerris-snapshot release (based on Drew Parsons's official debian)
+
+ -- Stephane Popinet <popinet at users.sf.net>  $date
+EOF
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..b2643e5
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,31 @@
+Source: gerris-snapshot
+Section: science
+Priority: optional
+Maintainer: Stephane Popinet <popinet at users.sf.net>
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev,
+	       libnetcdf-dev, libgsl0-dev, libglib2.0-dev,
+	       python, g77 | gfortran, chrpath
+Homepage: http://gfs.sourceforge.net/
+
+Package: gerris-snapshot
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config, gcc, sed, gawk, m4, proj
+Replaces: gerris
+Recommends: gfsview-snapshot, source-highlight
+Suggests: imagemagick, ffmpeg
+Description: Gerris Flow Solver (development snapshot)
+ Gerris is a system for the solution of the partial differential
+ equations describing fluid flow.
+ .
+ A brief summary of its main features:
+ .
+    * Quadtree-based (Octree in 3D) spatial discretisation with
+      automatic and dynamic refinement.
+    * Multigrid Poisson solver.
+    * Second-order Godunov type advection scheme.
+    * Solves the time-dependent incompressible Euler, Stokes ans Navier-Stokes
+      equations.
+    * Support for complex solid boundaries (automatic locally-refined
+      mesh generation).
+ .
+ See http://gfs.sf.net for more information and documentation.
diff --git a/debian/control.sh b/debian/control.sh
deleted file mode 100644
index 04b736f..0000000
--- a/debian/control.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-GTS_VERSION=`pkg-config gts --modversion`
-
-cat <<EOF > debian/control
-Source: gerris-snapshot
-Section: math
-Priority: extra
-Maintainer: Stephane Popinet <popinet at users.sf.net>
-Build-Depends: debhelper (>> 4), autotools-dev, netcdfg-dev, libgsl0-dev, g77 | gfortran
-
-Package: gerris-snapshot
-Section: math
-Priority: extra
-Architecture: any
-Depends: libc6-dev | libc-dev, libgts-snapshot-dev (>= $GTS_VERSION), pkg-config, gcc, sed, gawk, m4, proj, libnetcdf3, libgsl0
-Conflicts: gerris
-Replaces: gerris
-Recommends: gfsview-snapshot, source-highlight
-Suggests: imagemagick, ffmpeg
-Description: Gerris Flow Solver (development snapshot)
- Gerris is a system for the solution of the partial differential
- equations describing fluid flow.
- .
- A brief summary of its main (current) features:
- .
-    * Quadtree-based (Octree in 3D) spatial discretisation with
-      automatic and dynamic refinement.
-    * Multigrid Poisson solver.
-    * Second-order Godunov type advection scheme.
-    * Solves the time-dependent incompressible Euler, Stokes ans Navier-Stokes
-      equations.
-    * Support for complex solid boundaries (automatic locally-refined
-      mesh generation).
- .
- See http://gfs.sf.net for more information and documentation.
-EOF
-
-GERRIS_VERSION=`grep GFS_VERSION config.h | awk 'BEGIN{FS=" |\""}{print $4}'`
-version=`grep GFS_BUILD_VERSION src/version.h | awk 'BEGIN{FS=" |\"|-"}{print $4}'`
-date=`date +"%a, %e %b %Y %T %z"`
-cat <<EOF > debian/changelog
-gerris-snapshot ($GERRIS_VERSION-$version) testing; urgency=low
-
-  * gerris-snapshot release (based on Marcelo's official debian)
-
- -- Stephane Popinet <popinet at users.sf.net>  $date
-EOF
diff --git a/debian/gerris-snapshot.install b/debian/gerris-snapshot.install
deleted file mode 100644
index b97a068..0000000
--- a/debian/gerris-snapshot.install
+++ /dev/null
@@ -1,17 +0,0 @@
-usr/bin/*
-usr/include/*
-usr/lib/*.so.*
-usr/lib/*.so
-usr/lib/*.a
-usr/lib/*.la
-usr/lib/gerris/*.so
-usr/lib/gerris/*.so.*
-usr/lib/gerris/*.a
-usr/lib/gerris/*.la
-usr/lib/gerris/*.mdf
-usr/lib/gerris/*.py
-usr/lib/gerris/*.awk
-usr/lib/pkgconfig/*.pc
-usr/share/mime/packages/*.xml
-usr/share/icons/hicolor/48x48/mimetypes/*.png
-usr/share/gerris/*
diff --git a/debian/gerris-snapshot.symbols b/debian/gerris-snapshot.symbols
new file mode 100644
index 0000000..9a959a9
--- /dev/null
+++ b/debian/gerris-snapshot.symbols
@@ -0,0 +1 @@
+# dummy file just here to force dh_makeshlibs to call dpkg-gensymbols
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index 7ca7f50..0000000
--- a/debian/postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -x /usr/bin/update-mime-database ] ; then
-    if /usr/bin/update-mime-database /usr/share/mime; then :
-    else
-	exit 1
-    fi
-fi
-
-exit 0
diff --git a/debian/postrm b/debian/postrm
deleted file mode 100755
index 7ca7f50..0000000
--- a/debian/postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -x /usr/bin/update-mime-database ] ; then
-    if /usr/bin/update-mime-database /usr/share/mime; then :
-    else
-	exit 1
-    fi
-fi
-
-exit 0
diff --git a/debian/rules b/debian/rules
index e77a71f..0239cf9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,91 +1,25 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-mpi
 
-CFLAGS := -O2 -Wall
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
+GFS_VERSION = $(shell grep -o "[0-9]*\.[0-9]*\.[0-9]*" $(CURDIR)/debian/changelog)
+DEB_DH_MAKESHLIBS_ARGS_ALL = -- -v$(GFS_VERSION) -c0
 
-CONFIG_GUESS := /usr/share/misc/config.guess
-CONFIG_SUB   := /usr/share/misc/config.sub
+# To look for shlibs and symbols file in locally compiled libgts-snapshot debian package
+# do something like:
+# % export DEB_DH_SHLIBDEPS_ARGS_ALL="-- -S$HOME/local/src/gts-mainline/debian/libgts-snapshot"
 
-config.status: configure
-	dh_testdir
+clean::
+	rm -f a.out
+	rm -f doc/examples/gfs.lang
+	rm -f doc/examples/gfs2tex.pyc
+	rm -f doc/examples/Makefile.deps
+	rm -f src/modules.c
+	rm -f src/modules.h
 
-	test -r $(CONFIG_GUESS) && cp $(CONFIG_GUESS) .
-	test -r $(CONFIG_SUB) && cp $(CONFIG_SUB) .
-
-	CFLAGS="$(CFLAGS)" ./configure \
-		--disable-mpi \
-		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	-$(MAKE) distclean
-	-rm -rf config.sub
-	-rm -rf config.guess
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
-
-binary-indep: build install
-# We have nothing to do by default.
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
-
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-	dh_installcron
-	dh_installman
-	dh_installinfo
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress -X.pdf
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+# Remove rpath added by libtool
+binary-post-install/gerris-snapshot ::
+	- chrpath -d -k debian/gerris-snapshot/usr/bin/* 2> /dev/null
diff --git a/tools/daily b/tools/daily
index bbbf079..d9825b7 100755
--- a/tools/daily
+++ b/tools/daily
@@ -22,6 +22,10 @@ export LD_LIBRARY_PATH=$wdir/local/lib:$LD_LIBRARY_PATH:/usr/local/lib
 export PKG_CONFIG_PATH=$wdir/local/lib/pkgconfig:$PKG_CONFIG_PATH
 ulimit -c unlimited
 
+# debian build looks for shlibs and symbols file in locally compiled
+# libgts-snapshot debian packages:
+export DEB_DH_SHLIBDEPS_ARGS_ALL="-- -S$wdir/$gts/debian/libgts-snapshot -S$wdir/$gerris/debian/gerris-snapshot"
+
 # kill all running rsync processes. Assumes the only ones would be
 # hanging rsync from previous calls of this script!!
 killall rsync 2> /dev/null

-- 
Gerris Flow Solver

More information about the debian-science-commits mailing list