This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 3b3b1c703d230121170bde53871125464046b085
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Aug 27 05:07:35 2015 +0200
deduplicate.sh: unstub fixup section.
---
debian/changelog | 1 +
deduplicate.sh | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 56c10e1..2a98224 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -132,6 +132,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
the replacement array.
- deduplicate.sh: add more useful information in fixup section's error
message.
+ - deduplicate.sh: unstub fixup section.
[ Bernard Cafarelli ]
* New upstream version (4.0.5.3):
diff --git a/deduplicate.sh b/deduplicate.sh
index 7dc6cd0..08f13df 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -159,8 +159,10 @@ for all_entry in "${all_files[@]}"; do
typeset duplicate_entry="${duplicates[${i}]}"
typeset duplicate_filename="$(basename
"${duplicate_entry}")"
- if [ -n "${dependencies_filename}" ] && [ -n
"${duplicate_filename}"]; then
-
+ if [ -n "${dependencies_filename}" ] && [ -n
"${duplicate_filename}" ]; then
+ if [ "${dependencies_filename}" =
"${duplicate_filename}" ]; then
+ echo "install_name_tool -change
\"${line}\" \"${to_files[${i}]}\""
+ fi
else
echo "ERROR: empty file name while
replacing duplicate dependencies." >&2
echo "ERROR: for file ${all_entry}" >&2
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
