[X2Go-Commits] [x2goclient] 169/217: macbuild.sh: fix copying of resource files.

2016-09-20 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

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

commit ef5746509170c8ab4065759b039fd3b67c58da79
Author: Mihai Moldovan 
Date:   Sat May 7 22:55:50 2016 +0200

macbuild.sh: fix copying of resource files.
---
 debian/changelog |1 +
 macbuild.sh  |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9b4c59b..53914ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -280,6 +280,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
 - macbuild.sh: add support for copying resource files. Currently only used
   for startup.wav.
 - res: rename "sound" to "audio".
+- macbuild.sh: fix copying of resource files.
 
  -- X2Go Release Manager   Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/macbuild.sh b/macbuild.sh
index f57d43c..6e36348 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -333,7 +333,7 @@ cp -av "${NXPROXY}" "${EXE_DIR}/"
 phase "Copying misc resources"
 typeset cur_res_file
 for cur_res_file in ${RESOURCE_FILES[@]}; do
-  cp -av "res/${cur_res_file}" "${RESOURCES_DIR}/"
+  cp -av "${TOP_DIR}/res/${cur_res_file}" "${RESOURCES_DIR}/"
 done
 
 phase "Copying PulseAudio"

--
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

[X2Go-Commits] [x2goclient] 169/217: macbuild.sh: fix copying of resource files.

2016-08-27 Thread git-admin 
This is an automated email from the git hooks/post-receive script.

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

commit f56df66effd500ab14ab0cf1c181a47bf833f6f1
Author: Mihai Moldovan 
Date:   Sat May 7 22:55:50 2016 +0200

macbuild.sh: fix copying of resource files.
---
 debian/changelog |1 +
 macbuild.sh  |2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7b1b5d9..2ed5430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -313,6 +313,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
 - macbuild.sh: add support for copying resource files. Currently only used
   for startup.wav.
 - res: rename "sound" to "audio".
+- macbuild.sh: fix copying of resource files.
   * debian/control:
 - Maintainer change in package: X2Go Developers .
 - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index f57d43c..6e36348 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -333,7 +333,7 @@ cp -av "${NXPROXY}" "${EXE_DIR}/"
 phase "Copying misc resources"
 typeset cur_res_file
 for cur_res_file in ${RESOURCE_FILES[@]}; do
-  cp -av "res/${cur_res_file}" "${RESOURCES_DIR}/"
+  cp -av "${TOP_DIR}/res/${cur_res_file}" "${RESOURCES_DIR}/"
 done
 
 phase "Copying PulseAudio"

--
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