[glpk] 04/05: Refresh patches.

Sébastien Villemot sebastien at debian.org
Tue Apr 1 17:47:10 UTC 2014


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

sebastien pushed a commit to branch master
in repository glpk.

commit d794c766fefe3fd0992fb952cea52c07c475d7bf
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Apr 1 19:37:14 2014 +0200

    Refresh patches.
    
    Git-Dch: Ignore
---
 debian/patches/no-embedded-suitesparse.patch | 10 +++++-----
 debian/patches/no-embedded-zlib.patch        |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/no-embedded-suitesparse.patch b/debian/patches/no-embedded-suitesparse.patch
index 958c9e9..851b2f9 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
-@@ -142,6 +142,12 @@ fi
+@@ -143,6 +143,12 @@ fi
  
  AC_CHECK_LIB([z], [gzopen])
  
@@ -32,7 +32,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  -I$(srcdir)/env \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
-@@ -92,18 +90,6 @@ glpssx01.c \
+@@ -91,18 +89,6 @@ glpssx01.c \
  glpssx02.c \
  glptsp.c \
  lux.c \
@@ -48,10 +48,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 \
- bflib/fhvint.c \
- bflib/ifu.c \
-@@ -113,7 +99,6 @@ bflib/sgf.c \
+@@ -116,7 +102,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 ec361c5..35e6d66 100644
--- a/debian/patches/no-embedded-zlib.patch
+++ b/debian/patches/no-embedded-zlib.patch
@@ -15,8 +15,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +-I$(srcdir)/proxy
  
  libglpk_la_LDFLAGS = \
- -version-info 37:0:1 \
-@@ -147,21 +146,6 @@ misc/triang.c \
+ -version-info 37:1:1 \
+@@ -150,21 +149,6 @@ misc/triang.c \
  misc/wclique.c \
  misc/wclique1.c \
  proxy/proxy.c \
@@ -41,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  ## eof ##
 --- a/configure.ac
 +++ b/configure.ac
-@@ -140,6 +140,8 @@ else
+@@ -141,6 +141,8 @@ else
     AC_MSG_RESULT([no])
  fi
  

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



More information about the debian-science-commits mailing list