[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 edb45bf5bafce435fc8f155849ded78748f6c946
Author: Drew Parsons <dparsons at debian.org>
Date:   Mon Dec 28 00:57:12 2009 +1100

    patches/01_automake_doc_examples builds in separate build dir
    
    doc/examples/Makefile.am used srcdir references instead of builddirto
    build doc tools.
    
    Maintain as quilt patch since this patch should really go back upstream.

diff --git a/debian/patches/01_automake_doc_examples b/debian/patches/01_automake_doc_examples
new file mode 100644
index 0000000..9598446
--- /dev/null
+++ b/debian/patches/01_automake_doc_examples
@@ -0,0 +1,29 @@
+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
+@@ -40,10 +40,10 @@
+ pkgdata_DATA = gfs.lang gerris.dic
+ 
+ gfs.lang: classes
+-	$(srcdir)/classes > gfs.lang
++	$(builddir)/classes > gfs.lang
+ 
+ gerris.dic: classes
+-	$(srcdir)/classes | awk '$$1 ~ /gfs_keyword/ {print $$3}' | sed 's/"//g' > gerris.dic
++	$(builddir)/classes | awk '$$1 ~ /gfs_keyword/ {print $$3}' | sed 's/"//g' > gerris.dic
+ 
+ gfs2doc: gfs2doc.in
+ 
+@@ -99,6 +99,8 @@
+ 
+ noinst_PROGRAMS = classes
+ 
+-classes: classes.c $(top_srcdir)/src/init.c
+-	$(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(INCLUDES) -DFTT_2D=1 \
+-	classes.c -o classes $(GFS2D_LIBS)
++classes_SOURCES = classes.c $(top_srcdir)/src/init.c
++classes_CFLAGS = $(AM_CFLAGS) -DFTT_2D=1
++classes_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src
++classes_LDADD = $(GFS2D_LIBS)
++
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..76dd178
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_automake_doc_examples

-- 
Gerris Flow Solver