[X2Go-Commits] [x2goclient] 73/217: deduplicate.sh: actually include file name in install_name_tool pseudo output.

[git-admin at x2go.org]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 6181d47be86ed613c80efc5c26753a76add2d6f6
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 2c61439..ba6f973 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -131,6 +131,8 @@ x2goclient (4.0.5.3-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.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
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