[glpk] 03/10: Refresh patches.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository glpk.

commit a2fe9760c529e94698f97dcbccd6d846be787217
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Feb 19 19:59:03 2016 +0100

    Refresh patches.
    
    Gbp-Dch: Ignore
---
 debian/patches/no-embedded-suitesparse.patch | 15 ++++++++-------
 debian/patches/no-embedded-zlib.patch        | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/patches/no-embedded-suitesparse.patch b/debian/patches/no-embedded-suitesparse.patch
index 88ac101..bc48c0f 100644
--- a/debian/patches/no-embedded-suitesparse.patch
+++ b/debian/patches/no-embedded-suitesparse.patch
@@ -6,7 +6,7 @@ Last-Update: 2013-06-25
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/configure.ac
 +++ b/configure.ac
-@@ -143,6 +143,12 @@ fi
+@@ -158,6 +158,12 @@ AC_SUBST([NOUNDEFINED])
  
  AC_CHECK_LIB([z], [gzopen])
  
@@ -21,18 +21,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  AC_OUTPUT
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -6,10 +6,8 @@ lib_LTLIBRARIES = libglpk.la
+@@ -6,11 +6,9 @@ lib_LTLIBRARIES = libglpk.la
  
  libglpk_la_CPPFLAGS = \
  -I$(srcdir) \
 --I$(srcdir)/amd \
+ -I$(srcdir)/api \
  -I$(srcdir)/bflib \
  -I$(srcdir)/cglib \
 --I$(srcdir)/colamd \
  -I$(srcdir)/env \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
-@@ -89,18 +87,6 @@ glpsql.c \
+@@ -72,18 +70,6 @@ glpsql.c \
  glpssx01.c \
  glpssx02.c \
  lux.c \
@@ -48,10 +49,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -amd/amd_postorder.c \
 -amd/amd_preprocess.c \
 -amd/amd_valid.c \
- bflib/btf.c \
- bflib/btfint.c \
- bflib/fhv.c \
-@@ -114,7 +100,6 @@ bflib/sgf.c \
+ api/advbas.c \
+ api/asnhall.c \
+ api/asnlp.c \
+@@ -147,7 +133,6 @@ bflib/sgf.c \
  bflib/sva.c \
  cglib/cfg.c \
  cglib/cfg1.c \
diff --git a/debian/patches/no-embedded-zlib.patch b/debian/patches/no-embedded-zlib.patch
index 542fd73..1431d38 100644
--- a/debian/patches/no-embedded-zlib.patch
+++ b/debian/patches/no-embedded-zlib.patch
@@ -6,7 +6,7 @@ Last-Update: 2013-06-25
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -14,8 +14,7 @@ libglpk_la_CPPFLAGS = \
+@@ -15,8 +15,7 @@ libglpk_la_CPPFLAGS = \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
  -I$(srcdir)/proxy \
@@ -15,8 +15,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +-I$(srcdir)/simplex
  
  libglpk_la_LDFLAGS = \
- -version-info 38:0:2 \
-@@ -158,21 +157,6 @@ simplex/spxprim.c \
+ -version-info 39:0:0 \
+@@ -194,21 +193,6 @@ simplex/spxprim.c \
  simplex/spxprob.c \
  simplex/spychuzc.c \
  simplex/spychuzr.c \
@@ -41,9 +41,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  ## eof ##
 --- a/configure.ac
 +++ b/configure.ac
-@@ -141,6 +141,8 @@ else
-    AC_MSG_RESULT([no])
- fi
+@@ -156,6 +156,8 @@ case "${host}" in
+ esac
+ AC_SUBST([NOUNDEFINED])
  
 +AC_CHECK_LIB([z], [gzopen])
 +

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