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

[Drew Parsons]

The following commit has been merged in the debian-unstable branch:
commit dce4f543d0d402ddb4b5e01f67534ccc7c5cab96
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 28 11:26:13 2009 +1100

    mention quilt in README.source
    
    lintian wants the use of quilt to be documented in a
    debian/README.source file.  Rename README.Debian-source for this
    purpose.
    
    README.Debian-source referred to get-orig-source.sh for upstream
    source tarball handling.  I don't use that method myself, but restore
    it in case its useful to someone else.

diff --git a/debian/README.Debian-source b/debian/README.Debian-source
deleted file mode 100644
index 1519d12..0000000
--- a/debian/README.Debian-source
+++ /dev/null
@@ -1,24 +0,0 @@
-README.Debian-source for gerris
-===============================
-
-The download from upstream is a snapshot tarball which contains two 
-external modules:
-- RStarTree, without copyrigth/license info.
-- fes2004, from Thierry LETELLIER, licensed under GPL, but including 
-  some functions from Aktarus library (from Thierry LETELLIER and 
-  Laurent ROBLOU). The Aktarus functions include some GPL-incompatible 
-  restrictions.
-
-This external modules aren't essential to gerris and was removed from 
-the Debian sources.
-
-The debian/get-orig-source.sh script downloads the upstream source, and 
-creates the gerris_$VERSION.orig.tar.gz used as Debian source file. The 
-script does the following:
-- download the latest upstream tarball
-- unpack the tarball
-- remove modules/
-- update configure, configure.in, Makefile.in, and Makefile.am, 
-  removing references to modules/ (preserving timestamps).
-- rename sources dir and set timestamps from upstream tarball
-- tar and gzip the result
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..d156315
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,42 @@
+README.source for gerris in Debian
+==================================
+
+The download from upstream is a snapshot tarball which contains two 
+external modules:
+- RStarTree, without copyrigth/license info.
+- fes2004, from Thierry LETELLIER, licensed under GPL, but including 
+  some functions from Aktarus library (from Thierry LETELLIER and 
+  Laurent ROBLOU). The Aktarus functions include some GPL-incompatible 
+  restrictions.
+
+This external modules aren't essential to gerris and was removed from 
+the Debian sources.
+
+The debian/get-orig-source.sh script downloads the upstream source, and 
+creates the gerris_$VERSION.orig.tar.gz used as Debian source file. The 
+script does the following:
+- download the latest upstream tarball
+- unpack the tarball
+- remove modules/
+- update configure, configure.in, Makefile.in, and Makefile.am, 
+  removing references to modules/ (preserving timestamps).
+- rename sources dir and set timestamps from upstream tarball
+- tar and gzip the result
+
+
+===================================
+The debian packaging uses quilt in a debhelper (dh) environment to maintain 
+material patches from the upstream source.  See /usr/share/doc/quilt/README.source 
+for more details on quilt usage.
+
+Some patches affect upstream automake scripts (Makefile.am).  To regenerate 
+derived configure and Makefile scripts, use the following steps (or 
+similar) from the top-level directory (above the debian subdir):
+	dh_quilt_patch
+	autoreconf
+	dh_quilt_unpatch
+
+When manipulating patches (editing or adding new quilt patches) after 
+running dh_quilt_patch, make sure QUILT_PATCHES is set to 
+debian/patches: "QUILT_PATCHES=debian/patches quilt new <patch>" (etc).
+
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
new file mode 100644
index 0000000..2b5e7fa
--- /dev/null
+++ b/debian/get-orig-source.sh
@@ -0,0 +1,34 @@
+#!/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"

-- 
Gerris Flow Solver