[SCM] glpk packaging branch, master, updated. upstream/4.51-14-g857c570

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit ebbe606c0d8497f6fdef37907983e94c90b4705b
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Jun 25 21:09:27 2013 +0200

    no-embedded-suitesparse.patch: no longer use embedded copy of AMD and COLAMD libraries from suitesparse

diff --git a/debian/changelog b/debian/changelog
index f2250d6..5e37bd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ glpk (4.51-1) UNRELEASED; urgency=low
     + SOVERSION bump, the shared library is now libglpk36
     + no-embedded-zlib.patch: new patch to ensure that we don't use the
       embedded zlib
+  * no-embedded-suitesparse.patch: no longer use embedded copy of AMD and
+    COLAMD libraries from suitesparse
   * Multi-archify the shared library package
   * Bump to debhelper compat level 9
   * Remove obsolete glpk transition package (Closes: #598786)
diff --git a/debian/control b/debian/control
index 8969a9c..c0e9e9a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.
 Uploaders: Falk Hueffner <falk at debian.org>,
            Sébastien Villemot <sebastien at debian.org>
 Build-Depends: debhelper (>= 9), cdbs (>= 0.4.93~), libgmp-dev, libltdl-dev,
- zlib1g-dev, libiodbc2-dev, libmysqlclient-dev, dh-autoreconf, dh-exec
+ zlib1g-dev, libiodbc2-dev, libmysqlclient-dev, dh-autoreconf, dh-exec,
+ libsuitesparse-dev
 Standards-Version: 3.9.4
 Homepage: http://www.gnu.org/software/glpk/glpk.html
 Vcs-Git: git://git.debian.org/git/debian-science/packages/glpk.git
@@ -55,7 +56,8 @@ Description: linear programming kit - debugging symbols
 Package: libglpk-dev
 Architecture: any
 Section: libdevel
-Depends: libglpk36 (= ${binary:Version}), ${misc:Depends}
+Depends: libglpk36 (= ${binary:Version}), ${misc:Depends}, libgmp-dev,
+ zlib1g-dev, libsuitesparse-dev
 Description: linear programming kit - development files
  GLPK (GNU Linear Programming Kit) is intended for solving large-scale
  linear programming (LP), mixed integer programming (MIP), and other
diff --git a/debian/patches/no-embedded-suitesparse.patch b/debian/patches/no-embedded-suitesparse.patch
new file mode 100644
index 0000000..1cf4457
--- /dev/null
+++ b/debian/patches/no-embedded-suitesparse.patch
@@ -0,0 +1,59 @@
+Description: Do not use embedded copy of AMD and COLAMD libraries from suitesparse
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+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 @@
+ 
+ AC_CHECK_LIB([z], [gzopen])
+ 
++AC_CHECK_LIB([amd], [amd_1])
++AC_CHECK_LIB([colamd], [colamd])
++
++CPPFLAGS="$CPPFLAGS -I/usr/include/suitesparse"
++AC_CHECK_HEADER([amd.h])
++
+ AC_CONFIG_FILES(
+    [src/Makefile examples/Makefile Makefile])
+ AC_OUTPUT
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,9 +6,7 @@
+ 
+ libglpk_la_CPPFLAGS = \
+ -I$(srcdir) \
+--I$(srcdir)/amd \
+ -I$(srcdir)/bflib \
+--I$(srcdir)/colamd \
+ -I$(srcdir)/env \
+ -I$(srcdir)/minisat \
+ -I$(srcdir)/misc \
+@@ -99,25 +97,12 @@
+ glpssx01.c \
+ glpssx02.c \
+ glptsp.c \
+-amd/amd_1.c \
+-amd/amd_2.c \
+-amd/amd_aat.c \
+-amd/amd_control.c \
+-amd/amd_defaults.c \
+-amd/amd_dump.c \
+-amd/amd_info.c \
+-amd/amd_order.c \
+-amd/amd_post_tree.c \
+-amd/amd_postorder.c \
+-amd/amd_preprocess.c \
+-amd/amd_valid.c \
+ bflib/fhv.c \
+ bflib/fhvint.c \
+ bflib/luf.c \
+ bflib/lufint.c \
+ bflib/sgf.c \
+ bflib/sva.c \
+-colamd/colamd.c \
+ env/alloc.c \
+ env/env.c \
+ env/error.c \
diff --git a/debian/patches/no-embedded-zlib.patch b/debian/patches/no-embedded-zlib.patch
index 11d8475..ba33a84 100644
--- a/debian/patches/no-embedded-zlib.patch
+++ b/debian/patches/no-embedded-zlib.patch
@@ -1,3 +1,9 @@
+Description: Do not use embedded copy of zlib
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+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 @@
diff --git a/debian/patches/series b/debian/patches/series
index 466531a..ead3db0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 no-embedded-zlib.patch
+no-embedded-suitesparse.patch

-- 
glpk packaging