[SCM] glpk packaging branch, master, updated. debian/4.51-1-6-gb1f2259

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 5c229250b5002cc300eb38965ba39e19487c3f90
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jul 26 20:57:37 2013 +0200

    New upstream release
    
    Refresh patches; update manpage of glpsol accordingly

diff --git a/debian/changelog b/debian/changelog
index 3640b65..8ea4e80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glpk (4.52.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Sébastien Villemot <sebastien at debian.org>  Fri, 26 Jul 2013 20:57:14 +0200
+
 glpk (4.51-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/glpsol.1 b/debian/glpsol.1
index e3cf34e..b600dbf 100644
--- a/debian/glpsol.1
+++ b/debian/glpsol.1
@@ -235,6 +235,9 @@ replace general integer variables by binary ones
 \fB\-\-fpump\fR
 apply feasibility pump heuristic
 .TP
+\fB\-\-proxy\fR [nnn]
+apply proximity search heuristic (nnn is time limit in seconds; default is 60)
+.TP
 \fB\-\-proxy\fR
 apply proximity search heuristic
 .TP
diff --git a/debian/patches/no-embedded-suitesparse.patch b/debian/patches/no-embedded-suitesparse.patch
index 1cf4457..150dc1b 100644
--- a/debian/patches/no-embedded-suitesparse.patch
+++ b/debian/patches/no-embedded-suitesparse.patch
@@ -21,17 +21,18 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  AC_OUTPUT
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -6,9 +6,7 @@
+@@ -6,10 +6,8 @@
  
  libglpk_la_CPPFLAGS = \
  -I$(srcdir) \
 --I$(srcdir)/amd \
  -I$(srcdir)/bflib \
+ -I$(srcdir)/cglib \
 --I$(srcdir)/colamd \
  -I$(srcdir)/env \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
-@@ -99,25 +97,12 @@
+@@ -99,18 +97,6 @@
  glpssx01.c \
  glpssx02.c \
  glptsp.c \
@@ -50,9 +51,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  bflib/fhv.c \
  bflib/fhvint.c \
  bflib/luf.c \
- bflib/lufint.c \
- bflib/sgf.c \
+@@ -119,7 +105,6 @@
  bflib/sva.c \
+ cglib/cfg.c \
+ cglib/cfg1.c \
 -colamd/colamd.c \
  env/alloc.c \
  env/env.c \
diff --git a/debian/patches/no-embedded-zlib.patch b/debian/patches/no-embedded-zlib.patch
index ba33a84..6eb2130 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
-@@ -12,8 +12,7 @@
+@@ -13,8 +13,7 @@
  -I$(srcdir)/env \
  -I$(srcdir)/minisat \
  -I$(srcdir)/misc \
@@ -15,10 +15,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +-I$(srcdir)/proxy
  
  libglpk_la_LDFLAGS = \
- -version-info 36:0:0 \
-@@ -140,21 +139,6 @@
- misc/triang.c \
+ -version-info 36:1:0 \
+@@ -144,21 +143,6 @@
  misc/wclique.c \
+ misc/wclique1.c \
  proxy/proxy.c \
 -proxy/proxy1.c \
 -zlib/adler32.c \

-- 
glpk packaging