This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/osx in repository x2goclient. discards dbb1a42 macbuild.sh: add usage message obtainable via -h or --help. discards 1ec8142 macbuild.sh: new env var/parameter UNIVERSAL in macbuild.sh. discards a266d77 macbuild.sh: move functions to the start of the macbuild.sh script. discards 867649e macbuild.sh: define, implement and use new function 'make_boolean()'. discards 8f1ebda macbuild.sh: Remove 'function' keyword, as it's causing undefined behavior according to SUS. discards 7b0e513 macbuild.sh: app bundle and dmg file will be automatically removed when removing the client build directory. discards fc2b2d0 macbuild.sh: use sh default assignment instead of default value. discards bf12092 macbuild.sh: only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. discards f7162c8 Merge branch 'master' into feature/cleanup discards 46427fd macbuild.sh: remove unused variables. discards b5ce5b6 macbuild.sh: Use the correct client build dir: client_build. discards 29c0780 ssh{masterconnection,process}.cpp: add more debugging messages to trace mutex lock and unlock and command execution via SSH. discards 8b1d400 general: remove config_mac.sh. macbuild.sh handles this now. discards 8a2a1cf onmainwindow.cpp: Fix some QMessageBox usages. There are many more places that need fixing... discards e8b1f51 general: Add new UNUSED() macro to x2goutils.h and silence compiler warnings. Affected files: discards 97699ff x2goclient.pro: Enable -O2 in debug mode. discards 8de2160 macbuild.sh: make bundling optional (but enabled by default) via the new BUNDLE environment variable. discards 774506f macbuild.sh: fix non-functional redundancy and optical issues. discards 84a0390 macbuild.sh: also accept "FALSE" and "false" as binary values. discards 9e9eabf macbuild.sh: switch to BASH interpreter. discards e7cb70a macbuild.sh: fix TOP_DIR handling. discards 748df74 macbuild.sh: select stdlib on OS X based on the passed or default SDK value. discards 8da0744 x2goclient.pro: enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. discards 303e367 macbuild.sh: add debug mode selector via DEBUG env variable. discards 6f47f51 general: move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in: discards c636f0a sessionexplorer, sessionwidget: wrap more places in wrap_legacy_resource_URIs(). discards 5a8ddcb x2goutils: rename fixup_resources() and wrap_legacy_resources() to fixup_resource_URIs() and wrap_legacy_resource_URIs(). discards e56ade0 x2goutils: add fixup_resources() to fix "broken" resource URI's. discards 48acf77 x2goutils.cpp: actually use the correct iterator types and functions. discards a8a376f x2goutils.cpp: use constBegin() and constEnd() instead of begin/end... discards 7b5130a x2goutils.cpp: change four spaces per indentation level to two spaces. discards 981bbfa x2goutils: update copyright -- add myself. discards 6c6f012 sessionbuttons/userbuttons: add some debugging output to see what file path is being used as a pixmap (user photo/session icon.) discards 0a9a0a6 general: define wrap_legacy_resources() function and use it to wrap legacy resource locations stored in old session config files. discards 21eac48 x2goclient.pro: work around another bug in qmake and copy icon "manually". discards 96b58ef x2goclient.pro: work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. discards 8122e9f macbuild.sh: fix references of resources to access files from TOP_DIR. discards 9e00790 macbuild.sh: BUILD_DIR already includes TOP_DIR, don't specify it two times. discards 73d9710 general: move Info.plist to res/ and update reference in x2goclient.pro. discards 0f49b80 macbuild.sh: also also specify the top dir when defining the path to the generated appbundle and dmg file. discards 6548d85 macbuild.sh: use out-of-source build and do not overwrite the default shipped Makefile. discards d20c672 macbuild.sh: directly reference project file for qmake. discards 2ebfb1a macbuild.sh: specify -spec macx-g++ when using qmake. discards 6189c27 macbuild.sh: fix up previously overlooked variables deserving curly braces and quotes. discards de90014 macbuild.sh: define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET which can also be (pre-)set through the environment. discards 25e0844 macbuild.sh: define TOP_DIR variable -- set to $PWD. discards 343073a macbuild.sh: use more quoting and curly braces for referencing variables. discards ff5c53c Info.plist: whitespace fix. discards cb74623 general: move txt/ to res/text/ and update references in: discards ffb8aa9 x2goclient.pro: reference new src directory as include dir. discards 003ed1f Move discards 26161a5 general: move img/ to res/img/ and update references in: discards 823f899 src/ssh{masterconnection,process}.cpp: remove executability bit. discards 0b773a5 general: move i18n/ to res/i18n/ and update references in: discards c1c701a x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc: fix whitespace errors. discards ed6918d general: move x2go-logos/ to img/x2go-logos and update references in: discards 6480e24 nsis: make files non-executable. discards c97d645 nsis/x2goclient.nsi: don't change the icons path. discards 0f2ba2d nsis/x2goclient.nsi: fix whitespace errors. discards 200577f nsis/gpl.txt: fix formatting errors. discards 565f662 general: actually move icons/ to img/icons/ again. discards a2e0a5b general: move *.ts and *.qm files to i18n/ and update references in: discards 8b2510d general: move *.ts files back to the top directory (they are resources.) discards ae10c35 Move svg/ to img/svg/ and update references in: discards 48c481e Move png/ to img/png/ and update references in: discards 9d1e1e6 Move icons/ to img/icons/ and update references in: discards 84caf7a general: Move *.rc and *.rcc files back to top directory for now. discards 171813d x2goclient.pro: improve consistency: replace tabs with spaces, put quotes around messages, remove or add whitespace where applicable. discards a02a0d6 .gitignore: update with more temporary files. discards d7036f1 README.i18n: grammar fix. discards 0a845be README.OpenSSL-Exception: reformat content. discards e89bb3d Makefile.man2html: replace backticks with $() and change spaces to tabs. discards f1e89c0 LICENSE: add "X2Go Project" copyright. discards a2ccf85 HOWTO.GPGCARD: fix typos and grammar. discards 502594a INSTALL: fix typos and update URL's. discards 8b413f1 x2goclient.pro: remove executability. discards 826860c general: move x2goplugin.rc to x2gobrowserplugin-*/src/res/ and reference in x2goclient.pro. discards 503db1b general: rename qtbrowserplugin-<ver>-opensource to x2gobrowserplugin-<ver> and reference in x2goclient.pro. discards beb72f8 Makefile: rename SRC_DIR to TOP_DIR. discards a530e16 general: reference changes in shipped Makefile. discards 34bc8c0 general: move resource files to src/res/ and reference in x2goclient.pro. discards 13cf05c x2goclient.pro: add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri. discards ccb3859 x2goclient.pro: translate and simplify header. discards a0c48e0 general: move *.ui files to src/ui/ and reference in x2goclient.pro. discards c4e01b1 x2goclient.pro: reference files moved to src/ and src/i18n/. discards cdcac23 general: reference src in Doxyfile. discards ee48064 general: move *.cpp and *.h files to src/ and *.ts files to src/i18n/. discards d7c199f Makefile.docupload: add quotes and change backticks to $(). adds 9f92b4c release 4.0.3.2 adds 0046471 Continue development... adds f276230 Bundle new version of VcXsrv: 1.15.2.3-xp+vc2013+x2go1 adds b2e5e74 Fix permissions on copy-deps-win32 adds ce0f9b2 Update from Cygwin bundle 20141018-2 to 20141018-3. adds e6b408b Update from Cygwin bundle 20141018-3 to 20141018-4 adds 3365117 Update bundled VcXsrv from 1.15.2.3-xp+vc2013+x2go1 to 1.15.2.4-xp+vc2013+x2go1 adds a8496ef Makefile.docupload: add quotes and change backticks to $(). adds b739877 general: move *.cpp and *.h files to src/ and *.ts files to src/i18n/. adds ff707ea general: reference src in Doxyfile. adds 9750d66 x2goclient.pro: reference files moved to src/ and src/i18n/. adds 034c8f5 general: move *.ui files to src/ui/ and reference in x2goclient.pro. adds 7c10648 x2goclient.pro: translate and simplify header. adds 0c0925d x2goclient.pro: add x2goclientconfig.pri only containing a comment to override specific entries in x2goclient.pro in x2goclientconfig.pri. adds 78564f0 general: move resource files to src/res/ and reference in x2goclient.pro. adds 5d42d9e general: reference changes in shipped Makefile. adds 84b49d9 Makefile: rename SRC_DIR to TOP_DIR. adds 524d9e7 general: rename qtbrowserplugin-<ver>-opensource to x2gobrowserplugin-<ver> and reference in x2goclient.pro. adds 2cd313f general: move x2goplugin.rc to x2gobrowserplugin-*/src/res/ and reference in x2goclient.pro. adds 4f26b34 x2goclient.pro: remove executability. adds 15f43c9 INSTALL: fix typos and update URL's. adds 91a7cea HOWTO.GPGCARD: fix typos and grammar. adds 62429d3 LICENSE: add "X2Go Project" copyright. adds 4cc7d77 Makefile.man2html: replace backticks with $() and change spaces to tabs. adds e3413c4 README.OpenSSL-Exception: reformat content. adds bc56aa6 README.i18n: grammar fix. adds 032e2a6 .gitignore: update with more temporary files. adds 7b5d8a9 x2goclient.pro: improve consistency: replace tabs with spaces, put quotes around messages, remove or add whitespace where applicable. adds 50d2292 general: Move *.rc and *.rcc files back to top directory for now. adds e557161 Move icons/ to img/icons/ and update references in: adds 145eb68 Move png/ to img/png/ and update references in: adds 2f18f05 Move svg/ to img/svg/ and update references in: adds 9e80307 general: move *.ts files back to the top directory (they are resources.) adds 311cff3 general: move *.ts and *.qm files to i18n/ and update references in: adds 396e7d2 general: actually move icons/ to img/icons/ again. adds a08186f nsis/gpl.txt: fix formatting errors. adds 89c0f39 nsis/x2goclient.nsi: fix whitespace errors. adds a88a8e8 nsis/x2goclient.nsi: don't change the icons path. adds b40c8d4 nsis: make files non-executable. adds 12e7d76 general: move x2go-logos/ to img/x2go-logos and update references in: adds 7915e49 x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc: fix whitespace errors. adds 5bfd6d0 general: move i18n/ to res/i18n/ and update references in: adds bc50f2b src/ssh{masterconnection,process}.cpp: remove executability bit. adds 7d4b197 general: move img/ to res/img/ and update references in: adds e6b9aed Move adds 300be5c x2goclient.pro: reference new src directory as include dir. adds 239179d general: move txt/ to res/text/ and update references in: adds 8d918a8 Info.plist: whitespace fix. adds f222df4 macbuild.sh: use more quoting and curly braces for referencing variables. adds c92bb98 macbuild.sh: define TOP_DIR variable -- set to $PWD. adds 07af2ea macbuild.sh: define the new variables $SDK and $MACOSX_DEPLOYMENT_TARGET which can also be (pre-)set through the environment. adds 33b3a2b macbuild.sh: fix up previously overlooked variables deserving curly braces and quotes. adds a9f8506 macbuild.sh: specify -spec macx-g++ when using qmake. adds 7d67e81 macbuild.sh: directly reference project file for qmake. adds 5eef51f macbuild.sh: use out-of-source build and do not overwrite the default shipped Makefile. adds 128978e macbuild.sh: also also specify the top dir when defining the path to the generated appbundle and dmg file. adds 47bc1f5 general: move Info.plist to res/ and update reference in x2goclient.pro. adds bd8785f macbuild.sh: BUILD_DIR already includes TOP_DIR, don't specify it two times. adds abe5148 macbuild.sh: fix references of resources to access files from TOP_DIR. adds bea6d89 x2goclient.pro: work around a bug in qmake generating incorrect make rules for embedding the OS X app bundle Info.plist file. adds 6ac47cc x2goclient.pro: work around another bug in qmake and copy icon "manually". adds 0393e33 general: define wrap_legacy_resources() function and use it to wrap legacy resource locations stored in old session config files. adds 537eb40 sessionbuttons/userbuttons: add some debugging output to see what file path is being used as a pixmap (user photo/session icon.) adds a7f1a88 x2goutils: update copyright -- add myself. adds 8959fba x2goutils.cpp: change four spaces per indentation level to two spaces. adds bbc466e x2goutils.cpp: use constBegin() and constEnd() instead of begin/end... adds ec4c292 x2goutils.cpp: actually use the correct iterator types and functions. adds 523844a x2goutils: add fixup_resources() to fix "broken" resource URI's. adds 139e5af x2goutils: rename fixup_resources() and wrap_legacy_resources() to fixup_resource_URIs() and wrap_legacy_resource_URIs(). adds 5bbfdde sessionexplorer, sessionwidget: wrap more places in wrap_legacy_resource_URIs(). adds 2f997c3 general: move res/Info.plist and macdmg.DS_Store to res/osxbundle/ and update references in: adds 42302f4 macbuild.sh: add debug mode selector via DEBUG env variable. adds fcaa63a x2goclient.pro: enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. adds d6c17fc macbuild.sh: select stdlib on OS X based on the passed or default SDK value. adds 5ba56c4 macbuild.sh: fix TOP_DIR handling. adds aec9cac macbuild.sh: switch to BASH interpreter. adds 2dc312d macbuild.sh: also accept "FALSE" and "false" as binary values. adds 3d46716 macbuild.sh: fix non-functional redundancy and optical issues. adds 59a0bca macbuild.sh: make bundling optional (but enabled by default) via the new BUNDLE environment variable. adds 4fed829 x2goclient.pro: Enable -O2 in debug mode. adds ab0592f general: Add new UNUSED() macro to x2goutils.h and silence compiler warnings. Affected files: adds 8ebbd35 onmainwindow.cpp: Fix some QMessageBox usages. There are many more places that need fixing... adds f659244 general: remove config_mac.sh. macbuild.sh handles this now. adds 96e48e0 ssh{masterconnection,process}.cpp: add more debugging messages to trace mutex lock and unlock and command execution via SSH. adds 3e0f347 macbuild.sh: Use the correct client build dir: client_build. adds 0428aaf macbuild.sh: remove unused variables. adds dbb398c macbuild.sh: only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. adds 782a0ad macbuild.sh: use sh default assignment instead of default value. adds 42c8e55 macbuild.sh: app bundle and dmg file will be automatically removed when removing the client build directory. adds ab07861 macbuild.sh: Remove 'function' keyword, as it's causing undefined behavior according to SUS. adds cff5d9a macbuild.sh: define, implement and use new function 'make_boolean()'. adds 9798f5c macbuild.sh: move functions to the start of the macbuild.sh script. adds 37cc1a9 macbuild.sh: new env var/parameter UNIVERSAL in macbuild.sh. adds 73af76e macbuild.sh: add usage message obtainable via -h or --help. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (dbb1a42) \ N -- N -- N refs/heads/bugfix/osx (73af76e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: VERSION | 2 +- copy-deps-win32.bat | 5 ++-- debian/changelog | 36 ++++++++++++++++++++----- man/man1/x2goclient.1 | 2 +- src/version.h | 2 +- x2gobrowserplugin-2.4_1/src/res/x2goplugin.rc | 8 +++--- x2goclient.spec | 2 +- 7 files changed, 41 insertions(+), 16 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git