This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 6f47f519433dbdfda3abb15f068e76fa7dde3cac Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 00:16:11 2015 +0100 general: move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in: + x2goclient.pro + macbuild.sh --- debian/changelog | 2 ++ macbuild.sh | 2 +- res/{ => osxbundle}/Info.plist | 0 macdmg.DS_Store => res/osxbundle/macdmg.DS_Store | Bin 15364 -> 15364 bytes x2goclient.pro | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 93d6cab..8c167fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -201,6 +201,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Rename fixup_resources() and wrap_legacy_resources() to fixup_resource_URIs() and wrap_legacy_resource_URIs(). Update references. + - Move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update + references in x2goclient.pro and macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index ffe21ff..422a250 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -70,7 +70,7 @@ ${PKG_DMG} \ --verbosity 2 \ --mkdir "/.background" \ --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ - --copy "${TOP_DIR}/macdmg.DS_Store:/.DS_Store" \ + --copy "${TOP_DIR}/res/osxbundle/macdmg.DS_Store:/.DS_Store" \ --copy "${TOP_DIR}/LICENSE" \ --copy "${TOP_DIR}/COPYING" \ --symlink "/Applications: " \ diff --git a/res/Info.plist b/res/osxbundle/Info.plist similarity index 100% rename from res/Info.plist rename to res/osxbundle/Info.plist diff --git a/macdmg.DS_Store b/res/osxbundle/macdmg.DS_Store similarity index 100% rename from macdmg.DS_Store rename to res/osxbundle/macdmg.DS_Store diff --git a/x2goclient.pro b/x2goclient.pro index 9d5ca8a..e3ee3ce 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -201,7 +201,7 @@ ICON = $${PWD}/res/img/icons/x2go-mac.icns # Info.plist file being created in the first place. # The last command takes care of actually putting the icon in place - yet # another bug in qmake. Bummer. -QMAKE_INFO_PLIST = $${PWD}/res/Info.plist +QMAKE_INFO_PLIST = $${PWD}/res/osxbundle/Info.plist QMAKE_INFO_PLIST_OUT = $${TARGET}.app/Contents/Info.plist PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git