[gfsview] 04/07: Update patch.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository gfsview.

commit 255b083cd952d1c98c6c68b3c9f0b79c10a38a1b
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Aug 8 19:56:45 2014 +0200

    Update patch.
---
 debian/patches/02_use_system_gl2ps.patch | 36 +++++++-------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

diff --git a/debian/patches/02_use_system_gl2ps.patch b/debian/patches/02_use_system_gl2ps.patch
index c6387a9..02c99c4 100644
--- a/debian/patches/02_use_system_gl2ps.patch
+++ b/debian/patches/02_use_system_gl2ps.patch
@@ -1,6 +1,6 @@
 Description: use packaged gl2ps instead of embedded.
 Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-08-05
+Last-Update: 2014-05-08
 
 Index: gfsview-snapshot-121130/Makefile.am
 ===================================================================
@@ -24,12 +24,12 @@ Index: gfsview-snapshot-121130/batch/Makefile.am
 ===================================================================
 --- gfsview-snapshot-121130.orig/batch/Makefile.am
 +++ gfsview-snapshot-121130/batch/Makefile.am
-@@ -10,28 +10,26 @@ noinst_LTLIBRARIES = librender2D.la libr
+@@ -10,17 +10,15 @@ noinst_LTLIBRARIES = librender2D.la libr
  
  librender2D_la_SOURCES = render.c render.h
  librender2D_la_CFLAGS = @GERRIS2D_CFLAGS@ @OSMESA_CFLAGS@
 -librender2D_la_LIBADD = -L$(top_builddir)/gl2ps -lgl2ps \
-+librender2D_la_LIBADD = -lgl2ps -lgfs2D\
++librender2D_la_LIBADD = -lgl2ps \
                          -L$(top_builddir)/gl -lgfsgl2D \
                          @OSMESA_LIBS@
 -librender2D_la_DEPENDENCIES = $(top_builddir)/gl2ps/libgl2ps.la $(top_builddir)/gl/libgfsgl2D.la
@@ -37,26 +37,13 @@ Index: gfsview-snapshot-121130/batch/Makefile.am
  librender3D_la_SOURCES = render.c render.h
  librender3D_la_CFLAGS = @GERRIS3D_CFLAGS@ @OSMESA_CFLAGS@
 -librender3D_la_LIBADD = -L$(top_builddir)/gl2ps -lgl2ps \
-+librender3D_la_LIBADD = -lgl2ps -lgfs3D\
++librender3D_la_LIBADD = -lgl2ps \
                          -L$(top_builddir)/gl -lgfsgl3D \
                          @OSMESA_LIBS@
 -librender3D_la_DEPENDENCIES = $(top_builddir)/gl2ps/libgl2ps.la $(top_builddir)/gl/libgfsgl3D.la
  
  bin_PROGRAMS = gfsview-batch2D gfsview-batch3D
  
- gfsview_batch2D_SOURCES = gfsview-batch.c
- gfsview_batch2D_CFLAGS = @GERRIS2D_CFLAGS@
--gfsview_batch2D_LDADD = -lrender2D
-+gfsview_batch2D_LDADD = -lrender2D -lgfs2D -lgts -lglib-2.0 -lgfsgl2D
- gfsview_batch2D_DEPENDENCIES = librender2D.la
- 
- gfsview_batch3D_SOURCES = gfsview-batch.c
- gfsview_batch3D_CFLAGS = @GERRIS3D_CFLAGS@
--gfsview_batch3D_LDADD = -lrender3D
-+gfsview_batch3D_LDADD = -lrender3D -lgfs3D -lgts -lglib-2.0 -lgfsgl3D -lgfs2D
- gfsview_batch3D_DEPENDENCIES = librender3D.la
- 
- pkglib_LTLIBRARIES = \
 Index: gfsview-snapshot-121130/gl/gfsgl.h
 ===================================================================
 --- gfsview-snapshot-121130.orig/gl/gfsgl.h
@@ -85,7 +72,7 @@ Index: gfsview-snapshot-121130/view/Makefile.am
  gfsview2D_SOURCES = $(SRC) gfkgl2D.h
  gfsview2D_CFLAGS = @SN_CFLAGS@ @GTK_CFLAGS@ @GERRIS2D_CFLAGS@
 -gfsview2D_LDADD = -L$(top_builddir)/gl2ps -lgl2ps \
-+gfsview2D_LDADD = -lgl2ps -lgfs2D\
++gfsview2D_LDADD = -lgl2ps \
                    -L$(top_builddir)/gl -lgfsgl2D \
  	          @SN_LIBS@ @GTK_LIBS@ @GERRIS2D_LIBS@
 -gfsview2D_DEPENDENCIES = $(top_builddir)/gl2ps/libgl2ps.la $(top_builddir)/gl/libgfsgl2D.la
@@ -93,7 +80,7 @@ Index: gfsview-snapshot-121130/view/Makefile.am
  gfsview3D_SOURCES = $(SRC) gfkgl3D.h
  gfsview3D_CFLAGS = @SN_CFLAGS@ @GTK_CFLAGS@ @GERRIS3D_CFLAGS@
 -gfsview3D_LDADD = -L$(top_builddir)/gl2ps -lgl2ps \
-+gfsview3D_LDADD = -lgl2ps -lgfs3D\
++gfsview3D_LDADD = -lgl2ps \
                    -L$(top_builddir)/gl -lgfsgl3D \
                    @SN_LIBS@ @GTK_LIBS@ @GERRIS3D_LIBS@
 -gfsview3D_DEPENDENCIES = $(top_builddir)/gl2ps/libgl2ps.la $(top_builddir)/gl/libgfsgl3D.la
@@ -104,16 +91,7 @@ Index: gfsview-snapshot-121130/configure.ac
 ===================================================================
 --- gfsview-snapshot-121130.orig/configure.ac
 +++ gfsview-snapshot-121130/configure.ac
-@@ -56,8 +56,6 @@ if test x$GCC = xyes ; then
- fi
- 
- GERRIS_VERSION="1.2.0"
--PKG_CHECK_MODULES(GERRIS2D,  [gerris2D  >= $GERRIS_VERSION])
--PKG_CHECK_MODULES(GERRIS3D,  [gerris3D  >= $GERRIS_VERSION])
- PKG_CHECK_MODULES(OSMESA, [ osmesa ], [ have_osmesa=yes ], [ have_osmesa=no ])
- 
- dnl alternative check for systems without pkg-config for OSMesa
-@@ -138,7 +136,6 @@ AC_OUTPUT([
+@@ -138,7 +138,6 @@ AC_OUTPUT([
  Makefile
  view/Makefile
  view/desktop/Makefile

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gfsview.git