[clp] 04/10: Update file, applied by upstream.

Anton Gladky gladk at moszumanska.debian.org
Sat Jun 3 20:26:42 UTC 2017


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

gladk pushed a commit to branch experimental
in repository clp.

commit 07978c66e40cc3a1529359cb55d6826d5b0df983
Author: Anton Gladky <gladk at debian.org>
Date:   Sat Jun 3 22:05:49 2017 +0200

    Update file, applied by upstream.
---
 debian/patches/fix-addlibs-file.patch | 14 --------------
 debian/patches/series                 |  1 -
 2 files changed, 15 deletions(-)

diff --git a/debian/patches/fix-addlibs-file.patch b/debian/patches/fix-addlibs-file.patch
deleted file mode 100644
index a908570..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 clp_addlibs.txt file.
-Bug: https://projects.coin-or.org/BuildTools/ticket/104
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -903,7 +903,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 clp > $(addlibsdir)/clp_addlibs.txt
- @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@	echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
- @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@	echo -L at abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3a8876a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-addlibs-file.patch

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



More information about the debian-science-commits mailing list