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