[X2Go-Commits] [x2goclient] 73/197: deduplicate.sh: actually include file name in install_name_tool pseudo output.
git-admin at x2go.org
git-admin at x2go.org
Thu Jun 30 23:52:54 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 0b037b93c7019a53586dfbdde0ecbfc05d5c2c68
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Aug 27 05:18:15 2015 +0200
deduplicate.sh: actually include file name in install_name_tool pseudo output.
---
debian/changelog | 2 ++
deduplicate.sh | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index ff48d00..cdd6de8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -162,6 +162,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- deduplicate.sh: unstub fixup section.
- deduplicate.sh: parse_otool_output: jump over first matching entry,
which is - hopefully - the id line.
+ - deduplicate.sh: actually include file name in install_name_tool pseudo
+ output.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index c24705d..f020b9c 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -170,7 +170,7 @@ for all_entry in "${all_files[@]}"; do
if [ -n "${dependencies_filename}" ] && [ -n "${duplicate_filename}" ]; then
if [ "${dependencies_filename}" = "${duplicate_filename}" ]; then
- echo "install_name_tool -change \"${line}\" \"${to_files[${i}]}\""
+ echo "install_name_tool -change \"${line}\" \"${to_files[${i}]}\" \"${all_entry}\""
fi
else
echo "ERROR: empty file name while replacing duplicate dependencies." >&2
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list