[gerris] 06/13: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Thu Jul 31 22:49:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gerris.
commit 4180f069b6cc0b402d3f8c29ebff37a2c5531508
Author: Anton Gladky <gladk at debian.org>
Date: Thu Jul 31 23:04:20 2014 +0200
Refresh patches.
---
debian/patches/01_automake_doc_examples | 24 +++++++-------
debian/patches/02_fix_makefiles.patch | 57 +++++++++++++++------------------
2 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/debian/patches/01_automake_doc_examples b/debian/patches/01_automake_doc_examples
index f489ba1..8cf7d6b 100644
--- a/debian/patches/01_automake_doc_examples
+++ b/debian/patches/01_automake_doc_examples
@@ -1,9 +1,9 @@
-Index: gerris/doc/examples/Makefile.am
+Index: gerris-snapshot-131206/doc/examples/Makefile.am
===================================================================
---- gerris.orig/doc/examples/Makefile.am 2011-04-06 16:12:06.000000000 +1000
-+++ gerris/doc/examples/Makefile.am 2011-04-07 10:45:21.000000000 +1000
-@@ -50,7 +50,7 @@
- pkgdata_DATA = gfs.lang gerris.dic gfs-keywords.el gfs-mode.el gfs.sty gfs.hva kaltura.sh gfs.php
+--- gerris-snapshot-131206.orig/doc/examples/Makefile.am
++++ gerris-snapshot-131206/doc/examples/Makefile.am
+@@ -27,7 +27,7 @@ CLEANFILES = $(BUILT_SOURCES) Makefile.d
+ pkgdata_DATA = gfs2tex.py gfs.lang gerris.dic gfs-keywords.el gfs-mode.el gfs.sty gfs.hva kaltura.sh gfs.php
gerris.dic: classes modulesyms.sh $(top_srcdir)/modules/Makefile.am modules.list
- ($(srcdir)/classes && sh $(srcdir)/modulesyms.sh $(top_srcdir)/modules $(pkglibdir)) | sort > gerris.dic
@@ -11,7 +11,7 @@ Index: gerris/doc/examples/Makefile.am
gfs.lang: gerris.dic
echo "# Language file for source-highlight" > gfs.lang
-@@ -61,7 +61,7 @@
+@@ -38,7 +38,7 @@ gfs.lang: gerris.dic
echo "redef preproc = \"C preprocessor command is not compatible with the use of # as comment character in GTS\"" >> gfs.lang
modules.list: modules $(top_srcdir)/modules/Makefile.am
@@ -20,7 +20,7 @@ Index: gerris/doc/examples/Makefile.am
gfs-keywords.el: gerris.dic modules.list
echo "(defvar gfs-abbrevs '(" > gfs-keywords.el
-@@ -75,7 +75,7 @@
+@@ -52,7 +52,7 @@ gfs-keywords.el: gerris.dic modules.list
echo "(provide 'gfs-keywords)" >> gfs-keywords.el
gfs.php: gerris.dic modules.list gfs.php.sh
@@ -29,7 +29,7 @@ Index: gerris/doc/examples/Makefile.am
gfs2doc: gfs2doc.in
-@@ -134,13 +134,15 @@
+@@ -120,13 +120,15 @@ INCLUDES = -I$(top_srcdir)/src -I$(inclu
noinst_PROGRAMS = classes modules
@@ -52,11 +52,11 @@ Index: gerris/doc/examples/Makefile.am
publish: examples.tar.gz
cp examples.tar.gz $(WEBROOT)/examples
-Index: gerris/doc/Makefile.am
+Index: gerris-snapshot-131206/doc/Makefile.am
===================================================================
---- gerris.orig/doc/Makefile.am 2011-04-07 10:41:48.000000000 +1000
-+++ gerris/doc/Makefile.am 2011-04-07 10:42:09.000000000 +1000
-@@ -11,9 +11,10 @@
+--- gerris-snapshot-131206.orig/doc/Makefile.am
++++ gerris-snapshot-131206/doc/Makefile.am
+@@ -9,9 +9,10 @@ noinst_PROGRAMS = autoclass
INCLUDES = -I$(top_srcdir)/src -I$(includedir) -DG_LOG_DOMAIN=\"Gfs-tools\"\
$(GTS_CFLAGS)
diff --git a/debian/patches/02_fix_makefiles.patch b/debian/patches/02_fix_makefiles.patch
index 4454499..cba4106 100644
--- a/debian/patches/02_fix_makefiles.patch
+++ b/debian/patches/02_fix_makefiles.patch
@@ -1,9 +1,11 @@
Description: fix FTBFS in makefiles
Author: Drew Parsons <dparsons at debian.org>
---- gerris-20110329-dfsg.2.orig/doc/Makefile.in
-+++ gerris-20110329-dfsg.2/doc/Makefile.in
-@@ -49,9 +49,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
+Index: gerris-snapshot-131206/doc/Makefile.in
+===================================================================
+--- gerris-snapshot-131206.orig/doc/Makefile.in
++++ gerris-snapshot-131206/doc/Makefile.in
+@@ -64,9 +64,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
@@ -21,7 +23,7 @@ Author: Drew Parsons <dparsons at debian.org>
DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -65,8 +70,8 @@ CCLD = $(CC)
+@@ -80,8 +85,8 @@ CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -32,7 +34,7 @@ Author: Drew Parsons <dparsons at debian.org>
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
install-dvi-recursive install-exec-recursive \
-@@ -266,6 +271,10 @@ EXTRA_DIST = figures share doxy.conf
+@@ -285,6 +290,10 @@ EXTRA_DIST = figures share doxy.conf ger
INCLUDES = -I$(top_srcdir)/src -I$(includedir) -DG_LOG_DOMAIN=\"Gfs-tools\"\
$(GTS_CFLAGS)
@@ -43,7 +45,7 @@ Author: Drew Parsons <dparsons at debian.org>
all: all-recursive
.SUFFIXES:
-@@ -309,6 +318,9 @@ clean-noinstPROGRAMS:
+@@ -328,6 +337,9 @@ clean-noinstPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
@@ -53,7 +55,7 @@ Author: Drew Parsons <dparsons at debian.org>
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-@@ -316,7 +328,8 @@ mostlyclean-compile:
+@@ -335,7 +347,8 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -63,7 +65,7 @@ Author: Drew Parsons <dparsons at debian.org>
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -339,6 +352,34 @@ distclean-compile:
+@@ -358,6 +371,34 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -98,7 +100,7 @@ Author: Drew Parsons <dparsons at debian.org>
mostlyclean-libtool:
-rm -f *.lo
-@@ -658,10 +699,6 @@ uninstall-am:
+@@ -679,10 +720,6 @@ uninstall-am:
uninstall uninstall-am
@@ -109,9 +111,11 @@ Author: Drew Parsons <dparsons at debian.org>
reference: Makefile.am autoclass share/autoclass.sh share/doxfilter share/renamemodules doxy.conf
sh share/autoclass.sh | sort -k2,3 | ./autoclass > hierarchy.c
@chmod +x share/doxfilter
---- gerris-20110329-dfsg.2.orig/doc/examples/Makefile.in
-+++ gerris-20110329-dfsg.2/doc/examples/Makefile.in
-@@ -53,12 +53,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
+Index: gerris-snapshot-131206/doc/examples/Makefile.in
+===================================================================
+--- gerris-snapshot-131206.orig/doc/examples/Makefile.in
++++ gerris-snapshot-131206/doc/examples/Makefile.in
+@@ -68,12 +68,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gfs2doc gfs-highlight crossref.sh
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
@@ -137,18 +141,7 @@ Author: Drew Parsons <dparsons at debian.org>
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -96,8 +103,8 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
--SOURCES = classes.c modules.c
--DIST_SOURCES = classes.c modules.c
-+SOURCES = $(classes_SOURCES) $(modules_SOURCES)
-+DIST_SOURCES = $(classes_SOURCES) $(modules_SOURCES)
- DATA = $(pkgdata_DATA) $(pkglib_DATA)
- ETAGS = etags
- CTAGS = ctags
-@@ -519,6 +526,14 @@ TESTS = \
+@@ -605,6 +612,14 @@ EXAMPLES = cylinder rt boussinesq logo c
INCLUDES = -I$(top_srcdir)/src -I$(includedir) -DG_LOG_DOMAIN=\"Gfs-tools\"\
$(GTS_CFLAGS)
@@ -163,7 +156,7 @@ Author: Drew Parsons <dparsons at debian.org>
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
-@@ -569,6 +584,12 @@ clean-noinstPROGRAMS:
+@@ -656,6 +671,12 @@ clean-noinstPROGRAMS:
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
@@ -175,8 +168,8 @@ Author: Drew Parsons <dparsons at debian.org>
+ $(modules_LINK) $(modules_OBJECTS) $(modules_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-@@ -610,8 +631,9 @@ mostlyclean-compile:
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+@@ -698,8 +719,9 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@@ -188,7 +181,7 @@ Author: Drew Parsons <dparsons at debian.org>
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -634,6 +656,48 @@ distclean-compile:
+@@ -722,6 +744,48 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@@ -237,7 +230,7 @@ Author: Drew Parsons <dparsons at debian.org>
mostlyclean-libtool:
-rm -f *.lo
-@@ -1085,7 +1149,7 @@ uninstall-am: uninstall-binSCRIPTS unins
+@@ -1140,7 +1204,7 @@ uninstall-am: uninstall-binSCRIPTS unins
gerris.dic: classes modulesyms.sh $(top_srcdir)/modules/Makefile.am modules.list
@@ -246,7 +239,7 @@ Author: Drew Parsons <dparsons at debian.org>
gfs.lang: gerris.dic
echo "# Language file for source-highlight" > gfs.lang
-@@ -1096,7 +1160,7 @@ gfs.lang: gerris.dic
+@@ -1151,7 +1215,7 @@ gfs.lang: gerris.dic
echo "redef preproc = \"C preprocessor command is not compatible with the use of # as comment character in GTS\"" >> gfs.lang
modules.list: modules $(top_srcdir)/modules/Makefile.am
@@ -255,7 +248,7 @@ Author: Drew Parsons <dparsons at debian.org>
gfs-keywords.el: gerris.dic modules.list
echo "(defvar gfs-abbrevs '(" > gfs-keywords.el
-@@ -1110,7 +1174,7 @@ gfs-keywords.el: gerris.dic modules.list
+@@ -1165,7 +1229,7 @@ gfs-keywords.el: gerris.dic modules.list
echo "(provide 'gfs-keywords)" >> gfs-keywords.el
gfs.php: gerris.dic modules.list gfs.php.sh
@@ -264,7 +257,7 @@ Author: Drew Parsons <dparsons at debian.org>
gfs2doc: gfs2doc.in
-@@ -1303,14 +1367,6 @@ examples.tar.gz: examples.pdf examples $
+@@ -1381,14 +1445,6 @@ examples.tar.gz: examples.pdf examples $
tar czf examples.tar.gz examples $(DOCS)
rm -r -f examples
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gerris.git
More information about the debian-science-commits
mailing list