[boinc] 02/03: Merge tag 'upstream/7.4.23+dfsg'

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to annotated tag debian/7.4.23+dfsg-1
in repository boinc.

commit e584840b896b05b0e2ac452a67e866b9c4882da5
Merge: c5a8aa5 96f5b8f
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Oct 17 17:12:25 2014 +0200

    Merge tag 'upstream/7.4.23+dfsg'
    
    Upstream version 7.4.23+dfsg
    
    Conflicts:
    	.gitignore

 .gitignore                             |  18 +-
 android/.gitignore                     |  11 +
 android/BOINC/AndroidManifest.xml      |   4 +-
 api/boinc_opencl.cpp                   | 125 +++++--
 client/boinc_cmd.cpp                   |  32 +-
 client/hostinfo_unix.cpp               |  14 +-
 client/win/boinc_cli.h                 |  16 -
 client/win/boinc_cli.rc                | 288 --------------
 client/win/boinc_cmd.h                 |  16 -
 client/win/boinc_cmd.rc                | 287 --------------
 client/win/boinc_log.h                 |  16 -
 client/win/boinc_log.rc                | 250 -------------
 clientctrl/boincsvcctrl.h              |  16 -
 clientctrl/boincsvcctrl.rc             | 269 --------------
 clientgui/BOINCGUIApp.rc               | 283 --------------
 clientgui/BOINCTaskBar.cpp             |  10 +-
 clientgui/resource.h                   |  17 -
 clientscr/boinc_ss.h                   |  38 --
 clientscr/boinc_ss.rc                  | 660 ---------------------------------
 clientscr/boinc_ss_opengl.h            |  17 -
 clientscr/boinc_ss_opengl.rc           | 251 -------------
 clienttray/boinc_tray.h                |  17 -
 clienttray/boinc_tray.rc               | 264 -------------
 configure.ac                           |   2 +-
 lib/app_ipc.cpp                        |   9 +-
 lib/gui_rpc_client.cpp                 |   2 +-
 lib/opencl_boinc.h                     |   2 +-
 samples/vboxwrapper/vboxwrapper_win.h  |  16 -
 samples/vboxwrapper/vboxwrapper_win.rc |  79 ----
 samples/wrapper/wrapper_win.h          |  16 -
 samples/wrapper/wrapper_win.rc         |  79 ----
 31 files changed, 163 insertions(+), 2961 deletions(-)

diff --cc .gitignore
index 7aa37c9,a592c25..5f0cbd1
--- a/.gitignore
+++ b/.gitignore
@@@ -37,123 -40,3 +37,123 @@@
  /win_build/ipch
  /win_build/installerv2/redist/Windows/src/boinccas/*.filters
  /win_build/installerv2/redist/Windows/src/boinccas/boinccas.sdf
 +
 +## files created by _autosetup (autoreconf):
 +*.in
 +*.in~
 +aclocal.m4
 +autom4te.cache/
 +compile
 +config.guess
 +config.sub
 +configure
 +depcomp
 +install-sh
 +ltmain.sh
 +m4/libtool.m4
 +m4/ltoptions.m4
 +m4/ltsugar.m4
 +m4/ltversion.m4
 +m4/lt~obsolete.m4
 +missing
 +test-driver
 +
 +## files created by configure:
 +Makefile
 +.deps/
 +boinc_path_config.py
 +pkginfo
 +prototype
 +client/scripts/boinc-client
 +config.h
 +config.log
 +config.status
 +libtool
 +py/Boinc/version.py
 +py/setup.py
 +stamp-h1
 +test/version.inc
 +
 +## files created by make:
 +*.o
 +*.lo
 +*.a
 +*.la
 +.libs/
 +svn_version.h
++
 +# list of executables
 +apps/1sec
 +apps/concat
 +apps/upper_case
 +client/boinc
 +client/boinc_client
 +client/boinccmd
 +client/switcher
 +clientgui/boincmgr
 +clientscr/boincscr
 +doc/manpages/appmgr.8
 +doc/manpages/boinc.1
 +doc/manpages/boinccmd.1
 +doc/manpages/boincmgr.1
 +lib/crypt_prog
 +lib/parse_test
 +py/lib.*/
++py/build/
++samples/example_app/uc2
++samples/example_app/ucn
++samples/sleeper/sleeper
++samples/worker/worker
++samples/wrapper/wrapper
 +sched/adjust_user_priority
 +sched/antique_file_deleter
 +sched/census
 +sched/cgi
 +sched/credit_test
 +sched/db_dump
 +sched/db_purge
 +sched/delete_file
 +sched/fcgi
 +sched/fcgi_file_upload_handler
 +sched/feeder
 +sched/file_deleter
 +sched/file_upload_handler
 +sched/get_file
 +sched/make_work
 +sched/message_handler
 +sched/put_file
 +sched/sample_assimilator
 +sched/sample_bitwise_validator
 +sched/sample_dummy_assimilator
 +sched/sample_substr_validator
 +sched/sample_trivial_validator
 +sched/sample_work_generator
 +sched/sched_driver
 +sched/show_shmem
 +sched/single_job_assimilator
 +sched/size_regulator
 +sched/status
 +sched/stop
 +sched/transitioner
 +sched/trickle_credit
 +sched/trickle_deadline
 +sched/trickle_echo
 +sched/update_stats
 +sched/wu_check
 +tools/cancel_jobs
 +tools/create_work
 +tools/dir_hier_move
 +tools/dir_hier_path
 +tools/remote_submit_test
 +tools/sign_executable
 +vda/ssim
 +vda/vda
- vda/vdad.pc
++vda/vdad
 +
 +
 +#debian specific files
 +.pc
 +update-boinc-applinks.1
- 
++ 
 +# upstream files not here
- py/build/
- samples/example_app/uc2
- samples/example_app/ucn
- samples/sleeper/sleeper
- samples/worker/worker
- samples/wrapper/wrapper
- vda/vdad
 +version.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git