[coinutils] 05/08: Refresh/remove patches.

[Anton Gladky]

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

gladk pushed a commit to branch experimental
in repository coinutils.

commit 3cddbde37f2ecc89879dc143ba3fcb68e495a0ae
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Jun 1 22:18:05 2017 +0200

    Refresh/remove patches.
---
 debian/patches/fix-addlibs-file.patch    | 14 --------------
 debian/patches/format-security-fix.patch |  8 +++++---
 debian/patches/series                    |  1 -
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/debian/patches/fix-addlibs-file.patch b/debian/patches/fix-addlibs-file.patch
deleted file mode 100644
index c4dc8a1..0000000
--- a/debian/patches/fix-addlibs-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Miles Lubin <miles.lubin at gmail.com>
-Description: Fix production of coinutils_addlibs.txt file.
-Bug: https://projects.coin-or.org/BuildTools/ticket/104 
---- a/CoinUtils/Makefile.in
-+++ b/CoinUtils/Makefile.in
-@@ -832,7 +832,7 @@
- 
- install-data-hook:
- 	@$(mkdir_p) "$(addlibsdir)"
-- at COIN_HAS_PKGCONFIG_TRUE@	PKG_CONFIG_PATH="@COIN_PKG_CONFIG_PATH@" \
-+ at COIN_HAS_PKGCONFIG_TRUE@	PKG_CONFIG_PATH=$(DESTDIR)$(pkgconfiglibdir) \
- @COIN_HAS_PKGCONFIG_TRUE@	"$(PKG_CONFIG)" --libs coinutils > $(addlibsdir)/coinutils_addlibs.txt
- @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@	echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCoinUtils.lib @COINUTILSLIB_LIBS_INSTALLED@" > $(addlibsdir)/coinutils_addlibs.txt
- @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@	echo -L at abs_lib_dir@ -lCoinUtils @COINUTILSLIB_LIBS_INSTALLED@ > $(addlibsdir)/coinutils_addlibs.txt
diff --git a/debian/patches/format-security-fix.patch b/debian/patches/format-security-fix.patch
index b3cf584..8ef4ebe 100644
--- a/debian/patches/format-security-fix.patch
+++ b/debian/patches/format-security-fix.patch
@@ -1,9 +1,11 @@
 Description: Fix format security error.
 Forwarded: https://projects.coin-or.org/CoinUtils/ticket/80
 Author: Miles Lubin <miles.lubin at gmail.com>
---- a/CoinUtils/src/CoinMessageHandler.cpp
-+++ b/CoinUtils/src/CoinMessageHandler.cpp
-@@ -820,7 +820,7 @@
+Index: CoinUtils-2.10.13/CoinUtils/src/CoinMessageHandler.cpp
+===================================================================
+--- CoinUtils-2.10.13.orig/CoinUtils/src/CoinMessageHandler.cpp
++++ CoinUtils-2.10.13/CoinUtils/src/CoinMessageHandler.cpp
+@@ -831,7 +831,7 @@ CoinMessageHandler::operator<< (double d
  	  sprintf(messageOut_,g_format_,doublevalue);
  	  if (next != format_+2) {
  	    messageOut_+=strlen(messageOut_);
diff --git a/debian/patches/series b/debian/patches/series
index d575889..5c24f68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 format-security-fix.patch
-fix-addlibs-file.patch

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