[glpk] 03/05: obtain-iodbc-cflags.patch: remove patch, applied upstream.

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 9588fb046bdc1ce82c956d746b947a8d1bf183f6
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Apr 1 19:37:04 2014 +0200

    obtain-iodbc-cflags.patch: remove patch, applied upstream.
---
 debian/patches/obtain-iodbc-cflags.patch | 20 --------------------
 debian/patches/series                    |  1 -
 2 files changed, 21 deletions(-)

diff --git a/debian/patches/obtain-iodbc-cflags.patch b/debian/patches/obtain-iodbc-cflags.patch
deleted file mode 100644
index 43773a6..0000000
--- a/debian/patches/obtain-iodbc-cflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Inject compilation flags from iodbc-config
- This has become necessary because iodbc includes are now in a custom
- directory, so we have to retrieve the right -I flag.
-Author: Maximiliano Curia <maxy at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740067
-Forwarded: on 2014-03-26 to the bug-glpk at gnu.org list, <1395840251.11912.29.camel at rama.villemot.name>
-Reviewed-by: Sébastien Villemot <sebastien at debian.org>
-Last-Update: 2014-03-26
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure.ac
-+++ b/configure.ac
-@@ -117,6 +117,7 @@ if test "$enable_odbc" = "yes"; then
-       AC_MSG_ERROR([--enable-odbc requires --enable-dl])
-    fi
-    AC_MSG_RESULT([yes])
-+   CFLAGS="$(iodbc-config --cflags) $CFLAGS"
-    AC_DEFINE_UNQUOTED([ODBC_DLNAME], ["$LIBIODBC"], [N/A])
- elif test "$enable_odbc" = "unix"; then
-    if test "$enable_dl" = "no"; then
diff --git a/debian/patches/series b/debian/patches/series
index c7a7d9a..ead3db0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 no-embedded-zlib.patch
 no-embedded-suitesparse.patch
-obtain-iodbc-cflags.patch

-- 
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