[SCM] Gerris Flow Solver branch, debian-unstable, updated. gerris-20091109-dfsg.1-1-1-g4a14314

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit 4a14314b3b760f5615ca68b2e8fc7de6f471d5d1
Author: Drew Parsons <Drew.Parsons at anu.edu.au>
Date:   Sun Dec 27 18:43:48 2009 +1100

    use dh instead of cdbs for package autobuild
    
      * Use dh (debhelper v7) rather than cdbs to autobuild package.
        cdbs does not support multiple builds (mpi vs non-mpi).
    
      * Set up build-support for quilt (not actively used yet).
    
      * Remove get-orig-source target from debian/rules; gerris has
        nonfree code which needs to be removed from the upstream tarball
        anyway.

diff --git a/debian/changelog b/debian/changelog
index a509d8f..420bf8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gerris (20091109-dfsg.1-2) UNRELEASED; urgency=low
+
+  * Use dh (debhelper v7) rather than cdbs to autobuild package.
+    cdbs does not support multiple builds (mpi vs non-mpi).
+  * Set up build-support for quilt (not actively used yet).
+  * Remove get-orig-source target from debian/rules; gerris has
+    nonfree code which needs to be removed from the upstream tarball
+    anyway.
+
+ -- Drew Parsons <dparsons at debian.org>  Sun, 27 Dec 2009 15:47:20 +1100
+
 gerris (20091109-dfsg.1-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 0c4b907..eae72bf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Drew Parsons <dparsons at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev,
+Build-Depends: debhelper (>= 7), quilt (>= 0.46-7~), autotools-dev,
 	libgts-dev (>> 0.7.6),  libgts-bin (>> 0.7.6),
 	libnetcdf-dev, libgsl0-dev, libglib2.0-dev, python,
 	gfortran
diff --git a/debian/gerris.docs b/debian/gerris.docs
new file mode 100644
index 0000000..a139f76
--- /dev/null
+++ b/debian/gerris.docs
@@ -0,0 +1,6 @@
+README
+NEWS
+AUTHORS
+ChangeLog
+TODO
+THANKS
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
deleted file mode 100644
index 2b5e7fa..0000000
--- a/debian/get-orig-source.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-wget -c "http://gfs.sf.net/gerris-snapshot.tar.gz"
-tar zxvf gerris-snapshot.tar.gz
-
-DFSG='1'
-SNAPSHOT=`echo gerris-snapshot-?????? | sed 's/gerris-snapshot-//'`
-NEWDIR="gerris-0.9.2+darcs$SNAPSHOT-dfsg.$DFSG"
-NEWNAME=`echo $NEWDIR | sed s/-/_/`
-
-rm -rf "gerris-snapshot-$SNAPSHOT/modules/"
-mv "gerris-snapshot-$SNAPSHOT" "$NEWDIR"
-
-updatefile() {
-	FILE="$1"
-	SED="$2"
-	TOUCH=`mktemp`
-	cp -p "$NEWDIR/$FILE" "$TOUCH"
-	sed $SED "$TOUCH" > "$NEWDIR/$FILE"
-	touch -r "$TOUCH" "$NEWDIR/$FILE"
-	rm "$TOUCH"
-}
-
-updatefile 'configure' 's/modules.*test/test/'
-updatefile 'configure.in' 's/modules.*Makefile$//'
-updatefile 'Makefile.am' 's/modules//'
-updatefile 'Makefile.in' 's/modules//'
-
-# tar+gzip
-
-touch -r "gerris-snapshot.tar.gz" "$NEWDIR"
-tar -cf "$NEWNAME.orig.tar" "$NEWDIR"
-gzip -9fn "$NEWNAME.orig.tar"
-rm -fr "$NEWDIR" "gerris-snapshot.tar.gz"
diff --git a/debian/rules b/debian/rules
index 4bf6c3e..f7c42c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,39 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# gerris debian/rules using debhelper. Adapted from dh_make v0.50.
+#
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
 
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-mpi
+# it's not appropriate to run all the tests in the test subdir as part of 
+# the build process, since they assume gerris is already installed,
+# calling gfsview-batch2D, etc.  So invoke nocheck (relevant to dh_auto_test)
+export DEB_BUILD_OPTIONS=nocheck
 
-DEB_DH_INSTALL_ARGS = --list-missing 
+# uses generic debhelper build
+%:
+	dh --with quilt  $@
 
-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
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-mpi
 
-binary-post-install/gerris ::
-	rm -f debian/gerris/usr/bin/gfs2doc
-	rm -f debian/gerris/usr/bin/darcs2dist
+# some autogenerated files get left behind by upstream autotools clean
+# so remove them here
+override_dh_auto_clean:
+	dh_auto_clean
+	-rm doc/examples/gerris.dic
+	-rm doc/examples/gfs.lang
+	-rm src/modules.c
+	-rm src/modules.h
 
-# @@ only works from source directory, see #494141
-.PHONY: get-orig-source
+# don't need to install darcs2dist or gfs2doc
+# see bug#436240 for my opinion on the sensibleness of this
+override_dh_install:
+	dh_install --exclude=darcs2dist --exclude=gfs2doc
+
+override_dh_strip:
+	dh_strip --dbg-package=libgfs-dbg
 
-get-orig-source:
-	dh_testdir
-	sh debian/get-orig-source.sh

-- 
Gerris Flow Solver