[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 6778c2a96585aaf683f746cbda5ac68278eb1077
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 28 12:46:02 2009 +1100

    update doc/examples patch to handle Makefile.deps
    
    uses depend.py, need to know that's in $(srcdir).
    
    Could make similar edits for doc/tutorial, test, but leave that until
    they're actually used.

diff --git a/debian/README.source b/debian/README.source
index d156315..883413a 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -38,5 +38,6 @@ similar) from the top-level directory (above the debian subdir):
 
 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).
+debian/patches: "QUILT_PATCHES=debian/patches quilt new <patch>",
+"QUILT_PATCHES=debian/patches quilt refresh", etc.
 
diff --git a/debian/patches/01_automake_doc_examples b/debian/patches/01_automake_doc_examples
index 9598446..f59a6ae 100644
--- a/debian/patches/01_automake_doc_examples
+++ b/debian/patches/01_automake_doc_examples
@@ -1,7 +1,7 @@
 Index: gerris/doc/examples/Makefile.am
 ===================================================================
---- gerris.orig/doc/examples/Makefile.am	2009-12-28 00:49:28.000000000 +1100
-+++ gerris/doc/examples/Makefile.am	2009-12-28 00:51:05.000000000 +1100
+--- gerris.orig/doc/examples/Makefile.am	2009-12-28 01:02:17.000000000 +1100
++++ gerris/doc/examples/Makefile.am	2009-12-28 12:21:03.000000000 +1100
 @@ -40,10 +40,10 @@
  pkgdata_DATA = gfs.lang gerris.dic
  
@@ -15,6 +15,15 @@ Index: gerris/doc/examples/Makefile.am
  
  gfs2doc: gfs2doc.in
  
+@@ -87,7 +87,7 @@
+ 	sed "s/GFS_VERSION/`$(top_srcdir)/src/gerris2D -V 2>&1 | awk '{ if ($$5 == "version") print $$6}'`/g" < template.tex | sed 's/\\today/'"`date +\"%B %e, %Y\"`/g" > examples.tex
+ 
+ Makefile.deps: Makefile depend.py
+-	python depend.py $(EXAMPLES) > Makefile.deps
++	python $(srcdir)/depend.py $(EXAMPLES) > Makefile.deps
+ 
+ -include Makefile.deps
+ 
 @@ -99,6 +99,8 @@
  
  noinst_PROGRAMS = classes
diff --git a/doc/examples/Makefile.in b/doc/examples/Makefile.in
index dd7e4a4..8782150 100644
--- a/doc/examples/Makefile.in
+++ b/doc/examples/Makefile.in
@@ -830,7 +830,7 @@ examples.tex: template.tex Makefile.deps gfs2tex gfs2tex.py
 	sed "s/GFS_VERSION/`$(top_srcdir)/src/gerris2D -V 2>&1 | awk '{ if ($$5 == "version") print $$6}'`/g" < template.tex | sed 's/\\today/'"`date +\"%B %e, %Y\"`/g" > examples.tex
 
 Makefile.deps: Makefile depend.py
-	python depend.py $(EXAMPLES) > Makefile.deps
+	python $(srcdir)/depend.py $(EXAMPLES) > Makefile.deps
 
 -include Makefile.deps
 

-- 
Gerris Flow Solver