[glpk] 05/08: Refresh patches.

Sébastien Villemot sebastien at debian.org
Wed Feb 19 17:23:51 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 8b0f98d1add0c407d758a134862104290e006826
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Feb 19 17:01:21 2014 +0100

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

diff --git a/debian/patches/no-embedded-suitesparse.patch b/debian/patches/no-embedded-suitesparse.patch
index 150dc1b..958c9e9 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 @@
+@@ -142,6 +142,12 @@ fi
  
  AC_CHECK_LIB([z], [gzopen])
  
@@ -21,7 +21,7 @@ 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 @@
+@@ -6,10 +6,8 @@ lib_LTLIBRARIES = libglpk.la
  
  libglpk_la_CPPFLAGS = \
  -I$(srcdir) \
@@ -32,10 +32,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  -I$(srcdir)/env \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
-@@ -99,18 +97,6 @@
- glpssx01.c \
+@@ -92,18 +90,6 @@ glpssx01.c \
  glpssx02.c \
  glptsp.c \
+ lux.c \
 -amd/amd_1.c \
 -amd/amd_2.c \
 -amd/amd_aat.c \
@@ -50,12 +50,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -amd/amd_valid.c \
  bflib/fhv.c \
  bflib/fhvint.c \
- bflib/luf.c \
-@@ -119,7 +105,6 @@
+ bflib/ifu.c \
+@@ -113,7 +99,6 @@ bflib/sgf.c \
  bflib/sva.c \
  cglib/cfg.c \
  cglib/cfg1.c \
 -colamd/colamd.c \
  env/alloc.c \
+ env/dlsup.c \
  env/env.c \
- env/error.c \
diff --git a/debian/patches/no-embedded-zlib.patch b/debian/patches/no-embedded-zlib.patch
index 6eb2130..ec361c5 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
-@@ -13,8 +13,7 @@
+@@ -13,8 +13,7 @@ libglpk_la_CPPFLAGS = \
  -I$(srcdir)/env \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
@@ -15,8 +15,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +-I$(srcdir)/proxy
  
  libglpk_la_LDFLAGS = \
- -version-info 36:1:0 \
-@@ -144,21 +143,6 @@
+ -version-info 37:0:1 \
+@@ -147,21 +146,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 @@
+@@ -140,6 +140,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