[SCM] GNU libmatheval branch, master, updated. debian/1.1.7-2-15-g7c03a61

[Julian Taylor]

The following commit has been merged in the master branch:
commit d413dcc01c5697a26af96947a9bcb63c9c9a8818
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Wed Nov 23 19:52:50 2011 +0100

    refresh 0001-link-with-fl_pic.patch

diff --git a/debian/changelog b/debian/changelog
index 4059b69..248a5f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ libmatheval (1.1.8-1) unstable; urgency=low
   * update dates in debian/copyright
   * drop upstream applied
     0002-add-internal-lib-dependencies-to-pkg-config-file.patch 
+  * refresh 0001-link-with-fl_pic.patch
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 23 Nov 2011 19:44:20 +0100
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 23 Nov 2011 19:52:35 +0100
 
 libmatheval (1.1.7-3) unstable; urgency=low
 
diff --git a/debian/patches/0001-link-with-fl_pic.patch b/debian/patches/0001-link-with-fl_pic.patch
index bfefa6d..157866c 100644
--- a/debian/patches/0001-link-with-fl_pic.patch
+++ b/debian/patches/0001-link-with-fl_pic.patch
@@ -11,11 +11,9 @@ with gcc 4.1. (Closes: #384957)
  lib/Makefile.in |    2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index d91f0f2..0631642 100644
 --- a/lib/Makefile.am
 +++ b/lib/Makefile.am
-@@ -29,7 +29,7 @@ libmatheval_la_SOURCES = parser.y scanner.l error.c matheval.c	\
+@@ -29,7 +29,7 @@
  g77_interface.c node.c symbol_table.c xmalloc.c xmath.c
  
  libmatheval_la_LDFLAGS = -version-info 1:0:0
@@ -24,11 +22,9 @@ index d91f0f2..0631642 100644
  
  include_HEADERS = matheval.h
  noinst_HEADERS = common.h error.h node.h symbol_table.h xmalloc.h	\
-diff --git a/lib/Makefile.in b/lib/Makefile.in
-index fa337cc..011ee99 100644
 --- a/lib/Makefile.in
 +++ b/lib/Makefile.in
-@@ -226,7 +226,7 @@ libmatheval_la_SOURCES = parser.y scanner.l error.c matheval.c	\
+@@ -258,7 +258,7 @@
  g77_interface.c node.c symbol_table.c xmalloc.c xmath.c
  
  libmatheval_la_LDFLAGS = -version-info 1:0:0
@@ -37,6 +33,3 @@ index fa337cc..011ee99 100644
  include_HEADERS = matheval.h
  noinst_HEADERS = common.h error.h node.h symbol_table.h xmalloc.h	\
  xmath.h
--- 
-1.7.0.4
-

-- 
GNU libmatheval